Author: bentmann
Date: Fri Mar 26 20:57:34 2010
New Revision: 928056
URL: http://svn.apache.org/viewvc?rev=928056&view=rev
Log:
o Changed IT to use the proper lifecycle phases and reflect real world scenarios
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/dependency/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java?rev=928056&r1=928055&r2=928056&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
Fri Mar 26 20:57:34 2010
@@ -51,7 +51,7 @@ public class MavenITmng2871PrePackageSub
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer/target" );
- verifier.executeGoal( "validate" );
+ verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java?rev=928056&r1=928055&r2=928056&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
Fri Mar 26 20:57:34 2010
@@ -56,7 +56,7 @@ public class MavenITmng3043BestEffortRea
verifier.deleteDirectory( "consumer-c/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3043" );
verifier.setLogFileName( "log-test.txt" );
- verifier.executeGoal( "validate" );
+ verifier.executeGoal( "test" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -110,7 +110,7 @@ public class MavenITmng3043BestEffortRea
verifier.deleteDirectory( "consumer-c/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3043" );
verifier.setLogFileName( "log-package.txt" );
- verifier.executeGoal( "initialize" );
+ verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml?rev=928056&r1=928055&r2=928056&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml
Fri Mar 26 20:57:34 2010
@@ -38,4 +38,20 @@ under the License.
<module>consumer</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/dependency/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/dependency/pom.xml?rev=928056&r1=928055&r2=928056&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/dependency/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/dependency/pom.xml
Fri Mar 26 20:57:34 2010
@@ -47,11 +47,10 @@ under the License.
<artifactId>maven-it-plugin-artifact</artifactId>
<version>2.1-SNAPSHOT</version>
<executions>
- <!-- For the purposes of this test, the "initialize" phase plays the
role of the "package" phase -->
<execution>
<!-- mimic creation of test JAR -->
<id>package-test-jar</id>
- <phase>initialize</phase>
+ <phase>package</phase>
<goals>
<goal>attach</goal>
</goals>
@@ -64,7 +63,7 @@ under the License.
<execution>
<!-- mimic creation of EJB client JAR -->
<id>package-ejb-client-jar</id>
- <phase>initialize</phase>
+ <phase>package</phase>
<goals>
<goal>attach</goal>
</goals>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/pom.xml?rev=928056&r1=928055&r2=928056&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3043/pom.xml
Fri Mar 26 20:57:34 2010
@@ -40,4 +40,31 @@ under the License.
<module>consumer-b</module>
<module>consumer-c</module>
</modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
