You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/03/17 11:48:13 UTC
[maven-release] branch master updated: Stabilize integration tests
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new a36864f Stabilize integration tests
a36864f is described below
commit a36864fa4327777af88b44244f65e0132b35a047
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Mar 17 12:47:59 2019 +0100
Stabilize integration tests
---
maven-release-plugin/pom.xml | 68 +++++++++++-----------
.../MRELEASE-161-dependencyManagement/pom.xml | 11 +++-
.../src/it/projects/prepare/MRELEASE-161/pom.xml | 9 +++
.../src/it/projects/prepare/MRELEASE-976/pom.xml | 2 +
.../flat-multi-module/parent-project/pom.xml | 12 ++++
.../projects/prepare/regular-multi-module/pom.xml | 13 +++++
.../projects/update-versions/MRELEASE-555/pom.xml | 12 ++++
7 files changed, 92 insertions(+), 35 deletions(-)
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index 43d953e..72702bf 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -159,39 +159,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.0</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <postBuildHookScript>verify</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <debug>true</debug>
- <setupIncludes>
- <setupInclude>setup/*/pom.xml</setupInclude>
- </setupIncludes>
- <pomIncludes>
- <pomInclude>projects/prepare/*/*pom.xml</pomInclude>
- <pomInclude>projects/prepare/flat-multi-module/parent-project/pom.xml</pomInclude>
- <pomInclude>projects/prepare-with-pom/*/*pom.xml</pomInclude>
- <pomInclude>projects/branch/*/pom.xml</pomInclude>
- <pomInclude>projects/perform/*/pom.xml</pomInclude>
- <pomInclude>projects/update-versions/*/pom.xml</pomInclude>
- </pomIncludes>
- <pomExcludes>
- <pomExclude>projects/prepare/MRELEASE-966/pom.xml</pomExclude>
- </pomExcludes>
- <properties>
- <allowReleasePluginSnapshot>true</allowReleasePluginSnapshot>
- <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
- <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
- <dryRun>true</dryRun>
- </properties>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -208,11 +175,15 @@
<profiles>
<profile>
<id>run-its</id>
+ <properties>
+ <maven.it.failure.ignore>false</maven.it.failure.ignore>
+ </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>3.2.0</version>
<executions>
<execution>
<id>integration-test-prepare</id>
@@ -221,7 +192,36 @@
<goal>run</goal>
</goals>
</execution>
- </executions>
+ </executions>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <debug>true</debug>
+ <ignoreFailures>${maven.it.failure.ignore}</ignoreFailures>
+ <setupIncludes>
+ <setupInclude>setup/*/pom.xml</setupInclude>
+ </setupIncludes>
+ <pomIncludes>
+ <pomInclude>projects/prepare/*/*pom.xml</pomInclude>
+ <pomInclude>projects/prepare/flat-multi-module/parent-project/pom.xml</pomInclude>
+ <pomInclude>projects/prepare-with-pom/*/*pom.xml</pomInclude>
+ <pomInclude>projects/branch/*/pom.xml</pomInclude>
+ <pomInclude>projects/perform/*/pom.xml</pomInclude>
+ <pomInclude>projects/update-versions/*/pom.xml</pomInclude>
+ </pomIncludes>
+ <pomExcludes>
+ <pomExclude>projects/prepare/MRELEASE-966/pom.xml</pomExclude>
+ </pomExcludes>
+ <properties>
+ <allowReleasePluginSnapshot>true</allowReleasePluginSnapshot>
+ <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+ <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+ <dryRun>true</dryRun>
+ </properties>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml
index 0cffe8e..133cb6a 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml
@@ -55,7 +55,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
</dependencyManagement>
<build>
- <plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/pom.xml
index 07400a4..1beecc7 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/pom.xml
@@ -36,6 +36,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<connection>scm:git|sd_pa/tools/release-test</connection>
</scm>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/pom.xml
index af0c726..a20e7d1 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/pom.xml
@@ -32,7 +32,9 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
<configuration>
<projectVersionPolicyId>StubVersionPolicy</projectVersionPolicyId>
</configuration>
diff --git a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml
index bd7ae95..8c27df6 100644
--- a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml
@@ -35,6 +35,18 @@
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
</properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
diff --git a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml
index 9213386..083c8df 100644
--- a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/pom.xml
@@ -34,6 +34,19 @@
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
</properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
diff --git a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-555/pom.xml b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-555/pom.xml
index c659fa2..4718e3d 100644
--- a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-555/pom.xml
+++ b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-555/pom.xml
@@ -26,6 +26,18 @@
<url>http://jira.codehaus.org/browse/MRELEASE-555</url>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<modules>
<module>module-a</module>
<module>module-b</module>