You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/10/14 17:43:33 UTC
svn commit: r1843856 - in /webservices/axiom/trunk/systests/wildfly-tests:
pom.xml src/test/resources/arquillian.xml
Author: veithen
Date: Sun Oct 14 17:43:33 2018
New Revision: 1843856
URL: http://svn.apache.org/viewvc?rev=1843856&view=rev
Log:
Work around Wildfly startup failure on Java 11.
Modified:
webservices/axiom/trunk/systests/wildfly-tests/pom.xml
webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml
Modified: webservices/axiom/trunk/systests/wildfly-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/wildfly-tests/pom.xml?rev=1843856&r1=1843855&r2=1843856&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/wildfly-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/wildfly-tests/pom.xml Sun Oct 14 17:43:33 2018
@@ -72,6 +72,26 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-jigsaw-args</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <scripts>
+ <script>
+ project.properties['wildfly.jigsawArgs'] = System.properties['java.specification.version'] == '11' ? '--add-modules java.se' : ''
+ </script>
+ </scripts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified: webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml?rev=1843856&r1=1843855&r2=1843856&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml (original)
+++ webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml Sun Oct 14 17:43:33 2018
@@ -25,7 +25,7 @@
<property name="jbossHome">${wildfly.home}</property>
<!-- Arquillian gets confused if there is an extra space at the beginning of the arg line.
Therefore we need to add a dummy argument to avoid that problem if JaCoCo is skipped. -->
- <property name="javaVmArguments">-Ddummy ${jacoco.wildflyArgLine} -Dwildfly.management.port=${wildfly.managementPort} -Dwildfly.http.port=${wildfly.httpPort}</property>
+ <property name="javaVmArguments">-Ddummy ${jacoco.wildflyArgLine} ${wildfly.jigsawArgs} -Dwildfly.management.port=${wildfly.managementPort} -Dwildfly.http.port=${wildfly.httpPort}</property>
<property name="managementPort">${wildfly.managementPort}</property>
</configuration>
</container>