From 0f801741219da537464bb9d25e7a95e4350a40b6 Mon Sep 17 00:00:00 2001
From: Sam Gammon <sam@elide.ventures>
Date: Thu, 7 Mar 2024 17:00:45 -0800
Subject: [PATCH] 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/guava#7065

Signed-off-by: Sam Gammon <sam@elide.ventures>
---
 android/pom.xml | 13 +++++++++++++
 guava/pom.xml   |  1 +
 pom.xml         | 13 +++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/android/pom.xml b/android/pom.xml
index 03824624697e..43509f57cd91 100644
--- 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
index be0bab174e16..3939e4852b2b 100644
--- 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
index bf15b3c558c2..f3136c1ec460 100644
--- 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>