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 ae282811111bceb41d2c3a40acb80b77ef7b7df4 Author: Tibor Digaňa <[email protected]> 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 | 68 +++++++++++++++++++++- 7 files changed, 72 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 58% rename from surefire-shared-utils/pom.xml rename to surefire-shared/pom.xml index c845f5c..cc04e88 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,32 @@ <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(); + isSnapshot = project.getVersion().matches(".*-SNAPSHOT"); + deploymentRepoId = isSnapshot ? "apache.snapshots.https" : "apache.releases.https"; + deploymentRepoUrl = isSnapshot ? snapUrl : relUrl; + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-shade-plugin</artifactId> <executions> <execution> @@ -98,6 +126,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>
