You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/06/05 13:33:04 UTC
[maven-surefire] branch SUREFIRE-2091 created (now 01c197561)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch SUREFIRE-2091
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
at 01c197561 [SUREFIRE-2091] fix failsafe ITs: install junit3 provider
This branch includes the following new commits:
new 01c197561 [SUREFIRE-2091] fix failsafe ITs: install junit3 provider
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.
[maven-surefire] 01/01: [SUREFIRE-2091] fix failsafe ITs: install junit3 provider
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch SUREFIRE-2091
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 01c1975617062c9f70dcdaa937f042b233c1f6b4
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Jun 5 15:32:56 2022 +0200
[SUREFIRE-2091] fix failsafe ITs: install junit3 provider
---
maven-failsafe-plugin/pom.xml | 71 +++++++++++++++----------------
maven-failsafe-plugin/src/it/settings.xml | 35 ++++++++++++++-
pom.xml | 7 ---
3 files changed, 68 insertions(+), 45 deletions(-)
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 6d460d9c9..23d732642 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -51,6 +51,12 @@
<artifactId>maven-surefire-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit3</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -230,43 +236,36 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <skipInstallation>${skipTests}</skipInstallation>
+ <skipInvocation>${skipTests}</skipInvocation>
+ <showErrors>false</showErrors>
+ <properties>
+ <integration-test-port>${failsafe-integration-test-port}</integration-test-port>
+ <integration-test-stop-port>${failsafe-integration-test-stop-port}</integration-test-stop-port>
+ </properties>
+ <debug>true</debug>
+ </configuration>
<executions>
- <execution>
- <id>pre-its</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>install</goal>
- </goals>
- <configuration>
- <skipInstallation>${skipTests}</skipInstallation>
- </configuration>
- </execution>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <goals>
- <goal>verify</goal>
- <goal>-nsu</goal>
- </goals>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
- <settingsFile>src/it/settings.xml</settingsFile>
- <skipInvocation>${skipTests}</skipInvocation>
- <showErrors>true</showErrors>
- <properties>
- <integration-test-port>${failsafe-integration-test-port}</integration-test-port>
- <integration-test-stop-port>${failsafe-integration-test-stop-port}</integration-test-stop-port>
- </properties>
- <debug>true</debug>
- </configuration>
- </execution>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/maven-failsafe-plugin/src/it/settings.xml b/maven-failsafe-plugin/src/it/settings.xml
index 90ecf59e1..24084798d 100644
--- a/maven-failsafe-plugin/src/it/settings.xml
+++ b/maven-failsafe-plugin/src/it/settings.xml
@@ -18,5 +18,36 @@
~ under the License.
-->
<settings>
- <localRepository>@localRepositoryUrl@</localRepository>
-</settings>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 70c320897..eb52cd929 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,13 +389,6 @@
<redirectTestOutputToFile>false</redirectTestOutputToFile>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <preparationGoals>clean install</preparationGoals>
- <commitByProject>false</commitByProject>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<executions>