From 9b28d7739aade6a5baad097206b655d4aa824025 Mon Sep 17 00:00:00 2001
From: Ehsan Sasanianno <ehsan.sasanian@gmail.com>
Date: Wed, 8 Nov 2023 10:26:53 +0100
Subject: [PATCH] java-26718: upgrade caffeine version to 3.x (#15138)

---
 libraries-5/pom.xml                               | 2 +-
 spring-5-webflux-2/pom.xml                        | 2 +-
 spring-boot-modules/spring-boot-libraries/pom.xml | 2 +-
 spring-boot-modules/spring-caching-2/pom.xml      | 2 ++
 spring-boot-modules/spring-caching/pom.xml        | 2 ++
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libraries-5/pom.xml b/libraries-5/pom.xml
index c98a66c094..a043b4bfa8 100644
--- a/libraries-5/pom.xml
+++ b/libraries-5/pom.xml
@@ -141,7 +141,7 @@
         <typesafe-akka.version>2.5.11</typesafe-akka.version>
         <streamex.version>0.8.1</streamex.version>
         <docker.version>3.0.14</docker.version>
-        <caffeine.version>2.5.5</caffeine.version>
+        <caffeine.version>3.1.8</caffeine.version>
         <findbugs.version>3.0.2</findbugs.version>
         <fugue.version>4.5.1</fugue.version>
         <jnats.version>1.0</jnats.version>
diff --git a/spring-5-webflux-2/pom.xml b/spring-5-webflux-2/pom.xml
index 68945138d4..34cbda6c18 100644
--- a/spring-5-webflux-2/pom.xml
+++ b/spring-5-webflux-2/pom.xml
@@ -100,7 +100,7 @@
 
     <properties>
         <reactor.version>3.4.5</reactor.version>
-        <caffeine.version>2.9.2</caffeine.version>
+        <caffeine.version>3.1.8</caffeine.version>
         <testcontainers-mongodb.version>1.16.2</testcontainers-mongodb.version>
     </properties>
 
diff --git a/spring-boot-modules/spring-boot-libraries/pom.xml b/spring-boot-modules/spring-boot-libraries/pom.xml
index d8ca53f013..b7b8ad17ad 100644
--- a/spring-boot-modules/spring-boot-libraries/pom.xml
+++ b/spring-boot-modules/spring-boot-libraries/pom.xml
@@ -228,7 +228,7 @@
         <zxing.version>3.3.0</zxing.version>
         <bucket4j.version>7.6.0</bucket4j.version>
         <bucket4j-spring-boot-starter.version>0.7.0</bucket4j-spring-boot-starter.version>
-        <caffeine.version>2.8.2</caffeine.version>
+        <caffeine.version>3.1.8</caffeine.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-caching-2/pom.xml b/spring-boot-modules/spring-caching-2/pom.xml
index 2239256630..ee28ac5ed5 100644
--- a/spring-boot-modules/spring-caching-2/pom.xml
+++ b/spring-boot-modules/spring-caching-2/pom.xml
@@ -47,6 +47,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
+            <version>${caffeine.version}</version>
         </dependency>
         <dependency>
             <groupId>it.ozimov</groupId>
@@ -64,6 +65,7 @@
 
     <properties>
         <embedded.redis.version>0.7.3</embedded.redis.version>
+        <caffeine.version>3.1.8</caffeine.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-caching/pom.xml b/spring-boot-modules/spring-caching/pom.xml
index c27ccf3348..f3d9488b89 100644
--- a/spring-boot-modules/spring-caching/pom.xml
+++ b/spring-boot-modules/spring-caching/pom.xml
@@ -51,6 +51,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
+            <version>${caffeine.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -78,6 +79,7 @@
 
     <properties>
         <ehcache.version>3.5.2</ehcache.version>
+        <caffeine.version>3.1.8</caffeine.version>
     </properties>
 
 </project>
\ No newline at end of file