From 9c84ddbacf762c6fb56d48f6779d60daa3ec8ec6 Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Thu, 29 Aug 2024 09:44:24 -0700
Subject: [PATCH] Remove comments about compiling with JDK 8.

As of cl/655647768, we always build with JDK 22.

RELNOTES=n/a
PiperOrigin-RevId: 668969633
---
 android/pom.xml | 11 ++---------
 pom.xml         | 11 ++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index 83c337af9d42..a3a3a75c625a 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -157,9 +157,7 @@
               <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
-                   be made not to interfere with JDK8 or if we stop building
-                   with JDK8. -->
+                   https://errorprone.info/docs/installation#maven). -->
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
@@ -178,12 +176,7 @@
                 <version>2.23.0</version>
               </path>
             </annotationProcessorPaths>
-            <!-- Fork:
-
-                 - for JDK8 because we use a javac9 bootclasspath
-
-                 - for JDK9+ because we need args like add-exports
-                 -->
+            <!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->
             <fork>true</fork>
           </configuration>
         </plugin>
diff --git a/pom.xml b/pom.xml
index 39a5beed14ec..b8de0f4a8f6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,9 +158,7 @@
               <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
-                   be made not to interfere with JDK8 or if we stop building
-                   with JDK8. -->
+                   https://errorprone.info/docs/installation#maven). -->
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
@@ -179,12 +177,7 @@
                 <version>2.23.0</version>
               </path>
             </annotationProcessorPaths>
-            <!-- Fork:
-
-                 - for JDK8 because we use a javac9 bootclasspath
-
-                 - for JDK9+ because we need args like add-exports
-                 -->
+            <!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->
             <fork>true</fork>
           </configuration>
         </plugin>