From 8f35aa07c90acf4930d683d44575353bfe84a7c2 Mon Sep 17 00:00:00 2001
From: Dave Syer <david.syer@broadcom.com>
Date: Mon, 24 Nov 2025 10:15:27 +0000
Subject: [PATCH] Update libraries and Java 17

---
 .github/workflows/testing.yml                 |  2 +-
 .gitignore                                    |  3 ++
 .mvn/jvm.config                               | 11 +++++
 examples/pom.xml                              | 34 ++++++++------
 pom.xml                                       | 47 +++++++++++++------
 .../checkers/ExperimentalApiChecker.java      |  1 -
 6 files changed, 67 insertions(+), 31 deletions(-)
 create mode 100644 .mvn/jvm.config

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 8e7571b..9aef851 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven
diff --git a/.gitignore b/.gitignore
index 2c6822d..6e05276 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# vscode
+.vscode/
+
 # intellij
 .idea/
 *.iml
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 0000000..739141c
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1,11 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
diff --git a/examples/pom.xml b/examples/pom.xml
index 63e4a42..fa9a79c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -11,7 +11,7 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-core</artifactId>
-      <version>1.17.1</version>
+      <version>1.76.0</version>
     </dependency>
   </dependencies>
 
@@ -20,36 +20,40 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.14.1</version>
         <configuration>
           <compilerId>javac-with-errorprone</compilerId>
-          <forceJavacCompilerUse>true</forceJavacCompilerUse>
-          <source>1.8</source>
-          <target>1.8</target>
+          <forceLegacyJavacApi>true</forceLegacyJavacApi>
+          <release>17</release>
           <annotationProcessorPaths>
             <path>
               <groupId>io.grpc</groupId>
               <artifactId>grpc-java-api-checker</artifactId>
-              <version>1.1.0</version>
+              <version>2.0.0-SNAPSHOT</version>
+            </path>
+            <path>
+              <groupId>com.google.errorprone</groupId>
+              <artifactId>error_prone_core</artifactId>
+              <version>2.39.0</version>
             </path>
           </annotationProcessorPaths>
           <!-- You can specify the settings -->
           <compilerArgs>
-            <arg>-XepDisableAllChecks</arg>
-            <arg>-Xep:GrpcInternal:ERROR</arg>
-            <arg>-Xep:GrpcExperimentalApi:ERROR</arg>
+            <arg>-XDcompilePolicy=simple</arg>
+            <arg>--should-stop=ifError=FLOW</arg>
+            <arg>-Xplugin:ErrorProne -XepAllErrorsAsWarnings</arg>
           </compilerArgs>
         </configuration>
         <dependencies>
-          <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-compiler-javac-errorprone</artifactId>
-            <version>2.5</version>
-          </dependency>
           <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_core</artifactId>
-            <version>2.3.2</version>
+            <version>2.39.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-javac-errorprone</artifactId>
+            <version>2.15.0</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/pom.xml b/pom.xml
index e6e29ff..b4e9d15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,10 +19,10 @@
 
   <groupId>io.grpc</groupId>
   <artifactId>grpc-java-api-checker</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 
   <name>grpc-java-api-checker</name>
-  <description>An Error Prone plugin that checks for usages of grpc-java experimental or internal APIs.</description>
+  <description>An Error Prone plugin that checks for usages of grpc java experimental or internal APIs.</description>
   <url>https://github.com/grpc/grpc-java-api-checker</url>
 
   <licenses>
@@ -34,10 +34,9 @@
   </licenses>
 
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <errorprone.version>2.10.0</errorprone.version>
+    <errorprone.version>2.39.0</errorprone.version>
     <javac.version>9+181-r4173-1</javac.version>
   </properties>
 
@@ -76,6 +75,11 @@
       <version>${errorprone.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -93,7 +97,7 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>1.7.4</version>
+      <version>1.10.4</version>
     </dependency>
   </dependencies>
 
@@ -113,21 +117,36 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
+        <version>3.14.1</version>
         <configuration>
+          <parameters>true</parameters>
+          <forceJavacCompilerUse>true</forceJavacCompilerUse>
           <source>${maven.compiler.source}</source>
-          <target>${maven.compiler.target}</target>
+          <target>${maven.compiler.source}</target>
+          <compilerArgs>
+            <arg>--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+            <arg>--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+            <arg>--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+            <arg>--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+            <arg>--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+            <arg>--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+            <arg>--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+            <arg>--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+            <arg>--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+            <arg>--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+            <arg>--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+          </compilerArgs>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20.1</version>
+        <version>3.5.4</version>
         <configuration>
-            <argLine>-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar</argLine>
+            <argLine>--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
-      <plugin>
+      <!--plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <version>1.4.1</version>
@@ -144,7 +163,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin-->
     </plugins>
   </build>
 
@@ -174,11 +193,11 @@
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
+            <artifactId>mavenavadoc-plugin</artifactId>
             <version>3.0.0</version>
             <executions>
               <execution>
-                <id>attach-javadocs</id>
+                <id>attachavadocs</id>
                 <goals>
                   <goal>jar</goal>
                 </goals>
diff --git a/src/main/java/io/grpc/annotations/checkers/ExperimentalApiChecker.java b/src/main/java/io/grpc/annotations/checkers/ExperimentalApiChecker.java
index cb382be..4335f46 100644
--- a/src/main/java/io/grpc/annotations/checkers/ExperimentalApiChecker.java
+++ b/src/main/java/io/grpc/annotations/checkers/ExperimentalApiChecker.java
@@ -59,7 +59,6 @@ protected Description describe(Tree tree, AnnotationMirror annotation) {
         tree,
         this.canonicalName(),
         link == null ? this.linkUrl() : link,
-        this.defaultSeverity(),
         this.message())
         .build();
   }