Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 2 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
646b38f
[SUREFIRE-1972] Use current version of surefire-shared-utils
Tibor17 Jan 1, 2022
0b2bed9
exec-maven-plugin
Tibor17 Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion maven-surefire-common/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
73 changes: 66 additions & 7 deletions pom.xml
View file
Open in desktop
Expand Up @@ -62,7 +62,6 @@
<module>maven-failsafe-plugin</module>
<module>maven-surefire-report-plugin</module>
<module>surefire-its</module>
<module>surefire-shared-utils</module>
</modules>

<scm>
Expand Down Expand Up @@ -579,11 +578,77 @@
<exclude>.m2</exclude>
<exclude>.travis.yml</exclude>
<exclude>.mvn/wrapper/maven-wrapper.properties</exclude>
<exclude>surefire-shared-utils/target/**</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.13.1</version>
<executions>
<execution>
<id>examine-cmd</id>
<phase>validate</phase>
<inherited>false</inherited>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<scripts>
<script>
import static java.util.stream.Collectors.joining
def mvnGoals = String.join(" ", session.goals)
log.info "Maven commandline goals: $mvnGoals"
project.properties.setProperty('mvnGoals', mvnGoals)
def mvnProfiles = project.activeProfiles.stream()
.map { p -> "-P " + p.id }
.collect(joining(" "))
log.info "Maven commandline profiles: $mvnProfiles"
project.properties.setProperty('mvnProfiles', mvnProfiles)
def mvnProps = session.userProperties.entrySet().stream()
.map { s -> "-D" + s.key + "=" + s.value }
.collect(joining(" "))
project.properties.setProperty('mvnProps', mvnProps)
log.info "Maven commandline user properties: $mvnProps"
</script>
</scripts>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-ant</artifactId>
<version>3.0.9</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>build-module-surefire-surefire-utils</id>
<phase>test</phase>
<inherited>false</inherited>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<workingDirectory>${project.basedir}</workingDirectory>
<executable>mvn</executable>
<commandlineArgs>
${mvnGoals} -f surefire-shared-utils/pom.xml ${mvnProfiles} ${mvnProps}
</commandlineArgs>
<useMavenLogger>true</useMavenLogger>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down Expand Up @@ -667,12 +732,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>

Expand Down
2 changes: 1 addition & 1 deletion surefire-api/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion surefire-extensions-api/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/common-java5/pom.xml
View file
Open in desktop
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion surefire-report-parser/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion surefire-shared-utils/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down