MRELEASE-979: Partial revert, which disabled most ITs
git-svn-id: https://svn.apache.org/repos/asf/maven/release/trunk@1787851 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index 889782f..e543696 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -208,6 +208,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>2.0.0</version>
<executions>
<execution>
<id>integration-test-prepare</id>
@@ -216,42 +217,39 @@
<setupInclude>setup/*/pom.xml</setupInclude>
</setupIncludes>
<pomIncludes>
- <pomInclude>X</pomInclude>
+ <pomInclude>projects/prepare/*/*pom.xml</pomInclude>
+ <pomInclude>projects/prepare/flat-multi-module/parent-project/pom.xml</pomInclude>
</pomIncludes>
-<!-- <pomIncludes> -->
-<!-- <pomInclude>Xprojects/prepare/*/*pom.xml</pomInclude> -->
-<!-- <pomInclude>Xprojects/prepare/flat-multi-module/parent-project/pom.xml</pomInclude> -->
-<!-- </pomIncludes> -->
-<!-- <pomExcludes> -->
-<!-- <pomExclude>projects/prepare/MRELEASE-966/pom.xml</pomExclude> -->
-<!-- </pomExcludes> -->
-<!-- <goals> -->
-<!-- <goal>clean</goal> -->
-<!-- <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal> -->
-<!-- <goal>${project.groupId}:${project.artifactId}:${project.version}:prepare</goal> -->
-<!-- </goals> -->
+ <pomExcludes>
+ <pomExclude>projects/prepare/MRELEASE-966/pom.xml</pomExclude>
+ </pomExcludes>
+ <goals>
+ <goal>clean</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:prepare</goal>
+ </goals>
</configuration>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
-<!-- <execution> -->
-<!-- <id>integration-test-prepare-with-pom</id> -->
-<!-- <configuration> -->
-<!-- <pomIncludes> -->
-<!-- <pomInclude>Xprojects/prepare-with-pom/*/*pom.xml</pomInclude> -->
-<!-- </pomIncludes> -->
-<!-- <goals> -->
-<!-- <goal>clean</goal> -->
-<!-- <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal> -->
-<!-- <goal>${project.groupId}:${project.artifactId}:${project.version}:prepare-with-pom</goal> -->
-<!-- </goals> -->
-<!-- </configuration> -->
-<!-- <goals> -->
-<!-- <goal>run</goal> -->
-<!-- </goals> -->
-<!-- </execution> -->
+ <execution>
+ <id>integration-test-prepare-with-pom</id>
+ <configuration>
+ <pomIncludes>
+ <pomInclude>projects/prepare-with-pom/*/*pom.xml</pomInclude>
+ </pomIncludes>
+ <goals>
+ <goal>clean</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:prepare-with-pom</goal>
+ </goals>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
<execution>
<id>integration-test-branch</id>
<configuration>
@@ -268,39 +266,39 @@
<goal>run</goal>
</goals>
</execution>
-<!-- <execution> -->
-<!-- <id>integration-test-perform</id> -->
-<!-- <configuration> -->
-<!-- <pomIncludes> -->
-<!-- <pomInclude>projects/perform/*/pom.xml</pomInclude> -->
-<!-- </pomIncludes> -->
-<!-- <goals> -->
-<!-- <goal>clean</goal> -->
-<!-- <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal> -->
-<!-- <goal>${project.groupId}:${project.artifactId}:${project.version}:prepare</goal> -->
-<!-- <goal>${project.groupId}:${project.artifactId}:${project.version}:perform</goal> -->
-<!-- </goals> -->
-<!-- </configuration> -->
-<!-- <goals> -->
-<!-- <goal>run</goal> -->
-<!-- </goals> -->
-<!-- </execution> -->
-<!-- <execution> -->
-<!-- <id>integration-test-update-versions</id> -->
-<!-- <configuration> -->
-<!-- <pomIncludes> -->
-<!-- <pomInclude>projects/update-versions/*/pom.xml</pomInclude> -->
-<!-- </pomIncludes> -->
-<!-- <goals> -->
-<!-- <goal>clean</goal> -->
-<!-- <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal> -->
-<!-- <goal>${project.groupId}:${project.artifactId}:${project.version}:update-versions</goal> -->
-<!-- </goals> -->
-<!-- </configuration> -->
-<!-- <goals> -->
-<!-- <goal>run</goal> -->
-<!-- </goals> -->
-<!-- </execution> -->
+ <execution>
+ <id>integration-test-perform</id>
+ <configuration>
+ <pomIncludes>
+ <pomInclude>projects/perform/*/pom.xml</pomInclude>
+ </pomIncludes>
+ <goals>
+ <goal>clean</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:prepare</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:perform</goal>
+ </goals>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>integration-test-update-versions</id>
+ <configuration>
+ <pomIncludes>
+ <pomInclude>projects/update-versions/*/pom.xml</pomInclude>
+ </pomIncludes>
+ <goals>
+ <goal>clean</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:clean</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:update-versions</goal>
+ </goals>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
