Author: veithen
Date: Fri Dec 4 22:59:00 2015
New Revision: 1718047
URL: http://svn.apache.org/viewvc?rev=1718047&view=rev
Log:
Execute the Wildfly tests as integration tests to prevent
maven-dependency-plugin from complaining about axiom-api and axiom-impl being
part of the reactor.
Modified:
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/systests/jboss-tests/pom.xml
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1718047&r1=1718046&r2=1718047&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Fri Dec 4 22:59:00 2015
@@ -599,6 +599,23 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.19</version>
+ <configuration>
+ <argLine>${jacoco.failsafeArgLine}</argLine>
+ <systemProperties>
+ <property>
+ <name>java.io.tmpdir</name>
+ <value>${project.build.directory}/tmp</value>
+ </property>
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
</plugin>
@@ -852,7 +869,7 @@
</execution>
<execution>
<id>check-jacoco-exec</id>
- <phase>prepare-package</phase>
+ <phase>verify</phase>
<goals>
<goal>execute</goal>
</goals>
@@ -975,6 +992,16 @@
<sessionId>mvn:${project.groupId}:${project.artifactId}:${project.version}:surefire</sessionId>
</configuration>
</execution>
+ <execution>
+ <id>prepare-agent-for-failsafe</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <propertyName>jacoco.failsafeArgLine</propertyName>
+
<sessionId>mvn:${project.groupId}:${project.artifactId}:${project.version}:failsafe</sessionId>
+ </configuration>
+ </execution>
</executions>
<!-- Configure this on the plugin, not on the execution: it
also applies to additional executions
configured in individual modules -->
@@ -988,7 +1015,7 @@
<executions>
<execution>
<id>attach-jacoco-exec</id>
- <phase>package</phase>
+ <phase>verify</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
Modified: webservices/axiom/trunk/systests/jboss-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/jboss-tests/pom.xml?rev=1718047&r1=1718046&r2=1718047&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/jboss-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/jboss-tests/pom.xml Fri Dec 4 22:59:00
2015
@@ -71,6 +71,12 @@
</testResources>
<plugins>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -79,7 +85,12 @@
resolution doesn't work correctly if some of the
dependencies are
snapshots from the current reactor. -->
<id>copy-deps</id>
- <phase>generate-test-resources</phase>
+ <!-- axiom-api and axiom-impl may be part of the
reactor. To make sure
+ that the package phase has been executed on these
dependencies
+ (which is a requirement to be able to copy them),
we need to execute
+ the copy-dependencies goal after the package
phase. Note that this
+ implies that we need to execute the tests as
integration tests. -->
+ <phase>pre-integration-test</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@@ -94,7 +105,7 @@
unable to ensure that all required artifacts are
available from Maven
central and the JBoss Maven repository isn't
stable. -->
<id>unpack-jboss</id>
- <phase>generate-test-resources</phase>
+ <phase>pre-integration-test</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -109,6 +120,7 @@
<outputDirectory>target</outputDirectory>
</artifactItem>
</artifactItems>
+
<excludes>*/standalone/configuration/standalone.xml</excludes>
</configuration>
</execution>
</executions>
@@ -125,7 +137,7 @@
<goals>
<goal>reserve-network-port</goal>
</goals>
- <phase>generate-test-resources</phase>
+ <phase>initialize</phase>
<configuration>
<portNames>
<portName>jboss.managementPort</portName>
@@ -140,7 +152,7 @@
<executions>
<execution>
<id>copy-jboss-configuration</id>
- <phase>process-test-resources</phase>
+ <phase>pre-integration-test</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -161,6 +173,7 @@
<executions>
<execution>
<id>prepare-agent-for-jboss</id>
+ <phase>initialize</phase>
<goals>
<goal>prepare-agent</goal>
</goals>
@@ -170,6 +183,22 @@
</configuration>
</execution>
</executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
