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 22:30:17 UTC
[maven-surefire] branch jira-1972 updated (ae28281 -> 633d945)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch jira-1972
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
discard ae28281 [SUREFIRE-1972] Use current version of surefire-shared-utils
new 633d945 [SUREFIRE-1972] Use current version of surefire-shared-utils
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ae28281)
\
N -- N -- N refs/heads/jira-1972 (633d945)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
surefire-shared/pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[maven-surefire] 01/01: [SUREFIRE-1972] Use current version of surefire-shared-utils
Posted by ti...@apache.org.
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 633d94530cad9b9aad9b7ee0146bf3a9b7f6c502
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 | 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 +-
{surefire-shared-utils => surefire-shared}/pom.xml | 70 +++++++++++++++++++++-
7 files changed, 74 insertions(+), 14 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..0564b25 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 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 56%
rename from surefire-shared-utils/pom.xml
rename to surefire-shared/pom.xml
index c845f5c..96218bf 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>
@@ -61,6 +63,34 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>bsh-property</id>
+ <goals>
+ <goal>bsh-property</goal>
+ </goals>
+ <configuration>
+ <properties>
+ <property>deploymentRepoId</property>
+ <property>deploymentRepoUrl</property>
+ </properties>
+ <source>
+ relUrl = project.getDistributionManagement().getRepository().getUrl();
+ snapUrl = project.getDistributionManagement().getSnapshotRepository().getUrl();
+ relId = project.getDistributionManagement().getRepository().getId();
+ snapId = project.getDistributionManagement().getSnapshotRepository().getId();
+ isSnapshot = project.getVersion().matches(".*-SNAPSHOT");
+ deploymentRepoId = isSnapshot ? snapId : relId;
+ deploymentRepoUrl = isSnapshot ? snapUrl : relUrl;
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
@@ -98,6 +128,42 @@
</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>${deploymentRepoUrl}</url>
+ <repositoryId>${deploymentRepoId}</repositoryId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>