[SUREFIRE-1972] Use current version of surefire-shared-utils

apache · Jan 8, 2022 · 646b38f · 646b38f
1 parent e969bef
commit 646b38f
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → surefire-shared/pom.xml b/surefire-shared-utils/pom.xml → 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>