From ec690507e3f23e487ebd433790db12a68e31feb3 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Wed, 23 Aug 2023 13:10:27 +0300
Subject: [PATCH] [JAVA-23095] (#14613)

* [JAVA-23095] Upgraded guava library to latest version

* [JAVA-23095] Clean up
---
 core-java-modules/core-java-security-3/pom.xml            | 3 +--
 core-java-modules/core-java-streams-4/pom.xml             | 8 ++++----
 core-java-modules/core-java-string-apis-2/pom.xml         | 4 +---
 .../docker-caching/multi-module-caching/pom.xml           | 2 +-
 .../docker-caching/single-module-caching/pom.xml          | 2 +-
 pom.xml                                                   | 2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/core-java-modules/core-java-security-3/pom.xml b/core-java-modules/core-java-security-3/pom.xml
index ad9feeb36a..b979b56658 100644
--- a/core-java-modules/core-java-security-3/pom.xml
+++ b/core-java-modules/core-java-security-3/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${google-guava.version}</version>
+            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -47,7 +47,6 @@
         <commons-codec.version>1.15</commons-codec.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <spring-security-crypto.version>6.0.3</spring-security-crypto.version>
-        <google-guava.version>31.0.1-jre</google-guava.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-4/pom.xml b/core-java-modules/core-java-streams-4/pom.xml
index fe791ebd42..0b9b3569f1 100644
--- a/core-java-modules/core-java-streams-4/pom.xml
+++ b/core-java-modules/core-java-streams-4/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.23.1</version>
+            <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>${commons-lang3.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${google.guava.version}</version>
+            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>com.oath.cyclops</groupId>
@@ -114,6 +114,7 @@
 
     <properties>
         <!-- testing -->
+        <assertj.version>3.23.1</assertj.version>
         <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
         <maven.compiler.source>12</maven.compiler.source>
         <maven.compiler.target>12</maven.compiler.target>
@@ -123,7 +124,6 @@
         <io.varv.version>1.0.0-alpha-4</io.varv.version>
         <io.reactor3.version>3.5.1</io.reactor3.version>
         <apache.commons.collection4.version>4.4</apache.commons.collection4.version>
-        <google.guava.version>31.1-jre</google.guava.version>
         <cyclops.version>10.4.1</cyclops.version>
     </properties>
 
diff --git a/core-java-modules/core-java-string-apis-2/pom.xml b/core-java-modules/core-java-string-apis-2/pom.xml
index 51ab3bc1f8..814d301532 100644
--- a/core-java-modules/core-java-string-apis-2/pom.xml
+++ b/core-java-modules/core-java-string-apis-2/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${commons.lang3.version}</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
         <dependency>
             <groupId>com.ibm.icu</groupId>
@@ -42,8 +42,6 @@
     </build>
 
     <properties>
-        <commons.lang3.version>3.12.0</commons.lang3.version>
-        <guava.version>31.1-jre</guava.version>
         <icu4j.version>61.1</icu4j.version>
     </properties>
 
diff --git a/docker-modules/docker-caching/multi-module-caching/pom.xml b/docker-modules/docker-caching/multi-module-caching/pom.xml
index b64cf1a8b8..60f14a17e5 100644
--- a/docker-modules/docker-caching/multi-module-caching/pom.xml
+++ b/docker-modules/docker-caching/multi-module-caching/pom.xml
@@ -27,7 +27,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <guava.version>31.1-jre</guava.version>
+        <guava.version>32.1.2-jre</guava.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/docker-modules/docker-caching/single-module-caching/pom.xml b/docker-modules/docker-caching/single-module-caching/pom.xml
index a388c7563f..0e5174b7ca 100644
--- a/docker-modules/docker-caching/single-module-caching/pom.xml
+++ b/docker-modules/docker-caching/single-module-caching/pom.xml
@@ -49,7 +49,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <guava.version>31.1-jre</guava.version>
+        <guava.version>32.1.2-jre</guava.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f06cd438f8..12fbc3c4f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1300,7 +1300,7 @@
         <maven-pmd-plugin.version>3.19.0</maven-pmd-plugin.version>
         <lombok.version>1.18.28</lombok.version>
         <h2.version>2.1.214</h2.version>
-        <guava.version>31.1-jre</guava.version>
+        <guava.version>32.1.2-jre</guava.version>
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
     </properties>