JBERET-570 Configure maven pom to support building with jdk 17 (#251) (…

…#261)
jberet · Jul 13, 2022 · 40238bc · 40238bc
1 parent 3de7ef5
commit 40238bc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 49 deletions.
diff --git a/pom.xml b/pom.xml
@@ -114,7 +114,6 @@
         <redirectTestOutput>false</redirectTestOutput>
         <javadoc.additional.params>-sourceclasspath ${project.build.outputDirectory}</javadoc.additional.params>
 
-        <!-- Modularized JDK support (various workarounds) - activated via profile -->
         <modular.jdk.args/>
         <surefire.system.args>${modular.jdk.args}</surefire.system.args>
         <insecure.repositories>WARN</insecure.repositories>

diff --git a/test-apps/pom.xml b/test-apps/pom.xml
@@ -126,6 +126,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-or-above</id>

diff --git 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>
@@ -53,21 +50,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>${jvmArgs}</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <argLine>${jvmArgs}</argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git 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>
+</project>
diff --git a/test-apps/scripting/pom.xml b/test-apps/scripting/pom.xml
@@ -11,10 +11,6 @@
 
     <artifactId>scripting</artifactId>
 
-    <properties>
-        <jvmArgs>-Xms512m -Xmx1024m -XX:MaxPermSize=512m</jvmArgs>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jberet.test-apps</groupId>
@@ -72,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>