You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/07/11 23:52:01 UTC
[maven-surefire] 01/02: improved poms
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch maven2surefire-jvm-communication
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit dafba7c044dd04fdf7be67598b2fd2b1d7de5267
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Jul 11 00:56:59 2019 +0200
improved poms
---
surefire-extensions-api/pom.xml | 31 ++++++++++++-------------------
surefire-extensions-spi/pom.xml | 1 +
2 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
index 18d48ed..2ba61de 100644
--- a/surefire-extensions-api/pom.xml
+++ b/surefire-extensions-api/pom.xml
@@ -54,24 +54,24 @@
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
- <id>jacoco-instrumentation</id>
- <!--
- phase: the order of the plugins matters and maven-plugin-plugin must be before jacoco plugin
- -->
+ <id>jacoco-agent</id>
<goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- <execution>
- <id>restore-classes</id>
- <goals>
- <goal>restore-instrumented-classes</goal>
+ <goal>prepare-agent</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <propertyName>jacoco.agent</propertyName>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
+ <includes>
+ <include>**/JUnit4SuiteTest.java</include>
+ </includes>
+ </configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -79,14 +79,7 @@
<version>3.0.0-M3</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
- <configuration>
- <argLine>${jvm.args.tests}</argLine>
- <systemPropertyVariables>
- <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
- </systemPropertyVariables>
- </configuration>
</plugin>
</plugins>
</build>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/surefire-extensions-spi/pom.xml b/surefire-extensions-spi/pom.xml
index 9738e6d..95cf3d9 100644
--- a/surefire-extensions-spi/pom.xml
+++ b/surefire-extensions-spi/pom.xml
@@ -29,6 +29,7 @@
</parent>
<artifactId>surefire-extensions-spi</artifactId>
+ <name>Surefire Extensions SPI</name>
<dependencies>
<dependency>