From 85a8198183968d56d4e1224b18007c9f4ceafc04 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 17 Oct 2021 11:06:39 -0700
Subject: [PATCH] Upgrade Guava from 11.0.1 to latest

---
 .github/dependabot.yml |  2 --
 bom/pom.xml            |  2 +-
 core/pom.xml           | 18 +++++++++++-------
 test/pom.xml           |  6 ------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6a63385038e7..218b9532b268 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,8 +18,6 @@ updates:
       # will require source code changes to replace javax.mail with jakarta.mail 
       # and some handling for plugins that depend on javax.mail being provided by Jenkins core.
       - dependency-name: "com.sun.mail:jakarta.mail"
-      # needs updates in a number of plugins, see https://github.com/jenkinsci/jenkins/pull/5059 and https://github.com/jenkinsci/bom/pull/392
-      - dependency-name: "com.google.guava:*"
       # this is a banned dependency, we have a hack in our pom to prevent anyone else pulling it in
       - dependency-name: "javax.servlet.servlet-api"
       # needs a jakarta upgrade project, imports changed
diff --git a/bom/pom.xml b/bom/pom.xml
index 6f64b8747692..0bc0499a68ec 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -91,7 +91,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>11.0.1</version>
+        <version>31.0.1-jre</version>
       </dependency>
       <dependency>
         <groupId>com.google.inject</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index e1650bb3c681..0c8868dd707f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -95,10 +95,6 @@ THE SOFTWARE.
           <groupId>aopalliance</groupId>
           <artifactId>aopalliance</artifactId>
         </exclusion>
-        <exclusion> <!-- TODO it seems to want Guava 16; apparently it manages to run against 11 -->
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
 
@@ -538,9 +534,17 @@ THE SOFTWARE.
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <exclusions>
-        <exclusion> <!-- pick up from SpotBugs Annotations -->
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>jsr305</artifactId>
+        <exclusion>
+          <groupId>com.google.errorprone</groupId>
+          <artifactId>error_prone_annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.j2objc</groupId>
+          <artifactId>j2objc-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.checkerframework</groupId>
+          <artifactId>checker-qual</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
diff --git a/test/pom.xml b/test/pom.xml
index 36b24a47cc41..03b99b946b81 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -119,12 +119,6 @@ THE SOFTWARE.
       <artifactId>antisamy-markup-formatter</artifactId>
       <version>2.3</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion> <!-- TODO it seems to want Guava 27.1; apparently it manages to run against 11.0.1 -->
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>