From 646b38f5eac193f7f8a5b3cda48e7c2b7a3f7d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Diga=C5=88a?= <tibordigana@apache.org>
Date: Sat, 1 Jan 2022 23:01:56 +0100
Subject: [PATCH 1/2] [SUREFIRE-1972] Use current version of
 surefire-shared-utils

---
 maven-surefire-common/pom.xml                 |  2 +-
 pom.xml                                       |  8 +--
 surefire-api/pom.xml                          |  2 +-
 surefire-extensions-api/pom.xml               |  2 +-
 surefire-providers/common-java5/pom.xml       |  2 +-
 surefire-report-parser/pom.xml                |  2 +-
 .../pom.xml                                   | 57 ++++++++++++++++++-
 7 files changed, 61 insertions(+), 14 deletions(-)
 rename {surefire-shared-utils => surefire-shared}/pom.xml (65%)

diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 805b24769f..7e3c65c001 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shared-utils</artifactId>
-            <version>3.0.0-M4</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
diff --git a/pom.xml b/pom.xml
index 633946f5df..990f6ab6c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
   </contributors>
 
   <modules>
+    <module>surefire-shared</module>
     <module>surefire-logger-api</module>
     <module>surefire-api</module>
     <module>surefire-extensions-api</module>
@@ -62,7 +63,6 @@
     <module>maven-failsafe-plugin</module>
     <module>maven-surefire-report-plugin</module>
     <module>surefire-its</module>
-    <module>surefire-shared-utils</module>
   </modules>
 
   <scm>
@@ -667,12 +667,6 @@
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <deployAtEnd>true</deployAtEnd>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 158c88a8cd..d82b57e303 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-shared-utils</artifactId>
-      <version>3.0.0-M4</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
index ee086111df..5e56286fe3 100644
--- a/surefire-extensions-api/pom.xml
+++ b/surefire-extensions-api/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shared-utils</artifactId>
-            <version>3.0.0-M4</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml
index f76659e361..acf37c51d1 100644
--- a/surefire-providers/common-java5/pom.xml
+++ b/surefire-providers/common-java5/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-shared-utils</artifactId>
-      <version>3.0.0-M4</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
index b452bd701c..f31d9ec672 100644
--- a/surefire-report-parser/pom.xml
+++ b/surefire-report-parser/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-shared-utils</artifactId>
-      <version>3.0.0-M4</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
diff --git a/surefire-shared-utils/pom.xml b/surefire-shared/pom.xml
similarity index 65%
rename from surefire-shared-utils/pom.xml
rename to surefire-shared/pom.xml
index c845f5c4d1..27d7376d8b 100644
--- a/surefire-shared-utils/pom.xml
+++ b/surefire-shared/pom.xml
@@ -27,9 +27,11 @@
         <version>3.0.0-M6-SNAPSHOT</version>
     </parent>
 
-    <artifactId>surefire-shared-utils</artifactId>
+    <artifactId>surefire-shared</artifactId>
     <name>Surefire Shared Utils</name>
-    <description>Relocated Java packages of maven-shared-utils in Surefire</description>
+    <description>
+        Relocated Java packages of maven-shared-utils and several Apache Commons utilities in Surefire.
+    </description>
 
     <licenses>
         <license>
@@ -39,6 +41,11 @@
         </license>
     </licenses>
 
+    <properties>
+        <distRepoId>${distributionManagement.snapshotRepository.id}</distRepoId>
+        <distRepoUrl>${distributionManagement.snapshotRepository.url}</distRepoUrl>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
@@ -98,7 +105,53 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install-jar</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <artifactId>surefire-shared-utils</artifactId>
+                            <file>target/${project.build.finalName}.jar</file>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy-jar</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>surefire-shared-utils</artifactId>
+                            <version>${project.version}</version>
+                            <file>target/${project.build.finalName}.jar</file>
+                            <url>${distRepoUrl}</url>
+                            <repositoryId>${distRepoId}</repositoryId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <properties>
+                <distRepoId>${distributionManagement.repository.id}</distRepoId>
+                <distRepoUrl>${distributionManagement.repository.url}</distRepoUrl>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>

From 0b2bed950fa607aedb9a95282866d966d8aa036e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Diga=C5=88a?= <tibordigana@apache.org>
Date: Fri, 14 Jan 2022 14:22:23 +0100
Subject: [PATCH 2/2] exec-maven-plugin

---
 pom.xml                                       | 67 ++++++++++++++++++-
 .../pom.xml                                   | 53 +--------------
 2 files changed, 67 insertions(+), 53 deletions(-)
 rename {surefire-shared => surefire-shared-utils}/pom.xml (67%)

diff --git a/pom.xml b/pom.xml
index 990f6ab6c9..ddc229a3e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
   </contributors>
 
   <modules>
-    <module>surefire-shared</module>
     <module>surefire-logger-api</module>
     <module>surefire-api</module>
     <module>surefire-extensions-api</module>
@@ -579,11 +578,77 @@
                 <exclude>.m2</exclude>
                 <exclude>.travis.yml</exclude>
                 <exclude>.mvn/wrapper/maven-wrapper.properties</exclude>
+                <exclude>surefire-shared-utils/target/**</exclude>
               </excludes>
             </configuration>
           </execution>
         </executions>
       </plugin>
+        <plugin>
+            <groupId>org.codehaus.gmavenplus</groupId>
+            <artifactId>gmavenplus-plugin</artifactId>
+            <version>1.13.1</version>
+            <executions>
+                <execution>
+                    <id>examine-cmd</id>
+                    <phase>validate</phase>
+                    <inherited>false</inherited>
+                    <goals>
+                        <goal>execute</goal>
+                    </goals>
+                    <configuration>
+                        <scripts>
+                            <script>
+                                import static java.util.stream.Collectors.joining
+                                def mvnGoals = String.join(" ", session.goals)
+                                log.info "Maven commandline goals: $mvnGoals"
+                                project.properties.setProperty('mvnGoals', mvnGoals)
+                                def mvnProfiles = project.activeProfiles.stream()
+                                    .map { p -> "-P " + p.id }
+                                    .collect(joining(" "))
+                                log.info "Maven commandline profiles: $mvnProfiles"
+                                project.properties.setProperty('mvnProfiles', mvnProfiles)
+                                def mvnProps = session.userProperties.entrySet().stream()
+                                    .map { s -> "-D" + s.key + "=" + s.value }
+                                    .collect(joining(" "))
+                                project.properties.setProperty('mvnProps', mvnProps)
+                                log.info "Maven commandline user properties: $mvnProps"
+                            </script>
+                        </scripts>
+                    </configuration>
+                </execution>
+            </executions>
+            <dependencies>
+                <dependency>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-ant</artifactId>
+                    <version>3.0.9</version>
+                </dependency>
+            </dependencies>
+        </plugin>
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>3.0.0</version>
+            <executions>
+                <execution>
+                    <id>build-module-surefire-surefire-utils</id>
+                    <phase>test</phase>
+                    <inherited>false</inherited>
+                    <goals>
+                        <goal>exec</goal>
+                    </goals>
+                    <configuration>
+                        <workingDirectory>${project.basedir}</workingDirectory>
+                        <executable>mvn</executable>
+                        <commandlineArgs>
+                            ${mvnGoals} -f surefire-shared-utils/pom.xml ${mvnProfiles} ${mvnProps}
+                        </commandlineArgs>
+                        <useMavenLogger>true</useMavenLogger>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
diff --git a/surefire-shared/pom.xml b/surefire-shared-utils/pom.xml
similarity index 67%
rename from surefire-shared/pom.xml
rename to surefire-shared-utils/pom.xml
index 27d7376d8b..df6da7c3a4 100644
--- a/surefire-shared/pom.xml
+++ b/surefire-shared-utils/pom.xml
@@ -27,7 +27,7 @@
         <version>3.0.0-M6-SNAPSHOT</version>
     </parent>
 
-    <artifactId>surefire-shared</artifactId>
+    <artifactId>surefire-shared-utils</artifactId>
     <name>Surefire Shared Utils</name>
     <description>
         Relocated Java packages of maven-shared-utils and several Apache Commons utilities in Surefire.
@@ -41,11 +41,6 @@
         </license>
     </licenses>
 
-    <properties>
-        <distRepoId>${distributionManagement.snapshotRepository.id}</distRepoId>
-        <distRepoUrl>${distributionManagement.snapshotRepository.url}</distRepoUrl>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
@@ -105,53 +100,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-install-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>install-jar</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                        <configuration>
-                            <artifactId>surefire-shared-utils</artifactId>
-                            <file>target/${project.build.finalName}.jar</file>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-jar</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>surefire-shared-utils</artifactId>
-                            <version>${project.version}</version>
-                            <file>target/${project.build.finalName}.jar</file>
-                            <url>${distRepoUrl}</url>
-                            <repositoryId>${distRepoId}</repositoryId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>apache-release</id>
-            <properties>
-                <distRepoId>${distributionManagement.repository.id}</distRepoId>
-                <distRepoUrl>${distributionManagement.repository.url}</distRepoUrl>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>