From 992ad25b9608e59903dea4ec8becc00efbff5340 Mon Sep 17 00:00:00 2001
From: Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com>
Date: Tue, 13 Jun 2023 19:08:50 -0400
Subject: [PATCH] Update Guava to 32.0.1-jre

patch by Ekaterina Dimitrova; reviewed by Berenguer Blasi for CASSANDRA-18645
---
 .build/checkstyle.xml                    | 2 +-
 .build/dependency-check-suppressions.xml | 6 ------
 .build/parent-pom-template.xml           | 6 +-----
 CHANGES.txt                              | 1 +
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.build/checkstyle.xml b/.build/checkstyle.xml
index 50bd8743c0..2998ebe428 100644
--- a/.build/checkstyle.xml
+++ b/.build/checkstyle.xml
@@ -107,7 +107,7 @@
       <property name="format" value="toFile\(\)"/>
       <property name="message" value="Avoid Path#toFile(), as some implementations may not support it." />
     </module>
-
+    
     <module name="RegexpSinglelineJava">
       <!-- block Integer() -->
       <property name="id" value="blockIntegerInstantiation"/>
diff --git a/.build/dependency-check-suppressions.xml b/.build/dependency-check-suppressions.xml
index ae7ff368a7..d7a66cb3bf 100644
--- a/.build/dependency-check-suppressions.xml
+++ b/.build/dependency-check-suppressions.xml
@@ -49,12 +49,6 @@
         <packageUrl regex="true">^pkg:maven/net\.openhft/chronicle\-wire@.*$</packageUrl>
         <cpe>cpe:/a:wire:wire</cpe>
     </suppress>
-    <suppress>
-        <!-- not applicable https://nvd.nist.gov/vuln/detail/CVE-2020-8908 -->
-        <packageUrl regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
-        <cve>CVE-2020-8908</cve>
-        <cve>CVE-2023-2976</cve>
-    </suppress>
     <!-- https://issues.apache.org/jira/browse/CASSANDRA-18146 -->
     <suppress>
         <packageUrl regex="true">^pkg:maven/org\.apache\.commons.*$</packageUrl>
diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index a88764ee75..3eaa9ba3af 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -269,7 +269,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>27.0-jre</version>
+        <version>32.0.1-jre</version>
         <exclusions>
           <exclusion>
             <artifactId>jsr305</artifactId>
@@ -283,10 +283,6 @@
             <artifactId>listenablefuture</artifactId>
             <groupId>com.google.guava</groupId>
           </exclusion>
-          <exclusion>
-            <artifactId>failureaccess</artifactId>
-            <groupId>com.google.guava</groupId>
-          </exclusion>
           <exclusion>
             <artifactId>checker-qual</artifactId>
             <groupId>org.checkerframework</groupId>
diff --git a/CHANGES.txt b/CHANGES.txt
index 69b78213e1..bcfdcfee58 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 5.0
+ * Upgrade Guava to 32.0.1 (CASSANDRA-18645)
  * Add duration and count of partition keys to sstablemetadata (CASSANDRA-18639)
  * Remove deprecated compaction_tombstone_warning_threshold and compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626)
  * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305)