From f358c05162c07fdf9967b956779984de0139ba3e Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Tue, 1 Oct 2024 09:06:11 -0700
Subject: [PATCH] Use JDK 23 for compilation (and a few other plugins), while
 keeping overrides in place for a few others.

(For more detail on the other plugins, see cl/655647768.)

RELNOTES=n/a
PiperOrigin-RevId: 681043097
---
 .../test/com/google/common/base/ConverterTest.java        | 4 +++-
 android/pom.xml                                           | 8 ++++----
 .../test/com/google/common/base/ConverterTest.java        | 4 +++-
 pom.xml                                                   | 8 ++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/android/guava-tests/test/com/google/common/base/ConverterTest.java b/android/guava-tests/test/com/google/common/base/ConverterTest.java
index 9bf2a6ed3f8d..d74331af2996 100644
--- a/android/guava-tests/test/com/google/common/base/ConverterTest.java
+++ b/android/guava-tests/test/com/google/common/base/ConverterTest.java
@@ -140,7 +140,9 @@ public String toString() {
 
     assertEquals("StringWrapper.andThen(string2long)", converter.toString());
 
-    assertEquals(first.andThen(STR_TO_LONG), first.andThen(STR_TO_LONG));
+    new EqualsTester()
+        .addEqualityGroup(first.andThen(STR_TO_LONG), first.andThen(STR_TO_LONG))
+        .testEquals();
   }
 
   @GwtIncompatible // J2CL generics problem
diff --git a/android/pom.xml b/android/pom.xml
index a3a3a75c625a..602c9b6015ac 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -173,7 +173,7 @@
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>2.23.0</version>
+                <version>2.33.0</version>
               </path>
             </annotationProcessorPaths>
             <!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->
@@ -206,14 +206,14 @@
               </configuration>
             </execution>
             <execution>
-              <id>download-22-and-surefire-version</id>
+              <id>download-23-and-surefire-version</id>
               <goals>
                 <goal>toolchain</goal>
               </goals>
               <configuration>
                 <toolchains>
                   <jdk>
-                    <version>22</version>
+                    <version>23</version>
                     <vendor>zulu</vendor>
                   </jdk>
                   <testJdk>
@@ -238,7 +238,7 @@
           <configuration>
             <toolchains>
               <jdk>
-                <version>22</version>
+                <version>23</version>
                 <vendor>zulu</vendor>
               </jdk>
             </toolchains>
diff --git a/guava-tests/test/com/google/common/base/ConverterTest.java b/guava-tests/test/com/google/common/base/ConverterTest.java
index 9bf2a6ed3f8d..d74331af2996 100644
--- a/guava-tests/test/com/google/common/base/ConverterTest.java
+++ b/guava-tests/test/com/google/common/base/ConverterTest.java
@@ -140,7 +140,9 @@ public String toString() {
 
     assertEquals("StringWrapper.andThen(string2long)", converter.toString());
 
-    assertEquals(first.andThen(STR_TO_LONG), first.andThen(STR_TO_LONG));
+    new EqualsTester()
+        .addEqualityGroup(first.andThen(STR_TO_LONG), first.andThen(STR_TO_LONG))
+        .testEquals();
   }
 
   @GwtIncompatible // J2CL generics problem
diff --git a/pom.xml b/pom.xml
index b8de0f4a8f6c..8fdec7f7c823 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,7 @@
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>2.23.0</version>
+                <version>2.33.0</version>
               </path>
             </annotationProcessorPaths>
             <!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->
@@ -207,14 +207,14 @@
               </configuration>
             </execution>
             <execution>
-              <id>download-22-and-surefire-version</id>
+              <id>download-23-and-surefire-version</id>
               <goals>
                 <goal>toolchain</goal>
               </goals>
               <configuration>
                 <toolchains>
                   <jdk>
-                    <version>22</version>
+                    <version>23</version>
                     <vendor>zulu</vendor>
                   </jdk>
                   <testJdk>
@@ -239,7 +239,7 @@
           <configuration>
             <toolchains>
               <jdk>
-                <version>22</version>
+                <version>23</version>
                 <vendor>zulu</vendor>
               </jdk>
             </toolchains>