[maven-surefire] 02/02: cleanup system properties and runtime after JaCoCo instrumentation

[tibordigana]

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit acc1e7d907803b1de4f6692194500b5487b6dc91
Author: tibordigana <tibordig...@apache.org>
AuthorDate: Sat Apr 9 01:51:21 2022 +0200

    cleanup system properties and runtime after JaCoCo instrumentation
---
 maven-failsafe-plugin/pom.xml   | 7 -------
 surefire-booter/pom.xml         | 9 ---------
 surefire-extensions-api/pom.xml | 9 ---------
 surefire-its/pom.xml            | 1 +
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index eb3195524..e6445e86b 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -74,18 +74,11 @@
             <artifactId>maven-plugin-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jacoco</groupId>
-            <artifactId>org.jacoco.agent</artifactId>
-            <classifier>runtime</classifier>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index 52256e793..8b4b78cc9 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -67,12 +67,6 @@
       <artifactId>powermock-api-mockito2</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.agent</artifactId>
-      <classifier>runtime</classifier>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -125,9 +119,6 @@
           <includes>
             <include>**/JUnit4SuiteTest.java</include>
           </includes>
-          <systemPropertyVariables>
-            
<jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
-          </systemPropertyVariables>
         </configuration>
       </plugin>
     </plugins>
diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
index acbdfbb23..68ba3f3e7 100644
--- a/surefire-extensions-api/pom.xml
+++ b/surefire-extensions-api/pom.xml
@@ -52,12 +52,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jacoco</groupId>
-            <artifactId>org.jacoco.agent</artifactId>
-            <classifier>runtime</classifier>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -84,9 +78,6 @@
                     <includes>
                         <include>**/JUnit4SuiteTest.java</include>
                     </includes>
-                    <systemPropertyVariables>
-                        
<jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
-                    </systemPropertyVariables>
                 </configuration>
                 <dependencies>
                     <dependency>
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 1d05fe136..aadc3f07f 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -150,6 +150,7 @@
                         </goals>
                         <configuration>
                             <propertyName>jacoco-it.agent</propertyName>
+                            
<destFile>${project.build.directory}/jacoco.exec</destFile>
                         </configuration>
                     </execution>
                 </executions>