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/14 21:07:56 UTC
[maven-surefire] 01/03: [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-2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 7c74ba6b8bf9fb5f63d2468dae5164f4bc532575
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 | 3 ++-
pom.xml | 2 +-
surefire-api/pom.xml | 3 ++-
surefire-extensions-api/pom.xml | 3 ++-
surefire-providers/common-java5/pom.xml | 3 ++-
surefire-report-parser/pom.xml | 3 ++-
surefire-shadefire/pom.xml | 2 +-
surefire-shared-utils/pom.xml | 6 +++++-
8 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 805b247..1d3e2f7 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -74,7 +74,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
diff --git a/pom.xml b/pom.xml
index 8210f62..25d5b4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
</contributors>
<modules>
+ <module>surefire-shared-utils</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..5b653d0 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -40,7 +40,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
index ee08611..08ab343 100644
--- a/surefire-extensions-api/pom.xml
+++ b/surefire-extensions-api/pom.xml
@@ -45,7 +45,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml
index f76659e..8d2f1df 100644
--- a/surefire-providers/common-java5/pom.xml
+++ b/surefire-providers/common-java5/pom.xml
@@ -35,7 +35,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
</dependencies>
diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
index b452bd7..146f7aa 100644
--- a/surefire-report-parser/pom.xml
+++ b/surefire-report-parser/pom.xml
@@ -41,7 +41,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index 164e35c..c7940fb 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -73,7 +73,7 @@
<configuration>
<artifactSet>
<includes>
- <include>org.apache.maven.surefire:surefire-shared-utils</include>
+ <include>org.apache.maven.surefire:surefire-shared-utils:jar:shaded</include>
<include>org.apache.maven.surefire:surefire-logger-api</include>
<include>org.apache.maven.surefire:surefire-api</include>
<include>org.apache.maven.surefire:surefire-extensions-spi</include>
diff --git a/surefire-shared-utils/pom.xml b/surefire-shared-utils/pom.xml
index c845f5c..a068e50 100644
--- a/surefire-shared-utils/pom.xml
+++ b/surefire-shared-utils/pom.xml
@@ -29,7 +29,9 @@
<artifactId>surefire-shared-utils</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>
@@ -68,6 +70,8 @@
<goal>shade</goal>
</goals>
<configuration>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>shaded</shadedClassifierName>
<artifactSet>
<includes>
<include>org.apache.maven.shared:maven-shared-utils</include>