Make the `-add-exports=` passed to g-j-f consistent

PiperOrigin-RevId: 513589436

4 files changed, 7 insertions, 11 deletions

diff --git a/README.md b/README.md
index 2d53f8a..f2c61e3 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,7 @@ following JVM flags are required when running on JDK 16 and newer, due to
 
 ```
 --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
 --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
 --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
 --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
diff --git a/core/pom.xml b/core/pom.xml
index 10565c6..038e4ed 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -102,13 +102,12 @@
             <link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
           </links>
           <additionalJOptions>
+            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
+            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
             <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
-            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
             <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
             <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
             <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
-            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
-            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
           </additionalJOptions>
         </configuration>
         <executions>
diff --git a/core/src/test/java/com/google/googlejavaformat/java/MainTest.java b/core/src/test/java/com/google/googlejavaformat/java/MainTest.java
index ad91bfa..42e12d8 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/MainTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/MainTest.java
@@ -54,13 +54,12 @@ public class MainTest {
 
   private static final ImmutableList<String> ADD_EXPORTS =
       ImmutableList.of(
+          "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+          "--add-exports=jdk.compiler/com.sun.tools.javac.code=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.parser=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-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED");
+          "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
 
   @Test
   public void testUsageOutput() {
diff --git a/pom.xml b/pom.xml
index 150173e..243da54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,15 +235,12 @@
             <manifestEntries>
               <Add-Exports><!--
                 -->jdk.compiler/com.sun.tools.javac.api <!--
+                -->jdk.compiler/com.sun.tools.javac.code <!--
                 -->jdk.compiler/com.sun.tools.javac.file <!--
-                -->jdk.compiler/com.sun.tools.javac.main <!--
-                -->jdk.compiler/com.sun.tools.javac.model <!--
                 -->jdk.compiler/com.sun.tools.javac.parser <!--
-                -->jdk.compiler/com.sun.tools.javac.processing <!--
                 -->jdk.compiler/com.sun.tools.javac.tree <!--
                 -->jdk.compiler/com.sun.tools.javac.util<!--
               --></Add-Exports>
-              <Add-Opens>jdk.compiler/com.sun.tools.javac.code jdk.compiler/com.sun.tools.javac.comp</Add-Opens>
             </manifestEntries>
           </archive>
         </configuration>