From df2b5e1df4308a9d2d92313173ecd21d389e5eca Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 14:32:50 -0700
Subject: [PATCH 01/31] Use latest eisop

---
 guava/cfMavenCentral.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guava/cfMavenCentral.xml b/guava/cfMavenCentral.xml
index e47a4da8cefb..a29cf98402bf 100644
--- a/guava/cfMavenCentral.xml
+++ b/guava/cfMavenCentral.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>3.42.0-eisop5</version>
+      <version>3.49.1-eisop1</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>

From 4f0811bcbb329c47c89fe65d99e64198881df50a Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 14:32:59 -0700
Subject: [PATCH 02/31] Add versions

---
 guava/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/guava/pom.xml b/guava/pom.xml
index 5ae03223aef3..bce18d920c43 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -64,14 +64,17 @@
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
+      <version>0.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-util</artifactId>
+      <version>0.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker</artifactId>
+      <version>0.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>

From ba7deeb18fb43985d25e0824cd644ec5e5358bdf Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 14:35:42 -0700
Subject: [PATCH 03/31] Add more versions

---
 android/guava-tests/pom.xml | 1 +
 guava-testlib/pom.xml       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/android/guava-tests/pom.xml b/android/guava-tests/pom.xml
index 69d9bcc13727..6e7047b6cc1b 100644
--- a/android/guava-tests/pom.xml
+++ b/android/guava-tests/pom.xml
@@ -28,6 +28,7 @@
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-qual</artifactId>
+      <version>0.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
diff --git a/guava-testlib/pom.xml b/guava-testlib/pom.xml
index 16f1310b4647..8b1d678c4b1b 100644
--- a/guava-testlib/pom.xml
+++ b/guava-testlib/pom.xml
@@ -21,6 +21,7 @@
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
+      <version>0.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>

From 25fd508a21081e16ac453e852bdda85c206a5e1b Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 14:37:03 -0700
Subject: [PATCH 04/31] Add more versions

---
 guava-tests/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guava-tests/pom.xml b/guava-tests/pom.xml
index 487402a7ec1f..bae7aa41c0d1 100644
--- a/guava-tests/pom.xml
+++ b/guava-tests/pom.xml
@@ -28,6 +28,7 @@
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
+      <version>0.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>

From 66a2422b281ffc1ae143838c98f0c592ea5638c2 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 14:40:43 -0700
Subject: [PATCH 05/31] Add more versions

---
 android/guava-testlib/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/guava-testlib/pom.xml b/android/guava-testlib/pom.xml
index 044d5cdd8433..c3671839b7bd 100644
--- a/android/guava-testlib/pom.xml
+++ b/android/guava-testlib/pom.xml
@@ -21,6 +21,7 @@
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-qual</artifactId>
+      <version>0.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>

From 8ce33c7e140d492022c8226e6ff0f8adfdc1b0b8 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 14:44:56 -0700
Subject: [PATCH 06/31] Use latest eisop

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 44d8ccf374c4..0c9a581be237 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <test.include>%regex[.*.class]</test.include>
     <truth.version>1.4.2</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <checker.version>3.42.0-eisop5</checker.version>
+    <checker.version>3.49.1-eisop1</checker.version>
     <errorprone.version>2.26.1</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>

From 354ab44cf18d3f8d558ef5e794b9099d105cddaf Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 14:50:19 -0700
Subject: [PATCH 07/31] Use checker.version

---
 android/guava-testlib/pom.xml | 2 +-
 android/guava-tests/pom.xml   | 2 +-
 guava-testlib/pom.xml         | 2 +-
 guava-tests/pom.xml           | 2 +-
 guava/pom.xml                 | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/guava-testlib/pom.xml b/android/guava-testlib/pom.xml
index c3671839b7bd..e11380b403ee 100644
--- a/android/guava-testlib/pom.xml
+++ b/android/guava-testlib/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>0.0.0</version>
+      <version>${checker.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
diff --git a/android/guava-tests/pom.xml b/android/guava-tests/pom.xml
index 6e7047b6cc1b..3b3ac6f6a34e 100644
--- a/android/guava-tests/pom.xml
+++ b/android/guava-tests/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>0.0.0</version>
+      <version>${checker.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
diff --git a/guava-testlib/pom.xml b/guava-testlib/pom.xml
index 8b1d678c4b1b..f7cc02790724 100644
--- a/guava-testlib/pom.xml
+++ b/guava-testlib/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>0.0.0</version>
+      <version>${checker.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
diff --git a/guava-tests/pom.xml b/guava-tests/pom.xml
index bae7aa41c0d1..20c1e543361f 100644
--- a/guava-tests/pom.xml
+++ b/guava-tests/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>0.0.0</version>
+      <version>${checker.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
diff --git a/guava/pom.xml b/guava/pom.xml
index bce18d920c43..f27eb73d3e9e 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -64,17 +64,17 @@
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>0.0.0</version>
+      <version>${checker.version}</version>
     </dependency>
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-util</artifactId>
-      <version>0.0.0</version>
+      <version>${checker.version}</version>
     </dependency>
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker</artifactId>
-      <version>0.0.0</version>
+      <version>${checker.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>

From 6dfe27b8ff7a8e2158c182d5092bf1f9bbd03e89 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 14:50:29 -0700
Subject: [PATCH 08/31] Use latest eisop

---
 android/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/pom.xml b/android/pom.xml
index 309297a700e4..97832b9fd632 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -16,7 +16,7 @@
     <test.include>%regex[.*.class]</test.include>
     <truth.version>1.4.2</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <checker.version>3.34.0-eisop1</checker.version>
+    <checker.version>3.49.1-eisop1</checker.version>
     <errorprone.version>2.26.1</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>

From 92a706861f1483d2b7b3f55e1b6666174b1ab55e Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 14:58:49 -0700
Subject: [PATCH 09/31] Try latest errorprone

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0c9a581be237..fc28de93d979 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <truth.version>1.4.2</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
     <checker.version>3.49.1-eisop1</checker.version>
-    <errorprone.version>2.26.1</errorprone.version>
+    <errorprone.version>2.42.0</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>
     <!-- Empty for all JDKs but 9-12 -->

From 5b404bbdd32816dda893e3b60b33687f223343c9 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 15:01:39 -0700
Subject: [PATCH 10/31] Try disable errorprone

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fc28de93d979..8189642d7138 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,7 +465,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
+<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can

From eb23a477fe020920583e7cec1c25ec167cf0b945 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 15:05:12 -0700
Subject: [PATCH 11/31] Try disable errorprone

---
 android/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/pom.xml b/android/pom.xml
index 97832b9fd632..1d145e2e9769 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -460,7 +460,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
+<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can

From db89f0cd0440a2635af9a394fc271cc175de52a3 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 15:10:09 -0700
Subject: [PATCH 12/31] Use correct eisop

---
 android/pom.xml          | 2 +-
 guava/cfMavenCentral.xml | 2 +-
 pom.xml                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index 1d145e2e9769..e5687b238537 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -16,7 +16,7 @@
     <test.include>%regex[.*.class]</test.include>
     <truth.version>1.4.2</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <checker.version>3.49.1-eisop1</checker.version>
+    <checker.version>3.49.3-eisop1</checker.version>
     <errorprone.version>2.26.1</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>
diff --git a/guava/cfMavenCentral.xml b/guava/cfMavenCentral.xml
index a29cf98402bf..5bfbf02f414f 100644
--- a/guava/cfMavenCentral.xml
+++ b/guava/cfMavenCentral.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>3.49.1-eisop1</version>
+      <version>3.49.3-eisop1</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
diff --git a/pom.xml b/pom.xml
index 8189642d7138..a323cca89c6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <test.include>%regex[.*.class]</test.include>
     <truth.version>1.4.2</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <checker.version>3.49.1-eisop1</checker.version>
+    <checker.version>3.49.3-eisop1</checker.version>
     <errorprone.version>2.42.0</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>

From 96f69a0521a8675f76403e26c095d09e41aa9ad2 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 15:12:26 -0700
Subject: [PATCH 13/31] Use artifact from eisop

---
 android/guava-testlib/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/guava-testlib/pom.xml b/android/guava-testlib/pom.xml
index e11380b403ee..ca63f3429c9e 100644
--- a/android/guava-testlib/pom.xml
+++ b/android/guava-testlib/pom.xml
@@ -19,9 +19,8 @@
       <artifactId>jsr305</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.checkerframework</groupId>
+      <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>${checker.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>

From 0a68422e303a89033d7469b23f4206e1318d963b Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Mon, 6 Oct 2025 15:15:24 -0700
Subject: [PATCH 14/31] Use artifact from eisop

---
 android/guava-tests/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/guava-tests/pom.xml b/android/guava-tests/pom.xml
index 3b3ac6f6a34e..64f10fa20c93 100644
--- a/android/guava-tests/pom.xml
+++ b/android/guava-tests/pom.xml
@@ -26,7 +26,7 @@
       <artifactId>jsr305</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.checkerframework</groupId>
+      <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
       <version>${checker.version}</version>
     </dependency>

From 6a9efa78f71ab885d550dfc9362eeb2a5a6b7a24 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 13:32:56 -0400
Subject: [PATCH 15/31] Update Checker Framework to 3.49.5-eisop1

---
 android/pom.xml          | 2 +-
 guava/cfMavenCentral.xml | 2 +-
 pom.xml                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index e5687b238537..61ec5c2f0f92 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -16,7 +16,7 @@
     <test.include>%regex[.*.class]</test.include>
     <truth.version>1.4.2</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <checker.version>3.49.3-eisop1</checker.version>
+    <checker.version>3.49.5-eisop1</checker.version>
     <errorprone.version>2.26.1</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>
diff --git a/guava/cfMavenCentral.xml b/guava/cfMavenCentral.xml
index 5bfbf02f414f..bb04a995cd4c 100644
--- a/guava/cfMavenCentral.xml
+++ b/guava/cfMavenCentral.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>io.github.eisop</groupId>
       <artifactId>checker-qual</artifactId>
-      <version>3.49.3-eisop1</version>
+      <version>3.49.5-eisop1</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
diff --git a/pom.xml b/pom.xml
index a323cca89c6a..8751775b476e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <test.include>%regex[.*.class]</test.include>
     <truth.version>1.4.2</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <checker.version>3.49.3-eisop1</checker.version>
+    <checker.version>3.49.5-eisop1</checker.version>
     <errorprone.version>2.42.0</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>

From b46945dfddcc8427e0bd9917238bb364c64dc619 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 13:47:25 -0400
Subject: [PATCH 16/31] Remove stale guava-gwt selector

---
 util/gradle_integration_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/gradle_integration_tests.sh b/util/gradle_integration_tests.sh
index 3a8f921ac37c..bada3ddbc64a 100755
--- a/util/gradle_integration_tests.sh
+++ b/util/gradle_integration_tests.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-./mvnw clean install --projects '!guava-testlib,!guava-tests,!guava-bom,!guava-gwt' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
+./mvnw clean install --projects '!guava-testlib,!guava-tests,!guava-bom' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
 ./mvnw clean install --projects '!guava-testlib,!guava-tests,!guava-bom' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -f android
 
 # Gradle Wrapper overwrites some files when it runs.

From f7cb7b86f8694ff82ccb4168462ed77194cb786c Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 14:08:05 -0400
Subject: [PATCH 17/31] Align JRE child parent versions

---
 guava-gwt/pom.xml     | 2 +-
 guava-testlib/pom.xml | 2 +-
 guava-tests/pom.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/guava-gwt/pom.xml b/guava-gwt/pom.xml
index 5f4c3d40d564..37f535039dff 100644
--- a/guava-gwt/pom.xml
+++ b/guava-gwt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.guava</groupId>
     <artifactId>guava-parent</artifactId>
-    <version>33.1.0-jre</version>
+    <version>33.1.0.2-jre</version>
   </parent>
   <artifactId>guava-gwt</artifactId>
   <name>Guava GWT compatible libs</name>
diff --git a/guava-testlib/pom.xml b/guava-testlib/pom.xml
index f7cc02790724..0e99f2d4d0b8 100644
--- a/guava-testlib/pom.xml
+++ b/guava-testlib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.guava</groupId>
     <artifactId>guava-parent</artifactId>
-    <version>33.1.0-jre</version>
+    <version>33.1.0.2-jre</version>
   </parent>
   <artifactId>guava-testlib</artifactId>
   <name>Guava Testing Library</name>
diff --git a/guava-tests/pom.xml b/guava-tests/pom.xml
index 20c1e543361f..3d91892a76bf 100644
--- a/guava-tests/pom.xml
+++ b/guava-tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.guava</groupId>
     <artifactId>guava-parent</artifactId>
-    <version>33.1.0-jre</version>
+    <version>33.1.0.2-jre</version>
   </parent>
   <artifactId>guava-tests</artifactId>
   <name>Guava Unit Tests</name>

From 1cc936e8fdfc72c3c5195fb01fd51921153b319b Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 14:36:36 -0400
Subject: [PATCH 18/31] Align Android artifact version

---
 android/guava-bom/pom.xml     | 2 +-
 android/guava-testlib/pom.xml | 2 +-
 android/guava-tests/pom.xml   | 2 +-
 android/guava/pom.xml         | 2 +-
 android/pom.xml               | 4 ++--
 guava-bom/pom.xml             | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/guava-bom/pom.xml b/android/guava-bom/pom.xml
index a777f531eaaf..cac92ff3d19f 100644
--- a/android/guava-bom/pom.xml
+++ b/android/guava-bom/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.guava</groupId>
   <artifactId>guava-bom</artifactId>
-  <version>33.1.0-android</version>
+  <version>33.1.0.2-android</version>
   <packaging>pom</packaging>
   
   <parent>
diff --git a/android/guava-testlib/pom.xml b/android/guava-testlib/pom.xml
index ca63f3429c9e..cc748ce43c29 100644
--- a/android/guava-testlib/pom.xml
+++ b/android/guava-testlib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.guava</groupId>
     <artifactId>guava-parent</artifactId>
-    <version>33.1.0-android</version>
+    <version>33.1.0.2-android</version>
   </parent>
   <artifactId>guava-testlib</artifactId>
   <name>Guava Testing Library</name>
diff --git a/android/guava-tests/pom.xml b/android/guava-tests/pom.xml
index 64f10fa20c93..e6bbd464cbc2 100644
--- a/android/guava-tests/pom.xml
+++ b/android/guava-tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.guava</groupId>
     <artifactId>guava-parent</artifactId>
-    <version>33.1.0-android</version>
+    <version>33.1.0.2-android</version>
   </parent>
   <artifactId>guava-tests</artifactId>
   <name>Guava Unit Tests</name>
diff --git a/android/guava/pom.xml b/android/guava/pom.xml
index db64f581ccde..c1b7964cd4ec 100644
--- a/android/guava/pom.xml
+++ b/android/guava/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.guava</groupId>
     <artifactId>guava-parent</artifactId>
-    <version>33.1.0-android</version>
+    <version>33.1.0.2-android</version>
   </parent>
   <artifactId>guava</artifactId>
   <packaging>bundle</packaging>
diff --git a/android/pom.xml b/android/pom.xml
index 61ec5c2f0f92..6f5a64e1106e 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.guava</groupId>
   <artifactId>guava-parent</artifactId>
-  <version>33.1.0-android</version>
+  <version>33.1.0.2-android</version>
   <packaging>pom</packaging>
   <name>Guava Maven Parent</name>
   <description>Parent for guava artifacts</description>
@@ -29,7 +29,7 @@
     <module.status>release</module.status>
     <variant.jvmEnvironment>android</variant.jvmEnvironment>
     <variant.jvmEnvironmentVariantName>android</variant.jvmEnvironmentVariantName>
-    <otherVariant.version>33.1.0-jre</otherVariant.version>
+    <otherVariant.version>33.1.0.2-jre</otherVariant.version>
     <otherVariant.jvmEnvironment>standard-jvm</otherVariant.jvmEnvironment>
     <otherVariant.jvmEnvironmentVariantName>jre</otherVariant.jvmEnvironmentVariantName>
   </properties>
diff --git a/guava-bom/pom.xml b/guava-bom/pom.xml
index e97ea553bebf..0d5718c86019 100644
--- a/guava-bom/pom.xml
+++ b/guava-bom/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.guava</groupId>
   <artifactId>guava-bom</artifactId>
-  <version>33.1.0-jre</version>
+  <version>33.1.0.2-jre</version>
   <packaging>pom</packaging>
   
   <parent>

From 0bafc7eabd864c872cf3181135b4ae6053e2f16d Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 15:06:37 -0400
Subject: [PATCH 19/31] Derive Gradle checker version expectation

---
 integration-tests/gradle/build.gradle.kts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index aef67c3dfb76..78ba23a1e73d 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -3,13 +3,16 @@ val runningGradle5 = gradle.gradleVersion.startsWith("5.")
 val guavaVersionJre =
   "<version>(.*)</version>".toRegex().find(file("../../pom.xml").readText())?.groups?.get(1)?.value
     ?: error("version not found in pom")
+val checkerVersion =
+  "<checker.version>(.*)</checker.version>".toRegex().find(file("../../pom.xml").readText())?.groups?.get(1)?.value
+    ?: error("checker.version not found in pom")
 
 val expectedReducedRuntimeClasspathAndroidVersion =
   setOf(
     "guava-${guavaVersionJre.replace("jre", "android")}.jar",
     "failureaccess-1.0.2.jar",
     "jsr305-3.0.2.jar",
-    "checker-qual-3.46.0.jar",
+    "checker-qual-$checkerVersion.jar",
     "error_prone_annotations-2.26.1.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
@@ -18,7 +21,7 @@ val expectedReducedRuntimeClasspathJreVersion =
     "guava-$guavaVersionJre.jar",
     "failureaccess-1.0.2.jar",
     "jsr305-3.0.2.jar",
-    "checker-qual-3.46.0.jar",
+    "checker-qual-$checkerVersion.jar",
     "error_prone_annotations-2.26.1.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )

From a4210653ffe6cfe7e8135356bf942c0b2aeb4d5d Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 15:43:03 -0400
Subject: [PATCH 20/31] Update Gradle JRE classpath expectations

---
 integration-tests/gradle/build.gradle.kts | 24 ++++++++++++++++++-----
 util/gradle_integration_tests.sh          |  1 +
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index 78ba23a1e73d..c986cc9c9910 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -1,11 +1,19 @@
 val runningGradle5 = gradle.gradleVersion.startsWith("5.")
 
+val pomText = file("../../pom.xml").readText()
+val androidPomText = file("../../android-pom.xml").readText()
 val guavaVersionJre =
-  "<version>(.*)</version>".toRegex().find(file("../../pom.xml").readText())?.groups?.get(1)?.value
+  "<version>(.*)</version>".toRegex().find(pomText)?.groups?.get(1)?.value
     ?: error("version not found in pom")
 val checkerVersion =
-  "<checker.version>(.*)</checker.version>".toRegex().find(file("../../pom.xml").readText())?.groups?.get(1)?.value
+  "<checker.version>(.*)</checker.version>".toRegex().find(pomText)?.groups?.get(1)?.value
     ?: error("checker.version not found in pom")
+val errorProneVersionJre =
+  "<errorprone.version>(.*)</errorprone.version>".toRegex().find(pomText)?.groups?.get(1)?.value
+    ?: error("errorprone.version not found in pom")
+val errorProneVersionAndroid =
+  "<errorprone.version>(.*)</errorprone.version>".toRegex().find(androidPomText)?.groups?.get(1)?.value
+    ?: error("errorprone.version not found in android pom")
 
 val expectedReducedRuntimeClasspathAndroidVersion =
   setOf(
@@ -13,7 +21,7 @@ val expectedReducedRuntimeClasspathAndroidVersion =
     "failureaccess-1.0.2.jar",
     "jsr305-3.0.2.jar",
     "checker-qual-$checkerVersion.jar",
-    "error_prone_annotations-2.26.1.jar",
+    "error_prone_annotations-$errorProneVersionAndroid.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
 val expectedReducedRuntimeClasspathJreVersion =
@@ -22,13 +30,19 @@ val expectedReducedRuntimeClasspathJreVersion =
     "failureaccess-1.0.2.jar",
     "jsr305-3.0.2.jar",
     "checker-qual-$checkerVersion.jar",
-    "error_prone_annotations-2.26.1.jar",
+    "error_prone_annotations-$errorProneVersionJre.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
 val expectedCompileClasspathAndroidVersion =
   expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-3.0.0.jar")
 val expectedCompileClasspathJreVersion =
   expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-3.0.0.jar")
+val expectedPomClasspathJreVersion =
+  expectedCompileClasspathJreVersion +
+    setOf(
+      "checker-$checkerVersion.jar",
+      "checker-util-$checkerVersion.jar"
+    )
 
 val extraLegacyDependencies = setOf("google-collections-1.0.jar")
 
@@ -65,7 +79,7 @@ subprojects {
       if (name.startsWith("android")) {
         expectedCompileClasspathAndroidVersion + extraLegacyDependencies
       } else {
-        expectedCompileClasspathJreVersion + extraLegacyDependencies
+        expectedPomClasspathJreVersion + extraLegacyDependencies
       }
     } else {
       // with Gradle Module Metadata
diff --git a/util/gradle_integration_tests.sh b/util/gradle_integration_tests.sh
index bada3ddbc64a..f72bbd46e9ba 100755
--- a/util/gradle_integration_tests.sh
+++ b/util/gradle_integration_tests.sh
@@ -24,6 +24,7 @@ trap 'rm -rf "${GRADLE_TEMP}"' EXIT
 # (And the file needs to be two directory levels up from the Gradle build file.)
 # TODO(cpovirk): Find a better way to give them that information.
 cp pom.xml "${GRADLE_TEMP}"
+cp android/pom.xml "${GRADLE_TEMP}/android-pom.xml"
 
 for version in 5.6.4 7.0.2; do
   # Enter a subshell so that we return to the current directory afterward.

From 5d33390e2f6b8ab982a3c2cc32a4f142d3cda867 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 16:14:51 -0400
Subject: [PATCH 21/31] Use EISOP checker group in Gradle metadata

---
 guava/module.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/guava/module.json b/guava/module.json
index 0e7e5d85d087..f0b81bd8851f 100644
--- a/guava/module.json
+++ b/guava/module.json
@@ -48,7 +48,7 @@
           }
         },
         {
-          "group": "org.checkerframework",
+          "group": "io.github.eisop",
           "module": "checker-qual",
           "version": {
             "requires": "${checker.version}"
@@ -121,7 +121,7 @@
           }
         },
         {
-          "group": "org.checkerframework",
+          "group": "io.github.eisop",
           "module": "checker-qual",
           "version": {
             "requires": "${checker.version}"
@@ -187,7 +187,7 @@
           }
         },
         {
-          "group": "org.checkerframework",
+          "group": "io.github.eisop",
           "module": "checker-qual",
           "version": {
             "requires": "${checker.version}"
@@ -260,7 +260,7 @@
           }
         },
         {
-          "group": "org.checkerframework",
+          "group": "io.github.eisop",
           "module": "checker-qual",
           "version": {
             "requires": "${checker.version}"

From 9836f52c08bf69a035ea5e4b78516d1c518a2a72 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 16:50:28 -0400
Subject: [PATCH 22/31] Handle cross-variant Gradle metadata dependencies

---
 integration-tests/gradle/build.gradle.kts | 46 +++++++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index c986cc9c9910..6eab258c3a44 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -33,10 +33,32 @@ val expectedReducedRuntimeClasspathJreVersion =
     "error_prone_annotations-$errorProneVersionJre.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
+val expectedReducedRuntimeClasspathAndroidVersionFromJreMetadata =
+  setOf(
+    "guava-${guavaVersionJre.replace("jre", "android")}.jar",
+    "failureaccess-1.0.2.jar",
+    "jsr305-3.0.2.jar",
+    "checker-qual-$checkerVersion.jar",
+    "error_prone_annotations-$errorProneVersionJre.jar",
+    "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
+  )
+val expectedReducedRuntimeClasspathJreVersionFromAndroidMetadata =
+  setOf(
+    "guava-$guavaVersionJre.jar",
+    "failureaccess-1.0.2.jar",
+    "jsr305-3.0.2.jar",
+    "checker-qual-$checkerVersion.jar",
+    "error_prone_annotations-$errorProneVersionAndroid.jar",
+    "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
+  )
 val expectedCompileClasspathAndroidVersion =
   expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-3.0.0.jar")
 val expectedCompileClasspathJreVersion =
   expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-3.0.0.jar")
+val expectedCompileClasspathAndroidVersionFromJreMetadata =
+  expectedReducedRuntimeClasspathAndroidVersionFromJreMetadata + setOf("j2objc-annotations-3.0.0.jar")
+val expectedCompileClasspathJreVersionFromAndroidMetadata =
+  expectedReducedRuntimeClasspathJreVersionFromAndroidMetadata + setOf("j2objc-annotations-3.0.0.jar")
 val expectedPomClasspathJreVersion =
   expectedCompileClasspathJreVersion +
     setOf(
@@ -89,10 +111,18 @@ subprojects {
       if (name.contains("Android") && !name.contains("JreConstraint")) {
         when {
           name.contains("RuntimeClasspath") -> {
-            expectedReducedRuntimeClasspathAndroidVersion
+            if (name.startsWith("android")) {
+              expectedReducedRuntimeClasspathAndroidVersion
+            } else {
+              expectedReducedRuntimeClasspathAndroidVersionFromJreMetadata
+            }
           }
           name.contains("CompileClasspath") -> {
-            expectedCompileClasspathAndroidVersion
+            if (name.startsWith("android")) {
+              expectedCompileClasspathAndroidVersion
+            } else {
+              expectedCompileClasspathAndroidVersionFromJreMetadata
+            }
           }
           else -> {
             error("unexpected classpath type: $name")
@@ -101,10 +131,18 @@ subprojects {
       } else {
         when {
           name.contains("RuntimeClasspath") -> {
-            expectedReducedRuntimeClasspathJreVersion
+            if (name.startsWith("android")) {
+              expectedReducedRuntimeClasspathJreVersionFromAndroidMetadata
+            } else {
+              expectedReducedRuntimeClasspathJreVersion
+            }
           }
           name.contains("CompileClasspath") -> {
-            expectedCompileClasspathJreVersion
+            if (name.startsWith("android")) {
+              expectedCompileClasspathJreVersionFromAndroidMetadata
+            } else {
+              expectedCompileClasspathJreVersion
+            }
           }
           else -> {
             error("unexpected classpath type: $name")

From 8c8c1476853fd416d4c6710b38e0440f27db59dd Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 17:38:14 -0400
Subject: [PATCH 23/31] Restore Error Prone compiler arg

---
 android/pom.xml | 2 +-
 pom.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index 6f5a64e1106e..275f64c57d20 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -460,7 +460,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
+                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can
diff --git a/pom.xml b/pom.xml
index 8751775b476e..bebd1b7dd3ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,7 +465,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
+                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can

From 7ed4eb3b8149c05879f475924104ec5c343394e3 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 17:48:18 -0400
Subject: [PATCH 24/31] Disable Error Prone plugin arg

---
 android/pom.xml | 2 +-
 pom.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index 275f64c57d20..6f5a64e1106e 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -460,7 +460,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
+<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can
diff --git a/pom.xml b/pom.xml
index bebd1b7dd3ba..8751775b476e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,7 +465,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
+<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can

From 815d0a922b5bbe7065d184ba6c8bb4ed0a1a664b Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 17:58:24 -0400
Subject: [PATCH 25/31] Wire Error Prone compiler plugin path

---
 android/pom.xml | 11 +++++++----
 pom.xml         | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index 6f5a64e1106e..8345bafe9d11 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -141,15 +141,18 @@
               <arg>-XDcompilePolicy=simple</arg>
               <!-- -Xplugin:ErrorProne is set conditionally by a profile. -->
             </compilerArgs>
-	    <!--
             <annotationProcessorPaths>
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>2.23.0</version>
+                <version>${errorprone.version}</version>
+              </path>
+              <path>
+                <groupId>io.github.eisop</groupId>
+                <artifactId>checker</artifactId>
+                <version>${checker.version}</version>
               </path>
             </annotationProcessorPaths>
-	    -->
             <!-- Fork:
 
                  - for JDK8 because we use a javac9 bootclasspath
@@ -460,7 +463,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
+                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can
diff --git a/pom.xml b/pom.xml
index 8751775b476e..a3761b632426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,15 +144,18 @@
               <arg>-XDcompilePolicy=simple</arg>
               <!-- -Xplugin:ErrorProne is set conditionally by a profile. -->
             </compilerArgs>
-	    <!--
             <annotationProcessorPaths>
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>2.23.0</version>
+                <version>${errorprone.version}</version>
+              </path>
+              <path>
+                <groupId>io.github.eisop</groupId>
+                <artifactId>checker</artifactId>
+                <version>${checker.version}</version>
               </path>
             </annotationProcessorPaths>
-	    -->
             <!-- Fork:
 
                  - for JDK8 because we use a javac9 bootclasspath
@@ -465,7 +468,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
+                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can

From 79bdb656f7759699d842444398b0a0e313fa91ae Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Tue, 16 Jun 2026 18:13:57 -0400
Subject: [PATCH 26/31] Use JDK 11-compatible Error Prone

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a3761b632426..4b8e6b1131f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <truth.version>1.4.2</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
     <checker.version>3.49.5-eisop1</checker.version>
-    <errorprone.version>2.42.0</errorprone.version>
+    <errorprone.version>2.26.1</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>
     <!-- Empty for all JDKs but 9-12 -->

From 3d7073a2c7332c1b3565b87f2134fdf6d2707246 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Sat, 1 Aug 2026 01:37:14 -0400
Subject: [PATCH 27/31] Scope Error Prone away from guava-tests

---
 android/guava-tests/pom.xml | 7 +++++++
 android/pom.xml             | 3 ++-
 guava-tests/pom.xml         | 7 +++++++
 pom.xml                     | 3 ++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/android/guava-tests/pom.xml b/android/guava-tests/pom.xml
index e6bbd464cbc2..4030f8a895dd 100644
--- a/android/guava-tests/pom.xml
+++ b/android/guava-tests/pom.xml
@@ -69,6 +69,13 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <compilerArgs combine.self="override">
+            <arg>-sourcepath</arg>
+            <arg>doesnotexist</arg>
+            <arg>-XDcompilePolicy=simple</arg>
+          </compilerArgs>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
diff --git a/android/pom.xml b/android/pom.xml
index 8345bafe9d11..7f40197ca995 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -18,6 +18,7 @@
     <jsr305.version>3.0.2</jsr305.version>
     <checker.version>3.49.5-eisop1</checker.version>
     <errorprone.version>2.26.1</errorprone.version>
+    <errorprone.compiler.arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</errorprone.compiler.arg>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>
     <!-- Empty for all JDKs but 9-12 -->
@@ -463,7 +464,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
+                <arg>${errorprone.compiler.arg}</arg>
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can
diff --git a/guava-tests/pom.xml b/guava-tests/pom.xml
index 3d91892a76bf..c3fc8d9ab86c 100644
--- a/guava-tests/pom.xml
+++ b/guava-tests/pom.xml
@@ -75,6 +75,13 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <compilerArgs combine.self="override">
+            <arg>-sourcepath</arg>
+            <arg>doesnotexist</arg>
+            <arg>-XDcompilePolicy=simple</arg>
+          </compilerArgs>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 4b8e6b1131f5..a4837d4bf019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,7 @@
     <jsr305.version>3.0.2</jsr305.version>
     <checker.version>3.49.5-eisop1</checker.version>
     <errorprone.version>2.26.1</errorprone.version>
+    <errorprone.compiler.arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</errorprone.compiler.arg>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>
     <!-- Empty for all JDKs but 9-12 -->
@@ -468,7 +469,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
+                <arg>${errorprone.compiler.arg}</arg>
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can

From 952012ca8e4d1a24a9267239b9126db1e9db9fca Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Sat, 1 Aug 2026 04:13:54 -0400
Subject: [PATCH 28/31] Trim Error Prone CI configuration

---
 android/pom.xml                           | 3 +--
 integration-tests/gradle/build.gradle.kts | 6 +++++-
 pom.xml                                   | 3 +--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index 7f40197ca995..8345bafe9d11 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -18,7 +18,6 @@
     <jsr305.version>3.0.2</jsr305.version>
     <checker.version>3.49.5-eisop1</checker.version>
     <errorprone.version>2.26.1</errorprone.version>
-    <errorprone.compiler.arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</errorprone.compiler.arg>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>
     <!-- Empty for all JDKs but 9-12 -->
@@ -464,7 +463,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>${errorprone.compiler.arg}</arg>
+                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can
diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index 6eab258c3a44..cbad4571ff11 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -1,7 +1,11 @@
 val runningGradle5 = gradle.gradleVersion.startsWith("5.")
 
 val pomText = file("../../pom.xml").readText()
-val androidPomText = file("../../android-pom.xml").readText()
+val androidPomFile =
+  listOf(file("../../android/pom.xml"), file("../../android-pom.xml"))
+    .firstOrNull { it.isFile }
+    ?: error("android pom not found")
+val androidPomText = androidPomFile.readText()
 val guavaVersionJre =
   "<version>(.*)</version>".toRegex().find(pomText)?.groups?.get(1)?.value
     ?: error("version not found in pom")
diff --git a/pom.xml b/pom.xml
index a4837d4bf019..4b8e6b1131f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@
     <jsr305.version>3.0.2</jsr305.version>
     <checker.version>3.49.5-eisop1</checker.version>
     <errorprone.version>2.26.1</errorprone.version>
-    <errorprone.compiler.arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</errorprone.compiler.arg>
     <j2objc.version>3.0.0</j2objc.version>
     <javac.version>9+181-r4173-1</javac.version>
     <!-- Empty for all JDKs but 9-12 -->
@@ -469,7 +468,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>${errorprone.compiler.arg}</arg>
+                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can

From aa0a3f9437b9efacb7e3ef4f07a85d1d1b6620f3 Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Sat, 1 Aug 2026 04:21:09 -0400
Subject: [PATCH 29/31] Trim Gradle classpath expectations

---
 integration-tests/gradle/build.gradle.kts | 56 ++---------------------
 util/gradle_integration_tests.sh          |  3 +-
 2 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index cbad4571ff11..99dd674ac480 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -1,11 +1,6 @@
 val runningGradle5 = gradle.gradleVersion.startsWith("5.")
 
 val pomText = file("../../pom.xml").readText()
-val androidPomFile =
-  listOf(file("../../android/pom.xml"), file("../../android-pom.xml"))
-    .firstOrNull { it.isFile }
-    ?: error("android pom not found")
-val androidPomText = androidPomFile.readText()
 val guavaVersionJre =
   "<version>(.*)</version>".toRegex().find(pomText)?.groups?.get(1)?.value
     ?: error("version not found in pom")
@@ -15,9 +10,6 @@ val checkerVersion =
 val errorProneVersionJre =
   "<errorprone.version>(.*)</errorprone.version>".toRegex().find(pomText)?.groups?.get(1)?.value
     ?: error("errorprone.version not found in pom")
-val errorProneVersionAndroid =
-  "<errorprone.version>(.*)</errorprone.version>".toRegex().find(androidPomText)?.groups?.get(1)?.value
-    ?: error("errorprone.version not found in android pom")
 
 val expectedReducedRuntimeClasspathAndroidVersion =
   setOf(
@@ -25,7 +17,7 @@ val expectedReducedRuntimeClasspathAndroidVersion =
     "failureaccess-1.0.2.jar",
     "jsr305-3.0.2.jar",
     "checker-qual-$checkerVersion.jar",
-    "error_prone_annotations-$errorProneVersionAndroid.jar",
+    "error_prone_annotations-$errorProneVersionJre.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
 val expectedReducedRuntimeClasspathJreVersion =
@@ -37,32 +29,10 @@ val expectedReducedRuntimeClasspathJreVersion =
     "error_prone_annotations-$errorProneVersionJre.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
-val expectedReducedRuntimeClasspathAndroidVersionFromJreMetadata =
-  setOf(
-    "guava-${guavaVersionJre.replace("jre", "android")}.jar",
-    "failureaccess-1.0.2.jar",
-    "jsr305-3.0.2.jar",
-    "checker-qual-$checkerVersion.jar",
-    "error_prone_annotations-$errorProneVersionJre.jar",
-    "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-  )
-val expectedReducedRuntimeClasspathJreVersionFromAndroidMetadata =
-  setOf(
-    "guava-$guavaVersionJre.jar",
-    "failureaccess-1.0.2.jar",
-    "jsr305-3.0.2.jar",
-    "checker-qual-$checkerVersion.jar",
-    "error_prone_annotations-$errorProneVersionAndroid.jar",
-    "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-  )
 val expectedCompileClasspathAndroidVersion =
   expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-3.0.0.jar")
 val expectedCompileClasspathJreVersion =
   expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-3.0.0.jar")
-val expectedCompileClasspathAndroidVersionFromJreMetadata =
-  expectedReducedRuntimeClasspathAndroidVersionFromJreMetadata + setOf("j2objc-annotations-3.0.0.jar")
-val expectedCompileClasspathJreVersionFromAndroidMetadata =
-  expectedReducedRuntimeClasspathJreVersionFromAndroidMetadata + setOf("j2objc-annotations-3.0.0.jar")
 val expectedPomClasspathJreVersion =
   expectedCompileClasspathJreVersion +
     setOf(
@@ -115,18 +85,10 @@ subprojects {
       if (name.contains("Android") && !name.contains("JreConstraint")) {
         when {
           name.contains("RuntimeClasspath") -> {
-            if (name.startsWith("android")) {
-              expectedReducedRuntimeClasspathAndroidVersion
-            } else {
-              expectedReducedRuntimeClasspathAndroidVersionFromJreMetadata
-            }
+            expectedReducedRuntimeClasspathAndroidVersion
           }
           name.contains("CompileClasspath") -> {
-            if (name.startsWith("android")) {
-              expectedCompileClasspathAndroidVersion
-            } else {
-              expectedCompileClasspathAndroidVersionFromJreMetadata
-            }
+            expectedCompileClasspathAndroidVersion
           }
           else -> {
             error("unexpected classpath type: $name")
@@ -135,18 +97,10 @@ subprojects {
       } else {
         when {
           name.contains("RuntimeClasspath") -> {
-            if (name.startsWith("android")) {
-              expectedReducedRuntimeClasspathJreVersionFromAndroidMetadata
-            } else {
-              expectedReducedRuntimeClasspathJreVersion
-            }
+            expectedReducedRuntimeClasspathJreVersion
           }
           name.contains("CompileClasspath") -> {
-            if (name.startsWith("android")) {
-              expectedCompileClasspathJreVersionFromAndroidMetadata
-            } else {
-              expectedCompileClasspathJreVersion
-            }
+            expectedCompileClasspathJreVersion
           }
           else -> {
             error("unexpected classpath type: $name")
diff --git a/util/gradle_integration_tests.sh b/util/gradle_integration_tests.sh
index f72bbd46e9ba..00ca32857599 100755
--- a/util/gradle_integration_tests.sh
+++ b/util/gradle_integration_tests.sh
@@ -20,11 +20,10 @@ set -eu
 GRADLE_TEMP="$(mktemp -d)"
 trap 'rm -rf "${GRADLE_TEMP}"' EXIT
 
-# The Gradle tests need the pom.xml only to read its version number.
+# The Gradle tests need the pom.xml only to read its version numbers.
 # (And the file needs to be two directory levels up from the Gradle build file.)
 # TODO(cpovirk): Find a better way to give them that information.
 cp pom.xml "${GRADLE_TEMP}"
-cp android/pom.xml "${GRADLE_TEMP}/android-pom.xml"
 
 for version in 5.6.4 7.0.2; do
   # Enter a subshell so that we return to the current directory afterward.

From 84dae4d08da5fb04b4ba425a4dc55977f0e2099c Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Sat, 1 Aug 2026 11:54:27 -0400
Subject: [PATCH 30/31] Minimize Gradle expectation diff

---
 integration-tests/gradle/build.gradle.kts | 13 ++++---------
 util/gradle_integration_tests.sh          |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index 99dd674ac480..37bec6994e58 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -1,23 +1,18 @@
 val runningGradle5 = gradle.gradleVersion.startsWith("5.")
 
-val pomText = file("../../pom.xml").readText()
 val guavaVersionJre =
-  "<version>(.*)</version>".toRegex().find(pomText)?.groups?.get(1)?.value
+  "<version>(.*)</version>".toRegex().find(file("../../pom.xml").readText())?.groups?.get(1)?.value
     ?: error("version not found in pom")
 val checkerVersion =
-  "<checker.version>(.*)</checker.version>".toRegex().find(pomText)?.groups?.get(1)?.value
+  "<checker.version>(.*)</checker.version>".toRegex().find(file("../../pom.xml").readText())?.groups?.get(1)?.value
     ?: error("checker.version not found in pom")
-val errorProneVersionJre =
-  "<errorprone.version>(.*)</errorprone.version>".toRegex().find(pomText)?.groups?.get(1)?.value
-    ?: error("errorprone.version not found in pom")
-
 val expectedReducedRuntimeClasspathAndroidVersion =
   setOf(
     "guava-${guavaVersionJre.replace("jre", "android")}.jar",
     "failureaccess-1.0.2.jar",
     "jsr305-3.0.2.jar",
     "checker-qual-$checkerVersion.jar",
-    "error_prone_annotations-$errorProneVersionJre.jar",
+    "error_prone_annotations-2.26.1.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
 val expectedReducedRuntimeClasspathJreVersion =
@@ -26,7 +21,7 @@ val expectedReducedRuntimeClasspathJreVersion =
     "failureaccess-1.0.2.jar",
     "jsr305-3.0.2.jar",
     "checker-qual-$checkerVersion.jar",
-    "error_prone_annotations-$errorProneVersionJre.jar",
+    "error_prone_annotations-2.26.1.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
 val expectedCompileClasspathAndroidVersion =
diff --git a/util/gradle_integration_tests.sh b/util/gradle_integration_tests.sh
index 00ca32857599..bada3ddbc64a 100755
--- a/util/gradle_integration_tests.sh
+++ b/util/gradle_integration_tests.sh
@@ -20,7 +20,7 @@ set -eu
 GRADLE_TEMP="$(mktemp -d)"
 trap 'rm -rf "${GRADLE_TEMP}"' EXIT
 
-# The Gradle tests need the pom.xml only to read its version numbers.
+# The Gradle tests need the pom.xml only to read its version number.
 # (And the file needs to be two directory levels up from the Gradle build file.)
 # TODO(cpovirk): Find a better way to give them that information.
 cp pom.xml "${GRADLE_TEMP}"

From bbb0a0cb618f26dc69d872cd6b9354acf5e0ca9f Mon Sep 17 00:00:00 2001
From: Aosen Xiong <aosen.xiong@uwaterloo.ca>
Date: Sat, 1 Aug 2026 12:07:55 -0400
Subject: [PATCH 31/31] Disable Error Prone compiler plugin

---
 android/guava-tests/pom.xml |  7 -------
 android/pom.xml             | 11 ++++-------
 guava-tests/pom.xml         |  7 -------
 pom.xml                     | 11 ++++-------
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/android/guava-tests/pom.xml b/android/guava-tests/pom.xml
index 4030f8a895dd..e6bbd464cbc2 100644
--- a/android/guava-tests/pom.xml
+++ b/android/guava-tests/pom.xml
@@ -69,13 +69,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs combine.self="override">
-            <arg>-sourcepath</arg>
-            <arg>doesnotexist</arg>
-            <arg>-XDcompilePolicy=simple</arg>
-          </compilerArgs>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
diff --git a/android/pom.xml b/android/pom.xml
index 8345bafe9d11..6f5a64e1106e 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -141,18 +141,15 @@
               <arg>-XDcompilePolicy=simple</arg>
               <!-- -Xplugin:ErrorProne is set conditionally by a profile. -->
             </compilerArgs>
+	    <!--
             <annotationProcessorPaths>
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>${errorprone.version}</version>
-              </path>
-              <path>
-                <groupId>io.github.eisop</groupId>
-                <artifactId>checker</artifactId>
-                <version>${checker.version}</version>
+                <version>2.23.0</version>
               </path>
             </annotationProcessorPaths>
+	    -->
             <!-- Fork:
 
                  - for JDK8 because we use a javac9 bootclasspath
@@ -463,7 +460,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
+<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can
diff --git a/guava-tests/pom.xml b/guava-tests/pom.xml
index c3fc8d9ab86c..3d91892a76bf 100644
--- a/guava-tests/pom.xml
+++ b/guava-tests/pom.xml
@@ -75,13 +75,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs combine.self="override">
-            <arg>-sourcepath</arg>
-            <arg>doesnotexist</arg>
-            <arg>-XDcompilePolicy=simple</arg>
-          </compilerArgs>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 4b8e6b1131f5..dc3ca70d3ea9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,18 +144,15 @@
               <arg>-XDcompilePolicy=simple</arg>
               <!-- -Xplugin:ErrorProne is set conditionally by a profile. -->
             </compilerArgs>
+	    <!--
             <annotationProcessorPaths>
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>${errorprone.version}</version>
-              </path>
-              <path>
-                <groupId>io.github.eisop</groupId>
-                <artifactId>checker</artifactId>
-                <version>${checker.version}</version>
+                <version>2.23.0</version>
               </path>
             </annotationProcessorPaths>
+	    -->
             <!-- Fork:
 
                  - for JDK8 because we use a javac9 bootclasspath
@@ -468,7 +465,7 @@
                      be passed as part of the same <arg> as -Xplugin:ErrorProne,
                      and I gave up trying to figure out how to do that for test
                      compilation only. -->
-                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
+<!--                <arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>-->
                 <!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can