This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch ci-reporting
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/ci-reporting by this push:
new 938af0c make jaococ working everywhere but only for ci-reporting
profile, no need to run it all the time
938af0c is described below
commit 938af0c8fb1c6c5aed5036c342a0d85a17d5addb
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Mar 5 10:08:04 2022 +1000
make jaococ working everywhere but only for ci-reporting profile, no need
to run it all the time
Signed-off-by: Olivier Lamy <ol...@apache.org>
---
maven-failsafe-plugin/pom.xml | 28 ++---------
maven-surefire-common/pom.xml | 20 +-------
maven-surefire-plugin/pom.xml | 25 +---------
maven-surefire-report-plugin/pom.xml | 26 +---------
pom.xml | 33 ++++++++++---
surefire-api/pom.xml | 64 ++++++++----------------
surefire-booter/pom.xml | 46 +----------------
surefire-extensions-api/pom.xml | 29 +----------
surefire-grouper/pom.xml | 30 +----------
surefire-its/pom.xml | 96 ++++++++++--------------------------
surefire-providers/pom.xml | 2 +-
surefire-report-parser/pom.xml | 3 +-
surefire-shadefire/pom.xml | 2 +-
13 files changed, 88 insertions(+), 316 deletions(-)
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 4db1253..51e0df1 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -41,9 +41,12 @@
<properties>
<thisPlugin>Failsafe</thisPlugin>
<thatPlugin>Surefire</thatPlugin>
+ <!--
+ FIXME we must not have such hardcoded port
+ we should use
http://www.mojohaus.org/build-helper-maven-plugin/reserve-network-port-mojo.html
+ -->
<failsafe-integration-test-port>8184</failsafe-integration-test-port>
<failsafe-integration-test-stop-port>8185</failsafe-integration-test-stop-port>
- <jacoco.agent></jacoco.agent>
</properties>
<dependencies>
@@ -97,11 +100,10 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!--
${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
<configuration>
- <argLine>${jvm.args.tests}</argLine>
<includes>
<include>**/JUnit4SuiteTest.java</include>
</includes>
@@ -236,7 +238,6 @@
<goal>run</goal>
</goals>
<configuration>
- <mavenOpts>${jacoco.agent}</mavenOpts>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<goals>
@@ -283,24 +284,5 @@
</plugins>
</reporting>
</profile>
- <profile>
- <id>ci-reporting</id>
- <properties>
- <jacoco.propertyName>jacoco.agent</jacoco.propertyName>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
</profiles>
</project>
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index afb7f3b..de2ea1e 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -111,11 +111,10 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!--
${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
<configuration>
- <argLine>${jvm.args.tests}</argLine>
<includes>
<include>**/JUnit4SuiteTest.java</include>
</includes>
@@ -134,21 +133,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>ci-reporting</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
-
<jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index f2264c3..73f2e90 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -41,7 +41,6 @@
<properties>
<thisPlugin>Surefire</thisPlugin>
<thatPlugin>Failsafe</thatPlugin>
- <jacoco.agent></jacoco.agent>
</properties>
<dependencies>
@@ -70,14 +69,11 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
- </configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!--
${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
</plugin>
@@ -175,24 +171,5 @@
</plugins>
</reporting>
</profile>
- <profile>
- <id>ci-reporting</id>
- <properties>
- <jacoco.propertyName>jacoco.agent</jacoco.propertyName>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
</profiles>
</project>
diff --git a/maven-surefire-report-plugin/pom.xml
b/maven-surefire-report-plugin/pom.xml
index c4d2208..5b73678 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -42,10 +42,6 @@
</developer>
</developers>
- <properties>
- <jacoco.agent></jacoco.agent>
- </properties>
-
<prerequisites>
<maven>${mavenVersion}</maven>
</prerequisites>
@@ -111,7 +107,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${jvm.args.tests}</argLine>
<includes>
<include>**/JUnit4SuiteTest.java</include>
</includes>
@@ -123,7 +118,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!--
${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
</plugin>
@@ -194,24 +189,5 @@
</plugins>
</reporting>
</profile>
- <profile>
- <id>ci-reporting</id>
- <properties>
- <jacoco.propertyName>jacoco.agent</jacoco.propertyName>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
</profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 3c4265a..52f1634 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,8 @@
<jvm9ArgsTests/>
<jvm.args.tests>${jvm9ArgsTests} -Xms32m -Xmx144m
-XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true
-Djdk.net.URLClassPath.disableClassPathURLCheck=true</jvm.args.tests>
<project.build.outputTimestamp>2020-06-10T18:16:37Z</project.build.outputTimestamp>
+ <!-- FIXME using 3.0.0-M5 breaks everything -->
+ <surefire.version.used>3.0.0-M4</surefire.version.used>
</properties>
<dependencyManagement>
@@ -436,7 +438,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but resolved due
to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!-- ${shadedVersion},
but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<configuration>
<!-- NOTE: Be sure to isolate the Surefire version under test from
the version running the tests! -->
<useSystemClassLoader>false</useSystemClassLoader>
@@ -453,6 +455,11 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
<artifactId>maven-plugin-plugin</artifactId>
<executions>
<execution>
@@ -614,10 +621,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<deployAtEnd>true</deployAtEnd>
@@ -631,7 +634,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</plugin>
</plugins>
</reporting>
@@ -678,5 +681,23 @@
</plugins>
</reporting>
</profile>
+ <profile>
+ <id>ci-reporting</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>
+ @{argLine} ${jvm.args.tests}
+ </argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 7409b93..9a4f395 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -31,10 +31,6 @@
<name>SureFire API</name>
<description>API used in Surefire and Failsafe MOJO, Booter, Common and test
framework providers.</description>
- <properties>
- <jacoco.agent></jacoco.agent>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -64,46 +60,26 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests}</argLine>
- <includes>
- <include>**/JUnit4SuiteTest.java</include>
- </includes>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but resolved
due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/JUnit4SuiteTest.java</include>
+ </includes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>${surefire.version.used}</version> <!--
${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
- <profiles>
- <profile>
- <id>ci-reporting</id>
- <properties>
- <jacoco.propertyName>jacoco.agent</jacoco.propertyName>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index 9a5e3e1..2caa6bb 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -31,10 +31,6 @@
<name>SureFire Booter</name>
<description>API and Facilities used by forked tests running in JVM
sub-process.</description>
- <properties>
- <jacoco.agent></jacoco.agent>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -98,23 +94,9 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>jacoco-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <propertyName>jacoco.agent</propertyName>
- </configuration>
- </plugin>
- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.0.0-M3</version> <!-- FIXME why can't we use a more recent
version? -->
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -123,9 +105,6 @@
</dependency>
</dependencies>
<configuration>
- <argLine>${jvm.args.tests}</argLine>
- <useFile>true</useFile>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
<include>**/JUnit4SuiteTest.java</include>
</includes>
@@ -133,25 +112,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>ci-reporting</id>
- <properties>
- <jacoco.propertyName>jacoco.agent</jacoco.propertyName>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
index fc47eca..2dcfe9d 100644
--- a/surefire-extensions-api/pom.xml
+++ b/surefire-extensions-api/pom.xml
@@ -30,10 +30,6 @@
<artifactId>surefire-extensions-api</artifactId>
<name>Surefire Extensions API</name>
- <properties>
- <jacoco.agent></jacoco.agent>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -69,7 +65,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${jvm.args.tests}</argLine>
<includes>
<include>**/JUnit4SuiteTest.java</include>
</includes>
@@ -81,31 +76,11 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!--
${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>ci-reporting</id>
- <properties>
- <jacoco.propertyName>jacoco.agent</jacoco.propertyName>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
+
</project>
diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml
index 637ef90..565bc60 100644
--- a/surefire-grouper/pom.xml
+++ b/surefire-grouper/pom.xml
@@ -32,10 +32,6 @@
<name>Maven Surefire Test-Grouping Support</name>
<description>Maven Surefire Test-Grouping Support</description>
- <properties>
- <jacoco.agent></jacoco.agent>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -60,14 +56,11 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests}</argLine>
- </configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but resolved
due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!-- ${shadedVersion},
but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
</plugin>
@@ -83,25 +76,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>ci-reporting</id>
- <properties>
- <jacoco.propertyName>jacoco.agent</jacoco.propertyName>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 7ed4f4b..f1a61d1 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -34,14 +34,13 @@
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <jacoco-it.agent></jacoco-it.agent>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-report-parser</artifactId>
- <version>3.0.0-M5</version>
+ <version>${surefire.version.used}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -135,12 +134,13 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!--
${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
<configuration>
@@ -172,8 +172,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>3.0.0-M5</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<configuration>
<skipTests>${skipTests}</skipTests>
<runOrder>alphabetical</runOrder>
@@ -202,13 +202,13 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
- <version>3.0.0-M5</version> <!--
${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version>
<!-- ${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
- <dependency>
- <groupId>org.jacoco</groupId>
- <artifactId>org.jacoco.agent</artifactId>
- <version>${jacoco.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.jacoco</groupId>-->
+<!-- <artifactId>org.jacoco.agent</artifactId>-->
+<!-- <version>${jacoco.version}</version>-->
+<!-- </dependency>-->
</dependencies>
<executions>
<execution>
@@ -219,69 +219,23 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jacoco-agent</id>
+ <goals>
+ <goal>prepare-agent-integration</goal>
+ </goals>
+ <configuration>
+ <propertyName>jacoco-it.agent</propertyName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
- <profile>
- <id>ci-reporting</id>
- <properties>
- <jacoco.propertyName>jacoco.agent</jacoco.propertyName>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>jacoco-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>jacoco-agent-it</id>
- <goals>
- <goal>prepare-agent-integration</goal>
- </goals>
- <configuration>
- <propertyName>jacoco-it.agent</propertyName>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <jacoco.agent>${jacoco-it.agent}</jacoco.agent>
- </systemPropertyVariables>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <shutdown>kill</shutdown>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.jacoco</groupId>
- <artifactId>org.jacoco.agent</artifactId>
- <version>${jacoco.version}</version>
- </dependency>
- </dependencies>
- </plugin>
-
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml
index 1353815..a8b8ca5 100644
--- a/surefire-providers/pom.xml
+++ b/surefire-providers/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but resolved
due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!-- ${shadedVersion},
but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
</plugin>
diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
index 9b280ac..8bb75f5 100644
--- a/surefire-report-parser/pom.xml
+++ b/surefire-report-parser/pom.xml
@@ -60,8 +60,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
- <version>3.0.0-M4
- </version> <!-- ${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!-- ${shadedVersion},
but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
<configuration>
diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index 1c8c412..d1e53ba 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -118,7 +118,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M4</version> <!-- ${shadedVersion}, but resolved due to
https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <version>${surefire.version.used}</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<configuration>
<skip>true</skip>
</configuration>
