Author: bentmann
Date: Sun Mar 1 20:44:00 2009
New Revision: 749093
URL: http://svn.apache.org/viewvc?rev=749093&view=rev
Log:
o Decoupled IT from production plugins
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/dependency/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java?rev=749093&r1=749092&r2=749093&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
Sun Mar 1 20:44:00 2009
@@ -61,6 +61,7 @@
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
File settings = verifier.filterFile( "../settings-template.xml",
"settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
@@ -77,7 +78,7 @@
{
verifier.setLogFileName( "log-parent-a.txt" );
// this will ensure that all relevant plugins are present.
- verifier.executeGoal( "initialize" );
+ verifier.executeGoal( "validate" );
}
catch ( VerificationException e )
{
@@ -91,15 +92,15 @@
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( "log-parent-b.txt" );
- verifier.executeGoal( "initialize" );
+ verifier.executeGoal( "validate" );
// clear out the parent POM if it's in the local repository.
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "parent",
"1.0-SNAPSHOT", "pom" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
try
{
verifier.setLogFileName( "log-parent-c.txt" );
- verifier.executeGoal( "initialize" );
+ verifier.executeGoal( "validate" );
fail( "Build should fail with unresolvable parent POM." );
}
@@ -159,6 +160,7 @@
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
List cliOptions = new ArrayList();
@@ -176,7 +178,7 @@
{
verifier.setLogFileName( "log-dep-a.txt" );
// this will ensure that all relevant plugins are present.
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "validate" );
}
catch ( VerificationException e )
{
@@ -190,16 +192,15 @@
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( "log-dep-b.txt" );
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "validate" );
// clear out the dependency if it's in the local repository.
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "dep",
"1.0-SNAPSHOT", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "dep",
"1.0-SNAPSHOT", "jar" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
try
{
verifier.setLogFileName( "log-dep-c.txt" );
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "validate" );
fail( "Build should fail with unresolvable dependency artifact." );
}
@@ -261,6 +262,7 @@
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
List cliOptions = new ArrayList();
@@ -286,8 +288,7 @@
verifier.executeGoal(
"org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run" );
// clear out the dependency if it's in the local repository.
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "plugin",
"1.0-SNAPSHOT", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "plugin",
"1.0-SNAPSHOT", "jar" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
try
{
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml?rev=749093&r1=749092&r2=749093&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
Sun Mar 1 20:44:00 2009
@@ -12,23 +12,26 @@
<artifactId>dep</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.0</version>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <testArtifacts>target/artifacts.txt</testArtifacts>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
