[JBWS-4345]:Add <modular.jdk.args> to arquillian.xml

jbossws · Feb 14, 2023 · 417e846 · 417e846
1 parent 8feee97
commit 417e846
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 43 deletions.
diff --git a/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml b/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
@@ -6,7 +6,7 @@
     <container qualifier="jboss" default="true">
         <configuration>
             <property name="jbossHome">${jboss.home}</property>
-            <property name="javaVmArguments">-server -Xms64m -Xmx512m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.jboss} ${additionalJvmArgs}</property>
+            <property name="javaVmArguments">-server -Xms64m -Xmx512m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.jboss} ${modular.jdk.args} ${additionalJvmArgs}</property>
             <property name="serverConfig">jbws-testsuite-default.xml</property>
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>
@@ -21,7 +21,7 @@
     <container qualifier="ssl-mutual-auth" mode="manual">
         <configuration>
             <property name="jbossHome">${jboss.home}</property>
-            <property name="javaVmArguments">-server -Xms48m -Xmx384m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.ssl-mutual-auth} ${additionalJvmArgs}</property>
+            <property name="javaVmArguments">-server -Xms48m -Xmx384m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.ssl-mutual-auth} ${modular.jdk.args} ${additionalJvmArgs}</property>
             <property name="serverConfig">jbws-testsuite-ssl-mutual-auth.xml</property>
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>
@@ -36,7 +36,7 @@
     <container qualifier="default-config-tests">
         <configuration>
             <property name="jbossHome">${jboss.home}</property>
-            <property name="javaVmArguments">-server -Xms48m -Xmx384m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.default-config-tests} ${additionalJvmArgs}</property>
+            <property name="javaVmArguments">-server -Xms48m -Xmx384m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.default-config-tests} ${modular.jdk.args} ${additionalJvmArgs}</property>
             <property name="serverConfig">jbws-testsuite-default-config-tests.xml</property>
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>
@@ -51,7 +51,7 @@
     <container qualifier="jms">
         <configuration>
             <property name="jbossHome">${jboss.home}</property>
-            <property name="javaVmArguments">-server -Xms48m -Xmx384m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.jms} ${additionalJvmArgs}</property>
+            <property name="javaVmArguments">-server -Xms48m -Xmx384m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.jms} ${modular.jdk.args} ${additionalJvmArgs}</property>
             <property name="serverConfig">jbws-testsuite-jms.xml</property>
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>

diff --git a/modules/testsuite/pom.xml b/modules/testsuite/pom.xml
@@ -34,6 +34,23 @@
     <port-offset.shared-tests.default-config-tests>20000</port-offset.shared-tests.default-config-tests>
     <port-offset.shared-tests.address-rewrite>25000</port-offset.shared-tests.address-rewrite>
     <port-offset.perf-tests.jboss>30000</port-offset.perf-tests.jboss>
+    <modular.jdk.args>
+      --add-exports=java.desktop/sun.awt=ALL-UNNAMED
+      --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED
+      --add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED
+      --add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED
+      --add-exports=jdk.naming.dns/com.sun.jndi.dns=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.jvm.args>${surefire.security.args} ${surefire.memory.args} ${modular.jdk.args} ${modular.jdk.props}</surefire.jvm.args>
   </properties>
 
   <!-- Modules -->
@@ -438,18 +455,7 @@
         </property>
       </activation>
       <properties>
-        <surefire.jvm.args>${surefire.security.args} ${surefire.memory.args} ${modular.jdk.args} ${modular.jdk.props} ${surefire.jdwp.args}</surefire.jvm.args>
-      </properties>
-    </profile>
-    <profile>
-      <id>no-debug</id>
-      <activation>
-        <property>
-          <name>!debug</name>
-        </property>
-      </activation>
-      <properties>
-        <surefire.jvm.args>${surefire.security.args} ${surefire.memory.args} ${modular.jdk.args} ${modular.jdk.props}</surefire.jvm.args>
+        <surefire.jvm.args>${surefire.jvm.args} ${surefire.jdwp.args}</surefire.jvm.args>
       </properties>
     </profile>
 
@@ -588,18 +594,6 @@
       <properties>
         <jboss.remoting.protocol>remote+http</jboss.remoting.protocol>
         <jboss.initial.context.factory>org.wildfly.naming.client.WildFlyInitialContextFactory</jboss.initial.context.factory>
-        <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>
       </properties>
       <dependencies>
         <dependency>
@@ -689,18 +683,6 @@
       <properties>
         <jboss.remoting.protocol>remote+http</jboss.remoting.protocol>
         <jboss.initial.context.factory>org.wildfly.naming.client.WildFlyInitialContextFactory</jboss.initial.context.factory>
-        <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>
       </properties>
       <dependencies>
         <dependency>

diff --git a/modules/testsuite/shared-tests/src/test/etc/arquillian.xml b/modules/testsuite/shared-tests/src/test/etc/arquillian.xml
@@ -6,7 +6,7 @@
     <container qualifier="jboss" default="true">
         <configuration>
             <property name="jbossHome">${jboss.home}</property>
-            <property name="javaVmArguments">-server -Xms64m -Xmx512m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss} ${additionalJvmArgs}</property>
+            <property name="javaVmArguments">-server -Xms64m -Xmx512m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss} ${modular.jdk.args} ${additionalJvmArgs}</property>
             <property name="serverConfig">jbws-testsuite-shared-default.xml</property>
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>
@@ -21,7 +21,7 @@
     <container qualifier="default-config-tests" mode="manual">
         <configuration>
             <property name="jbossHome">${jboss.home}</property>
-            <property name="javaVmArguments">-server -Xms48m -Xmx384m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.default-config-tests} ${additionalJvmArgs}</property>
+            <property name="javaVmArguments">-server -Xms48m -Xmx384m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.default-config-tests} ${modular.jdk.args} ${additionalJvmArgs}</property>
             <property name="serverConfig">jbws-testsuite-shared-default-config-tests.xml</property>
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>
@@ -36,7 +36,7 @@
     <container qualifier="address-rewrite" mode="manual">
         <configuration>
             <property name="jbossHome">${jboss.home}</property>
-            <property name="javaVmArguments">-server -Xms32m -Xmx256m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.address-rewrite} ${additionalJvmArgs}</property>
+            <property name="javaVmArguments">-server -Xms32m -Xmx256m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.address-rewrite} ${modular.jdk.args} ${additionalJvmArgs}</property>
             <property name="serverConfig">jbws-testsuite-shared-address-rewrite.xml</property>
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>