Author: jvanzyl
Date: Sun Oct 22 09:31:59 2006
New Revision: 466753
URL: http://svn.apache.org/viewvc?view=rev&rev=466753
Log:
o fixes for various child POMs, getting the reactor build to work
o next is removing all the duplicate ids which resulted from us never using
Maven itself to run the ITs
- it all needs to run in the reactor because it's very convenient to run the
reactor to see if everything is ok, allows all
the tests to run together and allows you to create the IDE project files
for just the test projects.
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0045/subproject/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject2/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0058/subproject/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0060/subproject/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub1/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub2/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0099/child/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/level3/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/pom.xml
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/pom.xml
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0045/subproject/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0045/subproject/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0045/subproject/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0045/subproject/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,10 +1,10 @@
<model>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core-it0045</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0045</artifactId>
<version>1.0</version>
</parent>
- <artifactId>maven-core-it0045-subproject</artifactId>
+ <artifactId>maven-it-it0045-subproject</artifactId>
<packaging>jar</packaging>
</model>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,11 +1,11 @@
<model>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core-it0046</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0046</artifactId>
<version>1.0</version>
</parent>
- <artifactId>maven-core-it0046-subproject</artifactId>
+ <artifactId>maven-it-it0046-subproject</artifactId>
<packaging>jar</packaging>
<build>
@@ -14,7 +14,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-core-it-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
-
<configuration>
<fail>true</fail>
</configuration>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject2/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject2/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0046/subproject2/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,10 +1,10 @@
<model>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core-it0046</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0046</artifactId>
<version>1.0</version>
</parent>
- <artifactId>maven-core-it0046-subproject2</artifactId>
+ <artifactId>maven-it-it0046-subproject2</artifactId>
<packaging>jar</packaging>
</model>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0058/subproject/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0058/subproject/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0058/subproject/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0058/subproject/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,11 +1,11 @@
<model>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>maven-core-it0058</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0058</artifactId>
<version>1.0</version>
</parent>
- <artifactId>maven-core-it0058-subproject</artifactId>
+ <artifactId>maven-it-it0058-subproject</artifactId>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0060/subproject/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0060/subproject/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0060/subproject/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0060/subproject/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,11 +1,11 @@
<model>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>maven-core-it0060</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0060</artifactId>
<version>1.0</version>
</parent>
- <artifactId>maven-core-it0060-subproject</artifactId>
+ <artifactId>maven-it-it0060-subproject</artifactId>
<packaging>jar</packaging>
<version>1.0</version>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub1/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub1/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub1/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,11 +1,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>maven-core-it0075-root</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0075</artifactId>
<version>1.0</version>
</parent>
- <artifactId>maven-core-it0075-sub1</artifactId>
+ <artifactId>maven-it-it0075-sub1</artifactId>
</project>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub2/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub2/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0075/sub2/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,11 +1,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>maven-core-it0075-root</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0075</artifactId>
<version>1.0</version>
</parent>
- <artifactId>maven-core-it0075-sub2</artifactId>
+ <artifactId>maven-it-it0075-sub2</artifactId>
</project>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,12 +1,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>it0085-parent</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0085</artifactId>
<version>1.0</version>
</parent>
<artifactId>it0085-dep</artifactId>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.it</groupId>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,8 +1,8 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>it0085-parent</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0085</artifactId>
<version>1.0</version>
</parent>
<artifactId>it0085-war</artifactId>
@@ -15,7 +15,7 @@
<version>3.8.1</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.it</groupId>
+ <groupId>org.apache.maven.its</groupId>
<artifactId>it0085-dep</artifactId>
<version>1.0</version>
<scope>provided</scope>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0099/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0099/child/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0099/child/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0099/child/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,8 +1,8 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it0099</groupId>
- <artifactId>maven-it0099-parent</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0099</artifactId>
<version>1</version>
</parent>
<artifactId>maven-it0099-child</artifactId>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/level3/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/level3/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/level3/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/level3/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,12 +1,10 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it0103</groupId>
+ <groupId>org.apache.maven.its</groupId>
<artifactId>level1</artifactId>
<version>1</version>
</parent>
- <groupId>org.apache.maven.it0103</groupId>
<artifactId>level3</artifactId>
<version>1</version>
-
</project>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/level2/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,7 +1,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it0103</groupId>
+ <groupId>org.apache.maven.its</groupId>
<artifactId>level1</artifactId>
<version>1</version>
</parent>
Modified:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/pom.xml?view=diff&rev=466753&r1=466752&r2=466753
==============================================================================
---
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/pom.xml
(original)
+++
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0103/level1/pom.xml
Sun Oct 22 09:31:59 2006
@@ -1,8 +1,8 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.it0103</groupId>
- <artifactId>root</artifactId>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-it-it0103</artifactId>
<version>1</version>
</parent>
<artifactId>level1</artifactId>
