Author: bentmann
Date: Sun Mar 1 20:22:47 2009
New Revision: 749083
URL: http://svn.apache.org/viewvc?rev=749083&view=rev
Log:
o Decoupled IT from production plugins
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/src/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/src/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
Sun Mar 1 20:22:47 2009
@@ -23,6 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.List;
public class MavenITmng2861RelocationsAndRangesTest
extends AbstractMavenIntegrationTestCase
@@ -39,9 +40,16 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2861" );
Verifier verifier = new Verifier( new File( testDir, "MNG-2861"
).getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "A/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2861" );
- verifier.executeGoal( "install" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
+
+ List artifacts = verifier.loadLines( "A/target/artifacts.txt", "UTF-8"
);
+ assertTrue( artifacts.toString(), artifacts.contains(
"org.apache.maven.its.mng2861:B:jar:1.0-SNAPSHOT" ) );
+ assertTrue( artifacts.toString(), artifacts.contains(
"org.apache.maven.its.mng2861.new:project:jar:2.0" ) );
+ assertTrue( artifacts.toString(), artifacts.contains(
"org.apache.maven.its.mng2861:C:jar:1.0-SNAPSHOT" ) );
}
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml
Sun Mar 1 20:22:47 2009
@@ -39,4 +39,26 @@
</snapshots>
</repository>
</repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <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>
</project>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml
Sun Mar 1 20:22:47 2009
@@ -34,4 +34,28 @@
</snapshots>
</repository>
</repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>set</goal>
+ <goal>attach-pom</goal>
+ <goal>install</goal>
+ </goals>
+ <configuration>
+ <mainFile>pom.xml</mainFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml
Sun Mar 1 20:22:47 2009
@@ -34,4 +34,28 @@
</snapshots>
</repository>
</repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>set</goal>
+ <goal>attach-pom</goal>
+ <goal>install</goal>
+ </goals>
+ <configuration>
+ <mainFile>pom.xml</mainFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml
Sun Mar 1 20:22:47 2009
@@ -10,15 +10,6 @@
<name>MNG-2861</name>
<url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<modules>
<module>A</module>
<module>B</module>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom
Sun Mar 1 20:22:47 2009
@@ -7,14 +7,6 @@
<version>1.2</version>
<name>project</name>
<url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<distributionManagement>
<repository>
<id>id</id>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom
Sun Mar 1 20:22:47 2009
@@ -7,14 +7,6 @@
<version>2.0</version>
<name>project</name>
<url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<distributionManagement>
<repository>
<id>id</id>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom
Sun Mar 1 20:22:47 2009
@@ -5,14 +5,6 @@
<name>project</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<distributionManagement>
<repository>
<id>id</id>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom
Sun Mar 1 20:22:47 2009
@@ -7,14 +7,6 @@
<version>1.1</version>
<name>project</name>
<url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<distributionManagement>
<repository>
<id>id</id>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom?rev=749083&r1=749082&r2=749083&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom
Sun Mar 1 20:22:47 2009
@@ -7,14 +7,6 @@
<version>1.2</version>
<name>project12</name>
<url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<distributionManagement>
<repository>
<id>id</id>
