From 258a3e4941f6339c43db88c8422c56c4f53ca514 Mon Sep 17 00:00:00 2001
From: Harry9656 <singharpal9656@gmail.com>
Date: Thu, 29 Feb 2024 19:46:09 +0100
Subject: [PATCH] [JAVA-31577] Review and Upgrade to latest Guava version
 (#15986)

---
 core-java-modules/core-java-collections-array-list/pom.xml    | 2 +-
 core-java-modules/core-java-collections-set-2/pom.xml         | 2 +-
 .../docker-caching/multi-module-caching/core-module/pom.xml   | 2 ++
 maven-modules/version-collision/pom.xml                       | 1 +
 .../version-collision/version-collision-project-a/pom.xml     | 1 +
 .../version-collision/version-collision-project-b/pom.xml     | 1 +
 persistence-modules/spring-data-jpa-crud/pom.xml              | 4 ----
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core-java-modules/core-java-collections-array-list/pom.xml b/core-java-modules/core-java-collections-array-list/pom.xml
index ee0b102bb0..034b2d820d 100644
--- a/core-java-modules/core-java-collections-array-list/pom.xml
+++ b/core-java-modules/core-java-collections-array-list/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>${guava.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/core-java-modules/core-java-collections-set-2/pom.xml b/core-java-modules/core-java-collections-set-2/pom.xml
index 4f1944f269..894bce86b7 100644
--- a/core-java-modules/core-java-collections-set-2/pom.xml
+++ b/core-java-modules/core-java-collections-set-2/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.1.1-jre</version>
+            <version>${guava.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/docker-modules/docker-caching/multi-module-caching/core-module/pom.xml b/docker-modules/docker-caching/multi-module-caching/core-module/pom.xml
index 159d76830b..991162ddfa 100644
--- a/docker-modules/docker-caching/multi-module-caching/core-module/pom.xml
+++ b/docker-modules/docker-caching/multi-module-caching/core-module/pom.xml
@@ -15,12 +15,14 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
+        <guava.version>33.0.0-jre</guava.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/maven-modules/version-collision/pom.xml b/maven-modules/version-collision/pom.xml
index 820689abfa..8193fe496f 100644
--- a/maven-modules/version-collision/pom.xml
+++ b/maven-modules/version-collision/pom.xml
@@ -19,6 +19,7 @@
     </modules>
 
     <!--comment section below to provoke version collision in project-collision module -->
+    <!--Don't Update the version here as it shows the collision when compiling with maven.-->
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/maven-modules/version-collision/version-collision-project-a/pom.xml b/maven-modules/version-collision/version-collision-project-a/pom.xml
index 6130334b2c..7167905a68 100644
--- a/maven-modules/version-collision/version-collision-project-a/pom.xml
+++ b/maven-modules/version-collision/version-collision-project-a/pom.xml
@@ -12,6 +12,7 @@
     </parent>
 
     <dependencies>
+        <!--Don't Update the version here as it shows the collision when compiling with maven.-->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/maven-modules/version-collision/version-collision-project-b/pom.xml b/maven-modules/version-collision/version-collision-project-b/pom.xml
index e2e7294cd2..aa5e096915 100644
--- a/maven-modules/version-collision/version-collision-project-b/pom.xml
+++ b/maven-modules/version-collision/version-collision-project-b/pom.xml
@@ -12,6 +12,7 @@
     </parent>
 
     <dependencies>
+        <!--Don't Update the version here as it shows the collision when compiling with maven.-->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/persistence-modules/spring-data-jpa-crud/pom.xml b/persistence-modules/spring-data-jpa-crud/pom.xml
index 0889cfca2a..4f1ebbec55 100644
--- a/persistence-modules/spring-data-jpa-crud/pom.xml
+++ b/persistence-modules/spring-data-jpa-crud/pom.xml
@@ -28,10 +28,6 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
         <dependency>
             <groupId>net.ttddyy</groupId>
             <artifactId>datasource-proxy</artifactId>