Author: rfscholte Date: Mon Mar 20 21:34:37 2017 New Revision: 1787851 URL: http://svn.apache.org/viewvc?rev=1787851&view=rev Log: MRELEASE-979: Partial revert, which disabled most ITs
Modified: maven/release/trunk/maven-release-plugin/pom.xml Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1787851&r1=1787850&r2=1787851&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Mon Mar 20 21:34:37 2017 @@ -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>