From 69c9fd26229e8574e81905abfca6aa983ad624cf Mon Sep 17 00:00:00 2001
From: Holden Karau <holden@pigscanfly.ca>
Date: Tue, 16 Jan 2024 16:51:43 -0800
Subject: [PATCH] A little bit of refactoring so the test args are present if
 needed (e.g. Java 11 & 17) but ignored if not supported (e.g Java 8).

---
 pom.xml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c3fae08d053d4..1784ad621c3c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,27 @@
  */
     </spotless.license.header>
 
+    <!-- SPARK-36796 for JDK-17 test-->
+    <extraJavaTestArgs>
+      -XX:+IgnoreUnrecognizedVMOptions
+      --add-opens=java.base/java.lang=ALL-UNNAMED
+      --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+      --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+      --add-opens=java.base/java.io=ALL-UNNAMED
+      --add-opens=java.base/java.net=ALL-UNNAMED
+      --add-opens=java.base/java.nio=ALL-UNNAMED
+      --add-opens=java.base/java.util=ALL-UNNAMED
+      --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+      --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
+      --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
+      --add-opens=java.base/sun.nio.cs=ALL-UNNAMED
+      --add-opens=java.base/sun.security.action=ALL-UNNAMED
+      --add-opens=java.base/sun.util.calendar=ALL-UNNAMED
+      --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
+      -Djdk.reflect.useDirectMethodHandle=false
+      -Dio.netty.tryReflectionSetAccessible=true
+    </extraJavaTestArgs>
+
     <!-- plugin version-->
     <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
     <scala.compiler.version>4.8.0</scala.compiler.version>
@@ -581,7 +602,7 @@
           <configuration>
             <testFailureIgnore>false</testFailureIgnore>
             <junitxml>.</junitxml>
-            <argLine>-ea --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED -Djdk.reflect.useDirectMethodHandle=false --add-opens=java.base/java.lang.reflect=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Dglutten.package.jar=${glutten.package.jar}</argLine>
+            <argLine>-ea ${extraJavaTestArgs} -Dglutten.package.jar=${glutten.package.jar}</argLine>
              <environmentVariables>
                <GLUTTEN_PACKAGE_JAR>${glutten.package.jar}</GLUTTEN_PACKAGE_JAR>
              </environmentVariables>