HSEARCH-1721 Reconfigure Arquillian to work on JDK9 and disable the K…

…araf and documentation modules when running in JDK9
hibernate · Nov 18, 2014 · 9724c43 · 9724c43
1 parent 3776179
commit 9724c43
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/integrationtest/performance/src/test/resources/arquillian.xml b/integrationtest/performance/src/test/resources/arquillian.xml
@@ -17,6 +17,7 @@
     <container qualifier="jboss" default="true">
         <configuration>
             <property name="jbossHome">${basedir}/target/wildfly-${wildflyVersion}</property>
+            <property name="javaVmArguments">-Xmx512m -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1 -XX:+IgnoreUnrecognizedVMOptions</property>
         </configuration>
     </container>
 

diff --git a/integrationtest/wildfly/src/test/resources/arquillian.xml b/integrationtest/wildfly/src/test/resources/arquillian.xml
@@ -16,7 +16,7 @@
                 <property name="jbossHome">${project.build.directory}/node1/wildfly-${wildflyVersion}</property>
                 <!-- Needed for JMS tests -->
                 <property name="serverConfig">standalone-full-testqueues.xml</property>
-                <property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1</property>
+                <property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1 -XX:+IgnoreUnrecognizedVMOptions</property>
                 <!-- To debug the Arquillian managed application server: -->
                 <!-- property name="javaVmArguments">-Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=y -Xmx512m -XX:MaxPermSize=128m -Dorg.jboss.remoting-jmx.timeout=300  -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1</property-->
             </configuration>
@@ -27,7 +27,7 @@
                 <property name="jbossHome">${project.build.directory}/node2/wildfly-${wildflyVersion}</property>
                 <!-- Needed for JMS tests -->
                 <property name="serverConfig">standalone-full-testqueues.xml</property>
-                <property name="javaVmArguments">-Djboss.socket.binding.port-offset=10000 -Xmx512m -XX:MaxPermSize=128m  -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1</property>
+                <property name="javaVmArguments">-Djboss.socket.binding.port-offset=10000 -Xmx512m -XX:MaxPermSize=128m  -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1 -XX:+IgnoreUnrecognizedVMOptions</property>
                 <property name="managementPort">19990</property>
             </configuration>
         </container>

diff --git a/pom.xml b/pom.xml
@@ -30,15 +30,13 @@
         <module>orm</module>
         <module>testing</module>
         <module>infinispan</module>
-        <module>documentation</module>
         <module>modules</module>
         <module>integrationtest/jms</module>
         <module>integrationtest/narayana</module>
         <module>integrationtest/spring</module>
         <module>integrationtest/wildfly</module>
         <module>integrationtest/performance</module>
         <module>integrationtest/osgi/karaf-features</module>
-        <module>integrationtest/osgi/karaf-it</module>
         <module>integrationtest/sandbox</module>
     </modules>
 
@@ -1038,6 +1036,28 @@
             </modules>
         </profile>
 
+        <profile>
+            <id>docs</id>
+            <activation>
+                <!-- asciidoctor won't work on JDK9  -->
+                <jdk>[1.7,1.8]</jdk>
+            </activation>
+            <modules>
+                <module>documentation</module>
+            </modules>
+        </profile>
+
+        <profile>
+            <id>integration-karaf</id>
+            <activation>
+                <!-- Karaf won't work on JDK9  -->
+                <jdk>[1.7,1.8]</jdk>
+            </activation>
+            <modules>
+                <module>integrationtest/osgi/karaf-it</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>perf</id>
             <properties>