Skip to content

Commit

Permalink
MRELEASE-979: Partial revert, which disabled most ITs
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/maven/release/trunk@1787851 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
rfscholte committed Mar 20, 2017
1 parent 81dec73 commit 811fee8
Showing 1 changed file with 60 additions and 62 deletions.
122 changes: 60 additions & 62 deletions maven-release-plugin/pom.xml
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 811fee8

Please sign in to comment.