From 2c02d4e3a9e3c79eeb6732dbdf3faa58cd1201e0 Mon Sep 17 00:00:00 2001
From: Sam Gammon <sam@elide.ventures>
Date: Thu, 7 Mar 2024 19:12:39 -0800
Subject: [PATCH] fixup! apply jvm21 pom updates to `android` module

Signed-off-by: Sam Gammon <sam@elide.ventures>
---
 android/pom.xml | 27 +++++++++++++++++++++++++++
 pom.xml         |  4 ++++
 2 files changed, 31 insertions(+)

diff --git a/android/pom.xml b/android/pom.xml
index d59ce39455b6..85f09e8cc004 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -25,6 +25,7 @@
     <project.build.outputTimestamp>2024-01-02T00:00:00Z</project.build.outputTimestamp>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <test.add.opens></test.add.opens>
+    <test.add.args></test.add.args>
     <module.status>integration</module.status>
     <variant.jvmEnvironment>android</variant.jvmEnvironment>
     <variant.jvmEnvironmentVariantName>android</variant.jvmEnvironmentVariantName>
@@ -357,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>
@@ -462,5 +476,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>javac-for-jvm18plus</id>
+      <activation>
+        <!--
+            In order to build and run the tests against JDK 19+, we need to pass java.security.manager=allow, to make
+            the deprecated 'java.lang.SecurityManager' available for use.
+         -->
+        <jdk>[18,]</jdk>
+      </activation>
+      <properties>
+        <test.add.args>-Djava.security.manager=allow</test.add.args>
+      </properties>
+    </profile>
   </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 1eb3de13aa3a..2b896d9d407c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -481,6 +481,10 @@
     <profile>
       <id>javac-for-jvm18plus</id>
       <activation>
+        <!--
+            In order to build and run the tests against JDK 19+, we need to pass java.security.manager=allow, to make
+            the deprecated 'java.lang.SecurityManager' available for use.
+         -->
         <jdk>[18,]</jdk>
       </activation>
       <properties>