Fix CVE-2023-6378 (opensearch-project#1405)

engechas · web-flow · commit b25a3b2b0ea6 · 2024-02-05T17:23:09.000-08:00
Signed-off-by: Chase Engelbrecht &lt;engechas@amazon.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -48,7 +48,12 @@ apply plugin: 'jacoco'
 apply from: 'build-tools/merged-coverage.gradle'
 
 configurations {
-    ktlint
+    ktlint {
+      resolutionStrategy {
+          force "ch.qos.logback:logback-classic:1.3.14"
+          force "ch.qos.logback:logback-core:1.3.14"
+      }
+   }
 }
 
 dependencies {
@@ -113,4 +118,4 @@ task updateVersion {
         }
         ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,12 @@ apply plugin: 'jacoco'`
`48`	`48`	`apply from: 'build-tools/merged-coverage.gradle'`
`49`	`49`
`50`	`50`	`configurations {`
`51`		`- ktlint`
	`51`	`+ ktlint {`
	`52`	`+ resolutionStrategy {`
	`53`	`+ force "ch.qos.logback:logback-classic:1.3.14"`
	`54`	`+ force "ch.qos.logback:logback-core:1.3.14"`
	`55`	`+ }`
	`56`	`+ }`
`52`	`57`	`}`
`53`	`58`
`54`	`59`	`dependencies {`
`@@ -113,4 +118,4 @@ task updateVersion {`
`113`	`118`	`}`
`114`	`119`	`ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)`
`115`	`120`	`}`
`116`		`-}`
	`121`	`+}`