Factorize surefire argLine

exoplatform · May 22, 2024 · fbe5b5c · fbe5b5c
1 parent 2a50a75
commit fbe5b5c
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 31 deletions.
diff --git a/exo.jcr.component.core/pom.xml b/exo.jcr.component.core/pom.xml
@@ -388,7 +388,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-               <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED -Djava.net.preferIPv4Stack=true ${debug.opts}</argLine>
+               <argLine>@{surefire.argLine} -Djava.net.preferIPv4Stack=true</argLine>
                <systemProperties>
                   <property>
                      <name>jcr.test.configuration.file</name>
@@ -1346,11 +1346,5 @@
             </plugins>
          </build>
       </profile>
-      <profile>
-         <id>debug</id>
-         <properties>
-            <debug.opts>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y</debug.opts>
-         </properties>
-      </profile>
    </profiles>
 </project>
diff --git a/exo.jcr.component.ext/pom.xml b/exo.jcr.component.ext/pom.xml
@@ -93,7 +93,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
-            <argLine>@{argLine} ${env.MAVEN_OPTS}  --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED ${debug.opts}</argLine>
             <systemProperties>
                <property>
                   <name>jcr.test.configuration.file</name>
@@ -626,11 +625,5 @@
             <use.sequence>false</use.sequence>
          </properties>
       </profile>
-      <profile>
-         <id>debug</id>
-         <properties>
-            <debug.opts>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y</debug.opts>
-         </properties>
-      </profile>
   </profiles>
 </project>
diff --git a/exo.jcr.component.ftp/pom.xml b/exo.jcr.component.ftp/pom.xml
@@ -52,12 +52,6 @@
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

diff --git a/exo.jcr.component.webdav/pom.xml b/exo.jcr.component.webdav/pom.xml
@@ -55,7 +55,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
           <excludes>
             <exclude>**/TestUtils.java</exclude>
             <exclude>**/OrderPatchTest.java</exclude>

diff --git a/exo.jcr.ext.services/pom.xml b/exo.jcr.ext.services/pom.xml
@@ -41,7 +41,6 @@
      <wikbook.version>0.9.26</wikbook.version>
 
      <version.buildnumber.plugin>1.0</version.buildnumber.plugin>
-     <debug.opts />
   </properties>
 
   <dependencies>
@@ -88,7 +87,7 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED -Djava.net.preferIPv4Stack=true ${debug.opts}</argLine>
+          <argLine>@{argLine} @{surefire.argLine} -Djava.net.preferIPv4Stack=true</argLine>
         </configuration>
       </plugin>
       <plugin>

diff --git a/exo.jcr.framework.command/pom.xml b/exo.jcr.framework.command/pom.xml
@@ -52,12 +52,6 @@
    </dependencies>
   <build>
     <plugins>
-         <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
-            </configuration>
-         </plugin>
          <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>

diff --git a/exo.jcr.framework.ftpclient/pom.xml b/exo.jcr.framework.ftpclient/pom.xml
@@ -61,8 +61,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
-            <argLine>@{argLine} ${env.MAVEN_OPTS}</argLine>
-            <skipTests>true</skipTests> 
+            <skipTests>true</skipTests>
             <includes>
               <include>**/*.java</include>
             </includes>