Fixing CVE 1767 (opensearch-project#1768)

forestmvey · web-flow · commit c7dfdb30b13f · 2023-06-22T12:35:23.000-07:00
Signed-off-by: forestmvey &lt;forestv@bitquilltech.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -185,7 +185,7 @@ configurations.all {
     exclude group: "commons-logging", module: "commons-logging"
     // enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
     resolutionStrategy.force 'commons-codec:commons-codec:1.13'
-    resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
+    resolutionStrategy.force 'com.google.guava:guava:32.0.1-jre'
 }
 
 // updateVersion: Task to auto increment to the next development iteration
diff --git a/integ-test/build.gradle b/integ-test/build.gradle
@@ -72,7 +72,7 @@ configurations.all {
     resolutionStrategy.force "commons-logging:commons-logging:1.2"
     // enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
     resolutionStrategy.force 'commons-codec:commons-codec:1.13'
-    resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
+    resolutionStrategy.force 'com.google.guava:guava:32.0.1-jre'
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -97,7 +97,7 @@ configurations.all {
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
     // enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
     resolutionStrategy.force 'commons-codec:commons-codec:1.13'
-    resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
+    resolutionStrategy.force 'com.google.guava:guava:32.0.1-jre'
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ configurations.all {`
`185`	`185`	`exclude group: "commons-logging", module: "commons-logging"`
`186`	`186`	`// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379`
`187`	`187`	`resolutionStrategy.force 'commons-codec:commons-codec:1.13'`
`188`		`- resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'`
	`188`	`+ resolutionStrategy.force 'com.google.guava:guava:32.0.1-jre'`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`// updateVersion: Task to auto increment to the next development iteration`