From 50daa746ad8744fff505f89e9354091cb6fb5afa Mon Sep 17 00:00:00 2001
From: Cheng Fang <cfang@redhat.com>
Date: Tue, 5 Jul 2022 18:33:18 -0400
Subject: [PATCH] JBERET-570 Configure maven pom to support building with jdk
 17

---
 pom.xml                                | 15 +++++++++++++--
 test-apps/pom.xml                      | 20 ++++++++++++++++++++
 test-apps/purgeJdbcRepository/pom.xml  |  3 ---
 test-apps/purgeMongoRepository/pom.xml |  5 +----
 test-apps/scripting/pom.xml            | 25 -------------------------
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f08cff29..62c1684af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,8 +114,19 @@
         <redirectTestOutput>false</redirectTestOutput>
         <javadoc.additional.params>-sourceclasspath ${project.build.outputDirectory}</javadoc.additional.params>
 
-        <!-- Modularized JDK support (various workarounds) - activated via profile -->
-        <modular.jdk.args/>
+        <modular.jdk.args>
+            --add-exports=java.desktop/sun.awt=ALL-UNNAMED
+            --add-opens=java.base/java.io=ALL-UNNAMED
+            --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.security=ALL-UNNAMED
+            --add-opens=java.base/java.util=ALL-UNNAMED
+            --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+            --add-opens=java.management/javax.management=ALL-UNNAMED
+            --add-opens=java.naming/javax.naming=ALL-UNNAMED
+        </modular.jdk.args>
+
         <surefire.system.args>${modular.jdk.args}</surefire.system.args>
 
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/test-apps/pom.xml b/test-apps/pom.xml
index f81e081f9..9cb370e8a 100644
--- a/test-apps/pom.xml
+++ b/test-apps/pom.xml
@@ -129,6 +129,26 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <argLine>${surefire.system.args}</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>jdk10</id>
diff --git a/test-apps/purgeJdbcRepository/pom.xml b/test-apps/purgeJdbcRepository/pom.xml
index 6bde0c944..e9b328471 100644
--- a/test-apps/purgeJdbcRepository/pom.xml
+++ b/test-apps/purgeJdbcRepository/pom.xml
@@ -22,9 +22,6 @@
     </parent>
 
     <artifactId>purgeJdbcRepository</artifactId>
-    <properties>
-        <jvmArgs>-Xmx32m</jvmArgs>
-    </properties>
 
     <dependencies>
         <dependency>
diff --git a/test-apps/purgeMongoRepository/pom.xml b/test-apps/purgeMongoRepository/pom.xml
index d43b0ffdb..ef7d2d2cb 100644
--- a/test-apps/purgeMongoRepository/pom.xml
+++ b/test-apps/purgeMongoRepository/pom.xml
@@ -22,9 +22,6 @@
     </parent>
 
     <artifactId>purgeMongoRepository</artifactId>
-    <properties>
-        <jvmArgs>-Xmx32m</jvmArgs>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -103,4 +100,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/test-apps/scripting/pom.xml b/test-apps/scripting/pom.xml
index f700172c0..57e7f647c 100644
--- a/test-apps/scripting/pom.xml
+++ b/test-apps/scripting/pom.xml
@@ -11,11 +11,6 @@
 
     <artifactId>scripting</artifactId>
 
-    <properties>
-        <jvmArgs>-Xms512m -Xmx1024m -XX:MaxPermSize=512m</jvmArgs>
-        <insecure.repositories>WARN</insecure.repositories>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jberet.test-apps</groupId>
@@ -73,24 +68,4 @@
         </repository>
     </repositories>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <argLine>${jvmArgs}</argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>