From 2ec433869a8d0ff830b520c02bb75578f266bbd2 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Mon, 24 Nov 2025 11:33:17 -0800
Subject: [PATCH] Upgrade deps; require Java 11

Error Prone 2.11 started requiring Java 11, so the previous version was
already the last version that supported Java 8. Error Prone 2.32
requires Java 17, so stopped on 2.31 for now.

This fixes:
```
java.lang.NoSuchMethodError: 'com.google.errorprone.matchers.Description$Builder com.google.errorprone.matchers.Description.builder(com.sun.source.tree.Tree, java.lang.String, java.lang.String, com.google.errorprone.BugPattern$SeverityLevel, java.lang.String)'
    at io.grpc.annotations.checkers.ExperimentalApiChecker.describe(ExperimentalApiChecker.java:58)
```

Error Prone 2.18.0 marked Description.builder() as `@RestrictedApi`, and
then Error Prone 2.19.0 changed its signature.

Fixes #29
---
 .github/workflows/testing.yml                 |  2 +-
 pom.xml                                       | 58 ++++++++++++-------
 .../checkers/ExperimentalApiChecker.java      | 12 ++--
 3 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 8e7571b..60da82a 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: '11'
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven
diff --git a/pom.xml b/pom.xml
index e6e29ff..c8e83da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <errorprone.version>2.10.0</errorprone.version>
-    <javac.version>9+181-r4173-1</javac.version>
+    <errorprone.version>2.31.0</errorprone.version>
   </properties>
 
   <scm>
@@ -64,12 +63,6 @@
   </developers>
 
   <dependencies>
-    <dependency>
-      <groupId>com.google.auto.service</groupId>
-      <artifactId>auto-service</artifactId>
-      <version>1.1.1</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_core</artifactId>
@@ -93,7 +86,26 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>1.7.4</version>
+      <version>1.10.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>33.0.0-jre</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.checkerframework</groupId>
+      <artifactId>checker-qual</artifactId>
+      <version>3.42.0</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -113,24 +125,28 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
+        <version>3.14.1</version>
         <configuration>
           <source>${maven.compiler.source}</source>
           <target>${maven.compiler.target}</target>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>com.google.auto.service</groupId>
+              <artifactId>auto-service</artifactId>
+              <version>1.1.1</version>
+            </path>
+          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20.1</version>
-        <configuration>
-            <argLine>-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar</argLine>
-        </configuration>
+        <version>3.5.4</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.4.1</version>
+        <version>3.6.2</version>
         <executions>
           <execution>
             <id>enforce</id>
@@ -139,7 +155,9 @@
             </goals>
             <configuration>
               <rules>
-                <requireUpperBoundDeps/>
+                <requireUpperBoundDeps>
+                  <excludedScopes>provided</excludedScopes>
+                </requireUpperBoundDeps>
               </rules>
             </configuration>
           </execution>
@@ -162,7 +180,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.0.1</version>
+            <version>3.3.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -175,7 +193,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.0.0</version>
+            <version>3.12.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -188,7 +206,7 @@
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.8</version>
+            <version>1.7.0</version>
             <extensions>true</extensions>
             <configuration>
               <serverId>ossrh</serverId>
@@ -199,7 +217,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
+            <version>3.2.8</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/src/main/java/io/grpc/annotations/checkers/ExperimentalApiChecker.java b/src/main/java/io/grpc/annotations/checkers/ExperimentalApiChecker.java
index cb382be..8927aa2 100644
--- a/src/main/java/io/grpc/annotations/checkers/ExperimentalApiChecker.java
+++ b/src/main/java/io/grpc/annotations/checkers/ExperimentalApiChecker.java
@@ -55,12 +55,10 @@ private String findLink(AnnotationMirror annotation) {
   @Override
   protected Description describe(Tree tree, AnnotationMirror annotation) {
     String link = findLink(annotation);
-    return Description.builder(
-        tree,
-        this.canonicalName(),
-        link == null ? this.linkUrl() : link,
-        this.defaultSeverity(),
-        this.message())
-        .build();
+    Description.Builder builder = buildDescription(tree);
+    if (link != null) {
+      builder.setLinkUrl(link);
+    }
+    return builder.build();
   }
 }