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 2022/01/02 18:43:17 UTC
[maven-surefire] 01/01: [SUREFIRE-1972] Use current version of surefire-shared-utils
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch jira-1972
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 74293510a70021f2d2947c824dc1d2ac65e15e2d
Author: Tibor Digaňa <ti...@apache.org>
AuthorDate: Sat Jan 1 23:01:56 2022 +0100
[SUREFIRE-1972] Use current version of surefire-shared-utils
---
maven-surefire-common/pom.xml | 2 +-
pom.xml | 2 +-
surefire-api/pom.xml | 2 +-
surefire-extensions-api/pom.xml | 2 +-
surefire-providers/common-java5/pom.xml | 2 +-
surefire-report-parser/pom.xml | 2 +-
{surefire-shared-utils => surefire-shared}/pom.xml | 38 ++++++++++++++++++++--
7 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 805b247..7e3c65c 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 8210f62..a259dfa 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>
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 158c88a..d82b57e 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 ee08611..5e56286 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 f76659e..acf37c5 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 b452bd7..f31d9ec 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 74%
rename from surefire-shared-utils/pom.xml
rename to surefire-shared/pom.xml
index c845f5c..a7dfe3e 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>
@@ -98,6 +100,38 @@
</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>
+ <file>target/${project.build.finalName}.jar</file>
+ <artifactId>surefire-shared-utils</artifactId>
+ </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>
+ <file>target/${project.build.finalName}.jar</file>
+ <artifactId>surefire-shared-utils</artifactId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>