You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/10 23:34:22 UTC
svn commit: r733386 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0097/ resources/it0097/project/
resources/it0097/project/project-level2/
resources/it0097/project/project-level2/project-level3...
Author: bentmann
Date: Sat Jan 10 14:34:21 2009
New Revision: 733386
URL: http://svn.apache.org/viewvc?rev=733386&view=rev
Log:
o Decoupled it0097 from production plugins
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/project-level3/src/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-sibling-level2/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/project-level3/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-sibling-level2/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/relative-project-level3/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java?rev=733386&r1=733385&r2=733386&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java Sat Jan 10 14:34:21 2009
@@ -37,20 +37,19 @@
// TODO: There is another IT for this issue, check whether these are dups or could be merged
/**
- * Test that the implied relative path for the parent POM works, even two
- * levels deep.
+ * Test that the implied relative path for the parent POM works, even two levels deep.
*/
public void testit0097()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0097" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "project/project-level2/project-level3/target/it0097.txt" );
- verifier.assertFilePresent( "project/project-sibling-level2/target/it0097.txt" );
+ verifier.setAutoclean( false );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2068" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/pom.xml?rev=733386&r1=733385&r2=733386&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/pom.xml Sat Jan 10 14:34:21 2009
@@ -1,15 +1,17 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Maven Integration Test :: it0097</name>
- <groupId>org.apache.maven.its.it0097</groupId>
- <artifactId>maven-it-it0097</artifactId>
- <description>Test that the implied relative path for the parent POM works, even two
- levels deep.</description>
+
+ <groupId>org.apache.maven.its.mng2068</groupId>
+ <artifactId>test</artifactId>
<version>1</version>
<packaging>pom</packaging>
+ <name>Maven Integration Test :: MNG-2068</name>
+ <description>
+ Test that the implied relative path for the parent POM works, even two levels deep.
+ </description>
+
<modules>
- <module>plugin</module>
<module>project/project-level2/project-level3</module>
<module>project/relative-project-level2/relative-project-level3/</module>
</modules>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/pom.xml?rev=733386&r1=733385&r2=733386&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/pom.xml Sat Jan 10 14:34:21 2009
@@ -1,29 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.it0097</groupId>
+
+ <groupId>org.apache.maven.its.mng2068</groupId>
<version>1</version>
<artifactId>project</artifactId>
<packaging>pom</packaging>
+
<modules>
<module>project-level2</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.it0097</groupId>
- <artifactId>maven-it0097-plugin</artifactId>
- <version>1</version>
- <executions>
- <execution>
- <id>it0097</id>
- <phase>initialize</phase>
- <goals>
- <goal>it0097</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/pom.xml?rev=733386&r1=733385&r2=733386&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/pom.xml Sat Jan 10 14:34:21 2009
@@ -1,13 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.maven.its.it0097</groupId>
+ <groupId>org.apache.maven.its.mng2068</groupId>
<artifactId>project</artifactId>
<version>1</version>
</parent>
+
<artifactId>project-level2</artifactId>
<packaging>pom</packaging>
+
<modules>
<module>project-level3</module>
<module>../project-sibling-level2</module>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/project-level3/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/project-level3/pom.xml?rev=733386&r1=733385&r2=733386&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/project-level3/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-level2/project-level3/pom.xml Sat Jan 10 14:34:21 2009
@@ -1,33 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.maven.its.it0097</groupId>
+ <groupId>org.apache.maven.its.mng2068</groupId>
<artifactId>project-level2</artifactId>
<version>1</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>project-level3</artifactId>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-sibling-level2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-sibling-level2/pom.xml?rev=733386&r1=733385&r2=733386&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-sibling-level2/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/project-sibling-level2/pom.xml Sat Jan 10 14:34:21 2009
@@ -1,34 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.maven.its.it0097</groupId>
+ <groupId>org.apache.maven.its.mng2068</groupId>
<artifactId>project-level2</artifactId>
<version>1</version>
<relativePath>../project-level2</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>project-sibling-level2</artifactId>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/pom.xml?rev=733386&r1=733385&r2=733386&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/pom.xml Sat Jan 10 14:34:21 2009
@@ -1,13 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.maven.its.it0097</groupId>
+ <groupId>org.apache.maven.its.mng2068</groupId>
<artifactId>project</artifactId>
<version>1</version>
</parent>
+
<artifactId>relative-project-level2</artifactId>
<packaging>pom</packaging>
+
<modules>
<module>relative-project-level3</module>
</modules>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/relative-project-level3/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/relative-project-level3/pom.xml?rev=733386&r1=733385&r2=733386&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/relative-project-level3/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0097/project/relative-project-level2/relative-project-level3/pom.xml Sat Jan 10 14:34:21 2009
@@ -1,13 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.maven.its.it0097</groupId>
+ <groupId>org.apache.maven.its.mng2068</groupId>
<artifactId>relative-project-level2</artifactId>
<version>1</version>
</parent>
+
<artifactId>relative-project-level3</artifactId>
<packaging>pom</packaging>
+
<modules>
<module>../../project-sibling-level2</module>
</modules>