Stabilize integration tests

apache · Mar 17, 2019 · a36864f · a36864f
1 parent 425ec60
commit a36864f
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>