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/12/26 12:39:52 UTC
svn commit: r1849758 - in /webservices/axiom/trunk: pom.xml
systests/wildfly-tests/pom.xml
systests/wildfly-tests/src/test/resources/arquillian.xml
Author: veithen
Date: Wed Dec 26 12:39:52 2018
New Revision: 1849758
URL: http://svn.apache.org/viewvc?rev=1849758&view=rev
Log:
Use a standard JaCoCo setup. jacoco-report-maven-plugin takes care of anynoymizing JaCoCo session IDs.
Modified:
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/systests/wildfly-tests/pom.xml
webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1849758&r1=1849757&r2=1849758&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Wed Dec 26 12:39:52 2018
@@ -258,7 +258,6 @@
-->
<aspectj.version>1.9.1</aspectj.version>
<shade.plugin.version>2.3</shade.plugin.version>
- <jacoco.version>0.8.2</jacoco.version>
<spring.version>5.0.1.RELEASE</spring.version>
<springws.version>3.0.3.RELEASE</springws.version>
<exam.version>4.12.0</exam.version>
@@ -580,7 +579,7 @@
the data instead of loading it into memory). Obviously, the execution time of
these tests also are proportional to the heap size. To accelerate the execution
of the tests, we should use a heap size as small as possible. -->
- <argLine>-Xms16m -Xmx48m ${jacoco.surefireArgLine} ${securityManagerArgs}</argLine>
+ <argLine>${argLine} -Xms16m -Xmx48m ${securityManagerArgs}</argLine>
<trimStackTrace>false</trimStackTrace>
<systemProperties>
<property>
@@ -620,7 +619,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19</version>
<configuration>
- <argLine>${jacoco.failsafeArgLine} ${securityManagerArgs}</argLine>
+ <argLine>${argLine} ${securityManagerArgs}</argLine>
<trimStackTrace>false</trimStackTrace>
<systemProperties>
<property>
@@ -1104,38 +1103,20 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.version}</version>
+ <version>0.8.2</version>
<executions>
<execution>
- <id>prepare-agent-for-surefire</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <propertyName>jacoco.surefireArgLine</propertyName>
- <!-- Anonymize the session ID (by default it contains the name of the host executing the build) -->
- <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>
+ <skip>${skipJacoco}</skip>
+ <includes>
+ <include>org.apache.axiom.*</include>
+ </includes>
</configuration>
</execution>
</executions>
- <!-- Configure this on the plugin, not on the execution: it also applies to additional executions
- configured in individual modules -->
- <configuration>
- <skip>${skipJacoco}</skip>
- <includes>
- <include>org.apache.axiom.*</include>
- </includes>
- </configuration>
</plugin>
<plugin>
<groupId>com.github.veithen.maven</groupId>
Modified: webservices/axiom/trunk/systests/wildfly-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/wildfly-tests/pom.xml?rev=1849758&r1=1849757&r2=1849758&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/wildfly-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/wildfly-tests/pom.xml Wed Dec 26 12:39:52 2018
@@ -170,23 +170,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-agent-for-wildfly</id>
- <phase>initialize</phase>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <propertyName>jacoco.wildflyArgLine</propertyName>
- <sessionId>mvn:${project.groupId}:${project.artifactId}:${project.version}:wildfly</sessionId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
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=1849758&r1=1849757&r2=1849758&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 Wed Dec 26 12:39:52 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} ${wildfly.jigsawArgs} -Dwildfly.management.port=${wildfly.managementPort} -Dwildfly.http.port=${wildfly.httpPort}</property>
+ <property name="javaVmArguments">-Ddummy ${argLine} ${wildfly.jigsawArgs} -Dwildfly.management.port=${wildfly.managementPort} -Dwildfly.http.port=${wildfly.httpPort}</property>
<property name="managementPort">${wildfly.managementPort}</property>
</configuration>
</container>