From ff85b120db2af4ea6424ee419cbd86a0729daac7 Mon Sep 17 00:00:00 2001
From: Junqiu Lei <junqiu.lei@gmail.com>
Date: Sat, 28 Dec 2024 10:06:06 -0800
Subject: [PATCH] Bump guava version to 32.1.3 (#3300)

Signed-off-by: Junqiu Lei <junqiu@amazon.com>
---
 build.gradle                   | 2 +-
 common/build.gradle            | 2 +-
 memory/build.gradle            | 2 +-
 ml-algorithms/build.gradle     | 2 +-
 plugin/build.gradle            | 2 +-
 search-processors/build.gradle | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index f08ab08286..ecf26bc80d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,7 +93,7 @@ subprojects {
 
     configurations.all {
         // Force spotless depending on newer version of guava due to CVE-2023-2976. Remove after spotless upgrades.
-        resolutionStrategy.force "com.google.guava:guava:32.1.2-jre"
+        resolutionStrategy.force "com.google.guava:guava:32.1.3-jre"
         resolutionStrategy.force 'org.apache.commons:commons-compress:1.26.0'
     }
 }
diff --git a/common/build.gradle b/common/build.gradle
index 979752bc05..f776081faa 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
     compileOnly group: 'org.json', name: 'json', version: '20231013'
     testImplementation group: 'org.json', name: 'json', version: '20231013'
-    implementation('com.google.guava:guava:32.1.2-jre') {
+    implementation('com.google.guava:guava:32.1.3-jre') {
         exclude group: 'com.google.guava', module: 'failureaccess'
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
         exclude group: 'org.checkerframework', module: 'checker-qual'
diff --git a/memory/build.gradle b/memory/build.gradle
index 8251303158..9cd16ade48 100644
--- a/memory/build.gradle
+++ b/memory/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
     implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: "${versions.httpcore5}"
     implementation "org.opensearch:common-utils:${common_utils_version}"
-    implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'
+    implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'
     testImplementation (group: 'junit', name: 'junit', version: '4.13.2') {
         exclude module : 'hamcrest'
         exclude module : 'hamcrest-core'
diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle
index 2559341fa1..26e220ad49 100644
--- a/ml-algorithms/build.gradle
+++ b/ml-algorithms/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     implementation group: 'io.protostuff', name: 'protostuff-collectionschema', version: '1.8.0'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
-    implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'
+    implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
     implementation platform("ai.djl:bom:0.28.0")
     implementation group: 'ai.djl.pytorch', name: 'pytorch-model-zoo'
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 55e92b29d3..11792abcca 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
     implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
     implementation group: 'com.networknt' , name: 'json-schema-validator', version: '1.4.0'
-    implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'
+    implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
     implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
diff --git a/search-processors/build.gradle b/search-processors/build.gradle
index 9f1f0c62d4..8645330fd4 100644
--- a/search-processors/build.gradle
+++ b/search-processors/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     implementation group: 'org.opensearch', name: 'common-utils', version: "${common_utils_version}"
     // https://mvnrepository.com/artifact/org.apache.httpcomponents.core5/httpcore5
     implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: "${versions.httpcore5}"
-    implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'
+    implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'
     implementation group: 'org.json', name: 'json', version: '20231013'
     implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
     testImplementation "org.opensearch.test:framework:${opensearch_version}"