fix: build against jvm21

- fix: build against embedded jdk sources needs `--enable-preview` when built against jvm21 - fix: add `-Djava.security.manager=allow` to fix security manager tests under modern java Fixes and closes google#7065 Signed-off-by: Sam Gammon <[email protected]>
sgammon · Mar 11, 2024 · 0f80174 · 0f80174
1 parent 8a7df43
commit 0f80174
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/android/pom.xml b/android/pom.xml
@@ -358,6 +358,19 @@
         <maven-javadoc-plugin.additionalJOptions>--no-module-directories</maven-javadoc-plugin.additionalJOptions>
       </properties>
     </profile>
+    <profile>
+      <!--
+          In order to build against JDK 19+, Javadoc needs to enable Java preview features, because JDK sources
+          themselves have code which defines/uses preview features.
+       -->
+      <id>javadocs-jdk19plus</id>
+      <activation>
+        <jdk>[19,]</jdk>
+      </activation>
+      <properties>
+        <maven-javadoc-plugin.additionalJOptions>--enable-preview</maven-javadoc-plugin.additionalJOptions>
+      </properties>
+    </profile>
     <profile>
       <id>open-jre-modules</id>
       <activation>

diff --git a/guava/pom.xml b/guava/pom.xml
@@ -174,6 +174,7 @@
             <link>https://errorprone.info/api/latest/</link>
           </links>
           <overview>../overview.html</overview>
+          <additionalJOption>${maven-javadoc-plugin.additionalJOptions}</additionalJOption>
         </configuration>
       </plugin>
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -360,6 +360,19 @@
         <maven-javadoc-plugin.additionalJOptions>--no-module-directories</maven-javadoc-plugin.additionalJOptions>
       </properties>
     </profile>
+    <profile>
+      <!--
+          In order to build against JDK 19+, Javadoc needs to enable Java preview features, because JDK sources
+          themselves have code which defines/uses preview features.
+       -->
+      <id>javadocs-jdk19plus</id>
+      <activation>
+        <jdk>[19,]</jdk>
+      </activation>
+      <properties>
+        <maven-javadoc-plugin.additionalJOptions>--enable-preview</maven-javadoc-plugin.additionalJOptions>
+      </properties>
+    </profile>
     <profile>
       <id>open-jre-modules</id>
       <activation>