maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r739771 [7/10] - in /maven/components/branches/MNG-3932: ./ apache-maven/ apache-maven/src/ apache-maven/src/.cd/ apache-maven/src/bin/ apache-maven/src/conf/ apache-maven/src/main/ apache-maven/src/main/assembly/ apache-maven/src/site/ apa...
Date Sun, 01 Feb 2009 14:59:40 GMT
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,31 @@
+<project>
+  <parent>
+    <artifactId>p0</artifactId>
+    <groupId>maven-t10</groupId>
+    <version>1.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>maven-t10</groupId>
+  <artifactId>p1</artifactId>
+  <packaging>pom</packaging>
+  <name>p1</name>
+  <version>1.0</version>
+  <scm>
+    <url>scm-url</url>
+  </scm>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>maven-test</groupId>
+      <artifactId>t10-a</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>maven-test</groupId>
+      <artifactId>t10-c</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+  </dependencies>
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,27 @@
+
+<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.mercury</groupId>
+  <artifactId>mercury-parent</artifactId>
+  <version>1.0.0-alpha-3-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.5</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    </build>
+</project>

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,43 @@
+<project>
+
+<parent>
+  <artifactId>mercury-parent</artifactId>
+  <groupId>org.apache.maven.mercury</groupId>
+  <version>1.0.0-alpha-3-SNAPSHOT</version>
+</parent>
+
+<modelVersion>4.0.0</modelVersion>
+<groupId>org.apache.maven.mercury</groupId>
+<artifactId>mercury-util</artifactId>
+<name>Mercury Shared Utilities</name>
+<version>1.0.0-alpha-3-SNAPSHOT</version>
+ <build>
+  <pluginManagement>
+    <plugins>
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <version>1.0</version>
+      </plugin>
+      </plugins>
+  </pluginManagement>
+  <plugins>
+    <plugin>
+      <artifactId>maven-remote-resources-plugin</artifactId>
+      <version>1.0</version>
+      <executions>
+        <execution>
+          <id>default-execution-id</id> 
+          <goals>
+            <goal>process</goal>
+          </goals>
+          <configuration>
+            <resourceBundles>
+              <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+            </resourceBundles>
+          </configuration>
+        </execution>
+      </executions>
+    </plugin>
+     </plugins>
+</build>
+  </project>

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,34 @@
+<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>
+
+  <properties>
+    <plexus.version>1.0-beta-3.0.5-SNAPSHOT</plexus.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <version>${plexus.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,33 @@
+<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.nexus</groupId>
+		<artifactId>nexus-parent</artifactId>
+		<version>8-SNAPSHOT</version>
+		<relativePath>nexus-parent.xml</relativePath>
+	</parent>
+
+    <groupId>org.sonatype.nexus</groupId>
+	<artifactId>nexus</artifactId>
+	<packaging>pom</packaging>
+	<name>Nexus Repository Manager</name>
+	<version>1.3.0-SNAPSHOT</version>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-container-default</artifactId>
+				<scope>provided</scope>
+				<version>${plexus.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging-api</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+        </dependencies>
+	</dependencyManagement>
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +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">
+  <parent>
+    <groupId>org.sonatype.nexus</groupId>
+    <artifactId>nexus</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>nexus-proxy</artifactId>
+  <dependencies>
+    <!-- For App basic -->
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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.mng3838</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-3838</name> 
+  <description>
+    Verify that using the same dependency for different plugins doesn't blow up the project builder.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <dependencies>
+          <!-- NOTE: That's exactly the same dependency as for the other plugin. -->
+          <dependency>
+            <groupId>org.apache.maven.its.mng3838</groupId>
+            <artifactId>dep</artifactId>
+            <version>123</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-b</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <dependencies>
+          <!-- NOTE: That's exactly the same dependency as for the other plugin. -->
+          <dependency>
+            <groupId>org.apache.maven.its.mng3838</groupId>
+            <artifactId>dep</artifactId>
+            <version>123</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3821</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-3821</name> 
+  <description>
+    Verify that using the same id for executions/reportsets of different plugins doesn't blow up the project builder.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>the-one-and-only-id</id>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-b</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>the-one-and-only-id</id>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <reportSets>
+          <reportSet>
+            <id>the-one-and-only-id</id>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-b</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <reportSets>
+          <reportSet>
+            <id>the-one-and-only-id</id>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,40 @@
+<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>
+    <artifactId>nexus</artifactId>
+    <packaging>pom</packaging>
+    <name>Nexus Repository Manager</name>
+    <version>1.1-M1</version>
+
+    <!-- build information for the project -->
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <id>enforce</id>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>commons-logging:*</exclude>
+                                    </excludes>
+                                    <message>a</message>
+                                </bannedDependencies>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>*:plexus-component-api</exclude>
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,58 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.sonatype.nexus</groupId>
+    <artifactId>nexus</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.modello</groupId>
+                <artifactId>modello-maven-plugin</artifactId>
+                <version>1.0-alpha-21</version>
+                <executions>
+                    <execution>
+                        <id>nexus.xml</id>
+                        <goals>
+                            <goal>java</goal>
+                            <goal>xpp3-reader</goal>
+                            <goal>xpp3-writer</goal>
+                        </goals>
+                        <configuration>
+                            <version>1.0.8</version>
+                            <packagedVersions>
+                                <packagedVersion>1.0.0</packagedVersion>
+                                <packagedVersion>1.0.1</packagedVersion>
+                                <packagedVersion>1.0.6</packagedVersion>
+                            </packagedVersions>
+                            <model>src/main/mdo/nexus.xml</model>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>security.xml</id>
+                        <goals>
+                            <goal>java1</goal>
+                            <goal>xpp3-reader1</goal>
+                            <goal>xpp3-writer1</goal>
+                        </goals>
+                        <configuration>
+                            <version>1.0.0</version>
+                            <model>src/main/mdo/security.xml</model>
+                        </configuration>
+                    </execution>
+
+                </executions>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.modello</groupId>
+                    <artifactId>modello-maven-plugin</artifactId>
+                    <version>1.0-alpha-21</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/foo/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/foo/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/foo/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/foo/sub/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,418 @@
+<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.archetype</groupId>
+    <artifactId>maven-archetype</artifactId>
+    <version>2.0-alpha-1</version>
+  </parent>
+  -->
+  <artifactId>archetype-common</artifactId>
+  <name>Maven Archetype Common</name>
+  <packaging>jar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.jchardet</groupId>
+      <artifactId>jchardet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-plugin-testing-harness</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-velocity</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.cargo</groupId>
+      <artifactId>cargo-core-api-container</artifactId>
+      <version>0.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.cargo</groupId>
+      <artifactId>cargo-core-api-util</artifactId>
+      <version>0.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.cargo</groupId>
+      <artifactId>cargo-core-api-generic</artifactId>
+      <version>0.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.cargo</groupId>
+      <artifactId>cargo-core-api-module</artifactId>
+      <version>0.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.cargo</groupId>
+      <artifactId>cargo-core-container-jetty</artifactId>
+      <version>0.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-file</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-http</artifactId>
+      <version>1.0-beta-2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>archetype-repository</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>archetype-proxy</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-14</version>
+        <executions>
+          <execution>
+            <id>archetype-common</id>
+            <goals>
+              <goal>java</goal>
+              <goal>xsd</goal>
+              <goal>xpp3-reader</goal>
+              <goal>xpp3-writer</goal>
+            </goals>
+            <configuration>
+              <version>1.0.0</version>
+              <model>src/main/mdo/archetype-common.mdo</model>
+            </configuration>
+          </execution>
+          <execution>
+            <id>archetype-registry</id>
+            <goals>
+              <goal>java</goal>
+              <goal>xsd</goal>
+              <goal>xpp3-reader</goal>
+              <goal>xpp3-writer</goal>
+            </goals>
+            <configuration>
+              <version>1.0.0</version>
+              <model>src/main/mdo/archetype-registry.mdo</model>
+            </configuration>
+          </execution>
+          <execution>
+            <id>archetype-descriptor</id>
+            <goals>
+              <goal>java</goal>
+              <goal>xsd</goal>
+              <goal>xpp3-reader</goal>
+              <goal>xpp3-writer</goal>
+            </goals>
+            <configuration>
+              <version>1.0.0</version>
+              <model>src/main/mdo/archetype-descriptor.mdo</model>
+            </configuration>
+          </execution>
+          <execution>
+            <id>archetype-catalog</id>
+            <goals>
+              <goal>java</goal>
+              <goal>xsd</goal>
+              <goal>xpp3-reader</goal>
+              <goal>xpp3-writer</goal>
+            </goals>
+            <configuration>
+              <version>1.0.0</version>
+              <model>src/main/mdo/archetype-catalog.mdo</model>
+            </configuration>
+          </execution>
+          <execution>
+            <id>archetype-old</id>
+            <goals>
+              <goal>java</goal>
+              <goal>xsd</goal>
+              <goal>xpp3-reader</goal>
+              <goal>xpp3-writer</goal>
+            </goals>
+            <configuration>
+              <version>1.0.0</version>
+              <model>src/main/mdo/archetype.mdo</model>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/wars</outputDirectory>
+              <overWriteReleases>true</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <includeTypes>war</includeTypes>
+              <stripVersion>true</stripVersion>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant-antlr</artifactId>
+            <version>1.6.5</version>
+          </dependency>
+        </dependencies>
+
+        <executions>
+          <execution>
+            <id>archetype-test</id>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <tasks>
+                <property name="test.projects.name" value="basic" />
+                <property name="test.projects.version" value="1.0" />
+                <property name="test.projects.archetype" value="${test.projects.name}-${test.projects.version}" />
+                <property name="test.projects.source.directory" value="${test.projects.archetype}" />
+                <property name="test.projects.target.directory" value="archetypes/${test.projects.name}/${test.projects.version}" />
+                <property name="test.projects.repository" value="repositories/central" />
+
+                <mkdir dir="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/" />
+
+                <jar destfile="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/${test.projects.archetype}.jar" basedir="${basedir}/src/test/archetypes/${test.projects.source.directory}/" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+
+          <execution>
+            <id>archetype-test-partial</id>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <tasks>
+                <property name="test.projects.name" value="partial" />
+                <property name="test.projects.version" value="1.0" />
+                <property name="test.projects.archetype" value="${test.projects.name}-${test.projects.version}" />
+                <property name="test.projects.source.directory" value="${test.projects.archetype}" />
+                <property name="test.projects.target.directory" value="archetypes/${test.projects.name}/${test.projects.version}" />
+                <property name="test.projects.repository" value="repositories/central" />
+                <mkdir dir="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/" />
+
+                <jar destfile="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/${test.projects.archetype}.jar" basedir="${basedir}/src/test/archetypes/${test.projects.source.directory}/" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+
+          <execution>
+            <id>archetype-test-site</id>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <tasks>
+                <property name="test.projects.name" value="site" />
+                <property name="test.projects.version" value="1.0" />
+                <property name="test.projects.archetype" value="${test.projects.name}-${test.projects.version}" />
+                <property name="test.projects.source.directory" value="${test.projects.archetype}" />
+                <property name="test.projects.target.directory" value="archetypes/${test.projects.name}/${test.projects.version}" />
+                <property name="test.projects.repository" value="repositories/central" />
+
+                <mkdir dir="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/" />
+
+                <jar destfile="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/${test.projects.archetype}.jar" basedir="${basedir}/src/test/archetypes/${test.projects.source.directory}/" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+
+          <execution>
+            <id>archetype-test-old</id>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <tasks>
+                <property name="test.projects.name" value="old" />
+                <property name="test.projects.version" value="1.0" />
+                <property name="test.projects.archetype" value="${test.projects.name}-${test.projects.version}" />
+                <property name="test.projects.source.directory" value="${test.projects.archetype}" />
+                <property name="test.projects.target.directory" value="archetypes/${test.projects.name}/${test.projects.version}" />
+                <property name="test.projects.repository" value="repositories/central" />
+
+                <mkdir dir="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/" />
+
+                <jar destfile="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/${test.projects.archetype}.jar" basedir="${basedir}/src/test/archetypes/${test.projects.source.directory}/" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+
+          <execution>
+            <id>archetype-test-fileset</id>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <tasks>
+                <property name="test.projects.name" value="fileset" />
+                <property name="test.projects.version" value="1.0" />
+                <property name="test.projects.archetype" value="${test.projects.name}-${test.projects.version}" />
+                <property name="test.projects.source.directory" value="${test.projects.archetype}" />
+                <property name="test.projects.target.directory" value="archetypes/${test.projects.name}/${test.projects.version}" />
+                <property name="test.projects.repository" value="repositories/central" />
+
+                <mkdir dir="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/" />
+
+                <jar destfile="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}/${test.projects.archetype}.jar" basedir="${basedir}/src/test/archetypes/${test.projects.source.directory}/" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+
+          <execution>
+            <id>repository-metadata</id>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <tasks>
+                <property name="test.projects.source.directory" value="${test.projects.archetype}" />
+                <property name="test.projects.target.directory" value="archetypes" />
+                <property name="test.projects.repository" value="repositories/central" />
+
+                <mkdir dir="${basedir}/target/test-classes/${test.projects.repository}/${test.projects.target.directory}" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+              <excludes>
+                  <exclude>**/ArchetyperRoundtripTest.java</exclude>
+                  <exclude>**/ArchetyperRoundtripWithProxyTest.java</exclude>
+                  <exclude>**/DefaultRepositoryCrawlerTest.java</exclude>
+              </excludes>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+      <profile>
+          <id>internal-catalog</id>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-surefire-plugin</artifactId>
+                      <configuration>
+                          <includes>
+                              <include>**/*Verification.java</include>
+                          </includes>
+                      </configuration>
+                  </plugin>
+              </plugins>
+          </build>
+      </profile>
+  </profiles>
+</project>
\ No newline at end of file

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3833</groupId>
+  <artifactId>coreit</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3833</name> 
+  <description>
+    Test that POM interpolation fully interpolates all properties in data flow chain, i.e. where property
+    A depends on property B, and property B depends on property C and so on.
+  </description>
+
+  <properties>
+    <!--
+    NOTE: Both the ordering (i.e. neither ascending nor descending) and the number of properties is crucial to
+    exhibit the bug.
+    -->
+    <property23>${property22}</property23>
+    <property21>${property20}</property21>
+    <property19>${property18}</property19>
+    <property17>${property16}</property17>
+    <property15>${property14}</property15>
+    <property13>${property12}</property13>
+    <property11>${property10}</property11>
+    <property09>${property08}</property09>
+    <property07>${property06}</property07>
+    <property05>${property04}</property05>
+    <property03>${property02}</property03>
+    <property01>${property00}</property01>
+    <property00>PASSED</property00>
+    <property02>${property01}</property02>
+    <property04>${property03}</property04>
+    <property06>${property05}</property06>
+    <property10>${property09}</property10>
+    <property12>${property11}</property12>
+    <property08>${property07}</property08>
+    <property14>${property13}</property14>
+    <property16>${property15}</property16>
+    <property18>${property17}</property18>
+    <property20>${property19}</property20>
+    <property22>${property21}</property22>
+  </properties>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3979</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3979</name> 
+  <description>
+    Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
+    POM has a non-empty element and the child POM has an empty element to join.
+  </description>
+
+  <properties>
+    <prop0>test</prop0>
+  </properties>
+
+  <repositories>
+    <repository>
+      <id>equal-repo-id</id>
+      <url>http://maven.apache.org/null</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <checksumPolicy>ignore</checksumPolicy>
+      </releases>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>equal-build-exec-id</id>
+            <phase>initialize</phase>
+            <goals>
+              <goal>reset</goal>
+            </goals>
+            <configuration>
+              <logFile>target/exec.log</logFile>
+              <string>test</string>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <reportSets>
+          <reportSet>
+            <id>equal-report-exec-id</id>
+            <reports>
+              <report>reset</report>
+            </reports>
+            <configuration>
+              <logFile>target/exec.log</logFile>
+              <string>test</string>
+            </configuration>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3979</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3979</name> 
+  <description>
+    Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
+    POM has a non-empty element and the child POM has an empty element to join.
+  </description>
+
+  <properties/>
+
+  <repositories>
+    <repository>
+      <id>equal-repo-id</id>
+      <url>file:///${basedir}/null</url>
+      <snapshots/>
+      <releases/>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>equal-build-exec-id</id>
+            <phase>initialize</phase>
+            <goals/>
+            <configuration/>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <reportSets>
+          <reportSet>
+            <id>equal-report-exec-id</id>
+            <reports/>
+            <configuration/>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>mng3984</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>MNG-3984</name>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-b</artifactId>
+          <version>1.0-SNAPSHOT</version>
+            <executions>
+              <execution>
+                <id>foo</id>
+                <goals>
+                  <goal>a</goal>
+                </goals>
+              </execution>
+            </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0-SNAPSHOT</version>
+            <executions>
+              <execution>
+                <id>foo</id>
+                <goals>
+                  <goal>b</goal>
+                </goals>
+              </execution>
+            </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3845</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <organization>
+    <name>child-org</name>
+  </organization>
+
+  <scm>
+    <developerConnection>https://child.url/scm</developerConnection>
+  </scm>
+  <issueManagement>
+    <url>http://child.url/issues</url>
+  </issueManagement>
+  <ciManagement>
+    <system>child-ci</system>
+    <url>http://child.url/ci</url>
+  </ciManagement>
+  <distributionManagement>
+    <repository>
+      <id>child-distros</id>
+      <url>ssh://child.url/distros</url>
+    </repository>
+    <snapshotRepository>
+      <id>child-snaps</id>
+      <url>ssh://child.url/snaps</url>
+    </snapshotRepository>
+    <site>
+      <id>child-site</id>
+      <url>scp://child.url/site</url>
+    </site>
+  </distributionManagement>
+</project>

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3845</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3845</name> 
+  <description>
+    Test that inheritance is all-or-nothing for certain sub-trees of the POM.
+  </description>
+
+  <organization>
+    <name>parent-org</name>
+    <url>http://parent.url/org</url>
+  </organization>
+
+  <scm>
+    <url>http://parent.url/viewvc</url>
+    <connection>http://parent.url/scm</connection>
+    <developerConnection>https://parent.url/scm</developerConnection>
+    <tag>parent-tag</tag>
+  </scm>
+  <issueManagement>
+    <system>parent-issues</system>
+    <url>http://parent.url/issues</url>
+  </issueManagement>
+  <ciManagement>
+    <system>parent-ci</system>
+    <url>http://parent.url/ci</url>
+    <notifiers>
+      <notifier>
+        <type>irc</type>
+        <sendOnError>true</sendOnError>
+        <sendOnFailure>true</sendOnFailure>
+        <sendOnSuccess>false</sendOnSuccess>
+        <sendOnWarning>false</sendOnWarning>
+        <configuration>
+          <address>irc://parent.url/#ci</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <distributionManagement>
+    <repository>
+      <id>parent-distros</id>
+      <name>parent-distros</name>
+      <url>ssh://parent.url/distros</url>
+      <uniqueVersion>false</uniqueVersion>
+      <layout>legacy</layout>
+    </repository>
+    <snapshotRepository>
+      <id>parent-snaps</id>
+      <name>parent-snaps</name>
+      <url>ssh://parent.url/snaps</url>
+      <uniqueVersion>false</uniqueVersion>
+      <layout>legacy</layout>
+    </snapshotRepository>
+    <site>
+      <id>parent-site</id>
+      <name>parent-site</name>
+      <url>scp://parent.url/site</url>
+    </site>
+  </distributionManagement>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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.mng4008</groupId>
+  <artifactId>parent</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-4008</name> 
+  <description>
+    Verify that filter definitions are properly merged.
+  </description>
+
+  <build>
+    <filters>
+      <!-- NOTE: The first filter is deliberately defined by the child as well, so should not be added twice -->
+      <filter>src/main/filters/child-a.properties</filter>
+      <filter>src/main/filters/parent-c.properties</filter>
+      <filter>src/main/filters/parent-b.properties</filter>
+      <filter>src/main/filters/parent-d.properties</filter>
+    </filters>
+  </build>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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.mng4008</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0</version>
+  </parent>
+
+  <groupId>org.apache.maven.its.mng4008</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-4008</name> 
+  <description>
+    Verify that filter definitions are properly merged.
+  </description>
+
+  <build>
+    <filters>
+      <filter>src/main/filters/child-a.properties</filter>
+      <filter>src/main/filters/child-c.properties</filter>
+      <filter>src/main/filters/child-b.properties</filter>
+      <filter>src/main/filters/child-d.properties</filter>
+    </filters>
+  </build>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3906</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3906</name> 
+  <description>
+    Test that project-level plugin dependencies are properly merged during inheritance.
+  </description>
+
+  <build>
+  	<!-- NOTE: This parent uses plugin management -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-class-loader</artifactId>
+          <version>2.1-SNAPSHOT</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.its.mng3906</groupId>
+              <artifactId>e</artifactId>
+              <version>1</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.its.mng3906</groupId>
+              <artifactId>a</artifactId>
+              <version>1</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.its.mng3906</groupId>
+              <artifactId>d</artifactId>
+              <version>1</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3906</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3906</name> 
+  <description>
+    Test that project-level plugin dependencies are properly merged during inheritance.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-class-loader</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.its.mng3906</groupId>
+            <artifactId>c</artifactId>
+            <version>1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.maven.its.mng3906</groupId>
+            <artifactId>a</artifactId>
+            <version>2</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.maven.its.mng3906</groupId>
+            <artifactId>b</artifactId>
+            <version>1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3906</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3906</name> 
+  <description>
+    Test that project-level plugin dependencies are properly merged during inheritance.
+  </description>
+
+  <build>
+    <!-- NOTE: This parent does not use plugin management -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-class-loader</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.its.mng3906</groupId>
+            <artifactId>e</artifactId>
+            <version>1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.maven.its.mng3906</groupId>
+            <artifactId>a</artifactId>
+            <version>1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.maven.its.mng3906</groupId>
+            <artifactId>d</artifactId>
+            <version>1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml Sun Feb  1 14:59:32 2009
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3906</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3906</name> 
+  <description>
+    Test that project-level plugin dependencies are properly merged during inheritance.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-class-loader</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.its.mng3906</groupId>
+            <artifactId>c</artifactId>
+            <version>1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.maven.its.mng3906</groupId>
+            <artifactId>a</artifactId>
+            <version>2</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.maven.its.mng3906</groupId>
+            <artifactId>b</artifactId>
+            <version>1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%



Mime
View raw message