diff --git a/android/guava/pom.xml b/android/guava/pom.xml
index 0ae3af4d8c5e..424b3c4e908c 100644
--- a/android/guava/pom.xml
+++ b/android/guava/pom.xml
@@ -153,7 +153,7 @@
           </tags>
 
           <!-- TODO(cpovirk): Move this to the parent after making the package-list files available there. -->
-          <!-- We add the link ourselves, both so that we can choose Java 9 over the version that -source suggests and so that we can solve the JSR305 problem described below. -->
+          <!-- We add the link ourselves so that we can choose Java 21 over the version that -source suggests. -->
           <detectJavaApiLink>false</detectJavaApiLink>
           <offlineLinks>
             <!-- We need local copies of some of these for 2 reasons: a User-Agent problem (https://stackoverflow.com/a/47891403/28465) and an SSL problem (https://issues.apache.org/jira/browse/MJAVADOC-507). If we choose to work around the User-Agent problem, we can go back to <links>, sidestepping the SSL problem. -->
@@ -166,18 +166,13 @@
               <url>https://static.javadoc.io/com.google.j2objc/j2objc-annotations/1.1/</url>
               <location>${project.basedir}/javadoc-link/j2objc-annotations</location>
             </offlineLink>
-            <!-- The JDK doc must be listed after JSR305 (and as an <offlineLink>, not a <link>) so that JSR305 "claims" javax.annotation. -->
-            <offlineLink>
-              <url>https://docs.oracle.com/javase/9/docs/api/</url>
-              <location>https://docs.oracle.com/javase/9/docs/api/</location>
-            </offlineLink>
-            <!-- The Checker Framework likewise would claim javax.annotations, despite providing only a subset of the JSR305 annotations, so it must likewise come after JSR305. -->
             <offlineLink>
               <url>https://checkerframework.org/api/</url>
               <location>${project.basedir}/javadoc-link/checker-framework</location>
             </offlineLink>
           </offlineLinks>
           <links>
+            <link>https://docs.oracle.com/javase/21/docs/api/</link>
             <link>https://errorprone.info/api/latest/</link>
           </links>
           <overview>../../overview.html</overview>
diff --git a/android/pom.xml b/android/pom.xml
index 5d510e11a016..7f5b28ef6f2c 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -319,7 +319,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>3.11.1</version>
           <configuration>
             <!-- TODO: b/286965322 - Use a newer version (probably the default toolchain we set up?) if it doesn't break Javadoc (including causing trouble for our later run of JDiff, which we do outside Maven, during snapshots/releases). -->
             <jdkToolchain>
diff --git a/guava/pom.xml b/guava/pom.xml
index a974fa2e2e60..c87190b68fa1 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -153,7 +153,7 @@
           </tags>
 
           <!-- TODO(cpovirk): Move this to the parent after making the package-list files available there. -->
-          <!-- We add the link ourselves, both so that we can choose Java 9 over the version that -source suggests and so that we can solve the JSR305 problem described below. -->
+          <!-- We add the link ourselves so that we can choose Java 21 over the version that -source suggests. -->
           <detectJavaApiLink>false</detectJavaApiLink>
           <offlineLinks>
             <!-- We need local copies of some of these for 2 reasons: a User-Agent problem (https://stackoverflow.com/a/47891403/28465) and an SSL problem (https://issues.apache.org/jira/browse/MJAVADOC-507). If we choose to work around the User-Agent problem, we can go back to <links>, sidestepping the SSL problem. -->
@@ -166,18 +166,13 @@
               <url>https://static.javadoc.io/com.google.j2objc/j2objc-annotations/1.1/</url>
               <location>${project.basedir}/javadoc-link/j2objc-annotations</location>
             </offlineLink>
-            <!-- The JDK doc must be listed after JSR305 (and as an <offlineLink>, not a <link>) so that JSR305 "claims" javax.annotation. -->
-            <offlineLink>
-              <url>https://docs.oracle.com/javase/9/docs/api/</url>
-              <location>https://docs.oracle.com/javase/9/docs/api/</location>
-            </offlineLink>
-            <!-- The Checker Framework likewise would claim javax.annotations, despite providing only a subset of the JSR305 annotations, so it must likewise come after JSR305. -->
             <offlineLink>
               <url>https://checkerframework.org/api/</url>
               <location>${project.basedir}/javadoc-link/checker-framework</location>
             </offlineLink>
           </offlineLinks>
           <links>
+            <link>https://docs.oracle.com/javase/21/docs/api/</link>
             <link>https://errorprone.info/api/latest/</link>
           </links>
           <overview>../overview.html</overview>
diff --git a/pom.xml b/pom.xml
index 19087067a840..c61eb8bf645d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,7 +314,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>3.11.1</version>
           <configuration>
             <!-- TODO: b/286965322 - Use a newer version (probably the default toolchain we set up?) if it doesn't break Javadoc (including causing trouble for our later run of JDiff, which we do outside Maven, during snapshots/releases). -->
             <jdkToolchain>