Author: bentmann
Date: Wed Aug 5 21:42:06 2009
New Revision: 801423
URL: http://svn.apache.org/viewvc?rev=801423&view=rev
Log:
o Fixed invalid test POMs
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml
maven/components/trunk/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml
maven/components/trunk/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml
Wed Aug 5 21:42:06 2009
@@ -3,6 +3,7 @@
<artifactId>p0</artifactId>
<groupId>maven</groupId>
<version>1.0</version>
+ <packaging>pom</packaging>
<dependencies>
<dependency>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml
Wed Aug 5 21:42:06 2009
@@ -4,6 +4,7 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-parent</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
+ <packaging>pom</packaging>
<build>
<plugins>
<plugin>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml
Wed Aug 5 21:42:06 2009
@@ -1,15 +1,10 @@
<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.sonatype.forge</groupId>
- <artifactId>forge-parent</artifactId>
- <version>3</version>
- </parent>
- -->
+
<groupId>org.sonatype.nexus</groupId>
<artifactId>nexus-parent</artifactId>
<version>8-SNAPSHOT</version>
+ <packaging>pom</packaging>
<properties>
<plexus.version>1.0-beta-3.0.5-SNAPSHOT</plexus.version>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml
Wed Aug 5 21:42:06 2009
@@ -25,6 +25,7 @@
<groupId>mng3984</groupId>
<artifactId>test-1</artifactId>
<version>0.1</version>
+ <packaging>pom</packaging>
<name>MNG-3984</name>
<repositories>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml
Wed Aug 5 21:42:06 2009
@@ -2,5 +2,6 @@
<groupId>gid</groupId>
<artifactId>child-3</artifactId>
<version>1.0</version>
+ <packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
</project>
\ No newline at end of file
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml
Wed Aug 5 21:42:06 2009
@@ -7,4 +7,5 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>child-2</artifactId>
+ <packaging>pom</packaging>
</project>
\ No newline at end of file
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml
Wed Aug 5 21:42:06 2009
@@ -3,6 +3,7 @@
<groupId>org.sonatype.nexus</groupId>
<artifactId>nexus</artifactId>
<version>1.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<build>
<plugins>
<plugin>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
Wed Aug 5 21:42:06 2009
@@ -3,6 +3,7 @@
<groupId>gid</groupId>
<artifactId>aid</artifactId>
<version>1.0</version>
+ <packaging>pom</packaging>
<build>
<plugins>
<plugin>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml
Wed Aug 5 21:42:06 2009
@@ -3,6 +3,7 @@
<groupId>gid</groupId>
<artifactId>aid</artifactId>
<version>1.0</version>
+ <packaging>pom</packaging>
<build>
<pluginManagement>
<plugins>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
Wed Aug 5 21:42:06 2009
@@ -22,6 +22,7 @@
<groupId>gid</groupId>
<artifactId>aid</artifactId>
<version>1.0</version>
+ <packaging>pom</packaging>
<build>
<pluginManagement>
<plugins>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml
Wed Aug 5 21:42:06 2009
@@ -4,6 +4,7 @@
<groupId>org.sonatype.nexus</groupId>
<artifactId>nexus-parent</artifactId>
<version>8-SNAPSHOT</version>
+ <packaging>pom</packaging>
<build>
<pluginManagement>
<plugins>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml
Wed Aug 5 21:42:06 2009
@@ -3,6 +3,7 @@
<groupId>org.sonatype.nexus</groupId>
<artifactId>nexus</artifactId>
<version>1.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<build>
<pluginManagement>
<plugins>
Modified:
maven/components/trunk/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml
Wed Aug 5 21:42:06 2009
@@ -5,6 +5,7 @@
<groupId>org.apache.maven.its</groupId>
<artifactId>test-parent</artifactId>
<version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<properties>
<pomProfile>parent</pomProfile>
</properties>
Modified:
maven/components/trunk/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml?rev=801423&r1=801422&r2=801423&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
(original)
+++
maven/components/trunk/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
Wed Aug 5 21:42:06 2009
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>maven.t02</groupId>
<artifactId>p4</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>p4</name>
<version>1.0</version>
</project>