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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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>