You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/04/29 07:20:55 UTC

svn commit: r769664 [4/9] - in /maven/components/branches/MNG-2766/maven-core/src/test: resources-project-builder/ resources-project-builder/basedir-aligned-interpolation/ resources-project-builder/basedir-interpolation/ resources-project-builder/baseu...

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,71 @@
+<?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.mng3925</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3925</name> 
+  <description>
+    Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with
+    parent executions.
+  </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>child-1</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>child-1</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>child-2</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>child-2</goal>
+            </goals>
+          </execution>
+          <execution>
+            <!-- NOTE: <id> deliberately omitted to use default value -->
+            <phase>validate</phase>
+            <goals>
+              <goal>child-default</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/micromailer/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/micromailer/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/micromailer/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/micromailer/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,124 @@
+<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.spice</groupId>
+		<artifactId>spice-parent</artifactId>
+		<version>11</version>
+        <relativePath>spice-parent-9.pom</relativePath>
+	</parent>
+
+	<groupId>org.sonatype.micromailer</groupId>
+	<artifactId>micromailer</artifactId>
+	<version>1.0.3</version>
+	<packaging>jar</packaging>
+	<name>Micro Mailer</name>
+	<!-- SCM -->
+	<scm>
+		<connection>scm:svn:http://svn.sonatype.org/spice/trunk/micromailer</connection>
+		<url>http://svn.sonatype.org/spice/trunk/micromailer</url>
+		<developerConnection>scm:svn:https://svn.sonatype.org/spice/trunk/micromailer</developerConnection>
+	</scm>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-container-default</artifactId>
+			<version>1.0-alpha-47</version>
+			<type>jar</type>
+			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>1.5.5</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+
+		<!-- Mail composition -->
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-velocity</artifactId>
+			<version>1.1.7</version>
+			<type>jar</type>
+			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-component-api</artifactId>
+				</exclusion>
+                <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+			</exclusions>
+		</dependency>
+        
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.5</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+
+		<!-- Mail sending -->
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+
+		<!-- Testing -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+			<type>jar</type>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-maven-plugin</artifactId>
+				<version>1.3.8</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>child-descriptor</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom Wed Apr 29 05:20:38 2009
@@ -0,0 +1,103 @@
+<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.sonatype.spice</groupId>
+	<artifactId>spice-parent</artifactId>
+	<version>11</version>
+	<packaging>pom</packaging>
+	<name>Sonatype Spice Components</name>
+
+	<scm>
+		<connection>scm:svn:http://svn.sonatype.org/spice/trunk/spice-parent</connection>
+		<url>http://svn.sonatype.org/spice/trunk/spice-parent</url>
+		<developerConnection>scm:svn:https://svn.sonatype.org/spice/trunk/spice-parent</developerConnection>
+	</scm>
+
+	<properties>
+    <!-- 2008.12.07 Oleg: reverted to 6.1.12 as http transport only works with that version
+     | Please always sync with mercury-http-transport !!
+     -->
+		<jetty.version>6.1.12</jetty.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-container-default</artifactId>
+				<version>1.0-beta-1</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>log4j</groupId>
+						<artifactId>log4j</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-component-annotations</artifactId>
+				<version>1.0-beta-1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-utils</artifactId>
+				<version>1.5.5</version>
+			</dependency>
+			<dependency>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>jetty</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>jetty-client</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.5</version>
+                <scope>test</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-component-metadata</artifactId>
+					<version>1.0-beta-1</version>
+					<executions>
+						<execution>
+							<id>process-classes</id>
+							<goals>
+								<goal>generate-metadata</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-maven-plugin</artifactId>
+					<version>1.3.8</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>descriptor</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-filters/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-filters/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-filters/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-filters/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,17 @@
+<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>a</groupId>
+  <artifactId>b</artifactId>
+  <version>1.0</version>
+
+    <build>
+        <filters>
+            <filter>src/main/filters/a.properties</filter>
+            <filter>src/main/filters/c.properties</filter>
+            <filter>src/main/filters/b.properties</filter>
+            <filter>src/main/filters/d.properties</filter>
+        </filters>
+    </build>
+
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,43 @@
+<?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-1</artifactId>
+    <version>0.1</version>
+
+    <name>MNG-3984</name>
+   <repositories>
+     <repository>
+       <id>central-parent</id>
+       <name>Maven Repository Switchboard</name>
+       <layout>default</layout>
+       <url>http://repo1.maven.org/maven2</url>
+       <snapshots>
+         <enabled>false</enabled>
+       </snapshots>
+     </repository>
+   </repositories>
+
+
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,45 @@
+<?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>mng3984</groupId>
+    <artifactId>test-1</artifactId>
+    <version>0.1</version>
+   </parent>
+   <groupId>mng3984</groupId>
+   <artifactId>test-2</artifactId>
+   <version>0.1</version>
+
+   <name>MNG-3984</name>
+  <repositories>
+    <repository>
+      <id>central-child</id>
+      <name>Maven Repository Switchboard</name>
+      <layout>default</layout>
+      <url>http://repo1.maven.org/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,55 @@
+<?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.mng3904</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3904</name> 
+  <description>
+    Test that properties which refer to build directories which in turn refer to other build directories are
+    properly interpolated.
+  </description>
+
+  <properties>
+    <!-- These are the properties of interest -->
+    <dir0>${project.build.outputDirectory}/dir0</dir0>
+    <dir1>${project.build.testSourceDirectory}/dir1</dir1>
+    <dir2>${project.reporting.outputDirectory}/dir2</dir2>
+  </properties>
+
+  <build>
+    <!-- Test properties which finally refer to ${project.basedir} -->
+    <directory>${project.basedir}/target</directory>
+    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+    <!-- Test properties which finally refer to ${basedir} -->
+    <sourceDirectory>${basedir}/src</sourceDirectory>
+    <testSourceDirectory>${project.build.sourceDirectory}/test</testSourceDirectory>
+  </build>
+
+  <reporting>
+    <outputDirectory>${project.build.directory}/site</outputDirectory>
+  </reporting>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,6 @@
+<project>
+    <groupId>gid</groupId>
+    <artifactId>child-3</artifactId>
+    <version>1.0</version>
+    <modelVersion>4.0.0</modelVersion>
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,10 @@
+<project>
+  <parent>
+    <groupId>gid</groupId>
+    <artifactId>child-3</artifactId>
+    <version>1.0</version>
+    <relativePath>child3.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>child-2</artifactId>
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,9 @@
+<project>
+  <parent>
+    <groupId>gid</groupId>
+    <artifactId>child-2</artifactId>
+    <version>1.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>child-1</artifactId>
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,15 @@
+<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>${project.version}</version>
+            </plugin>
+        </plugins>
+	</build>
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,9 @@
+<project>
+    <parent>
+        <groupId>org.sonatype.nexus</groupId>
+        <artifactId>nexus</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+	<modelVersion>4.0.0</modelVersion>
+    <artifactId>a</artifactId>
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,40 @@
+<?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.mng3877</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3877</name> 
+  <description>
+    Verify that paths to project directories use the platform-specific file separator.
+  </description>
+
+  <build>
+    <filters>
+      <filter>src/main/filters/it.properties</filter>
+    </filters>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,80 @@
+<?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.mng2591</groupId>
+  <artifactId>parent</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-2591</name> 
+  <description>
+    Test aggregation of list configuration items for build plugins when using
+    'combine.children=append' attribute.
+  </description>
+
+  <modules>
+    <module>subproject</module>
+  </modules>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <!-- inherit via <pluginManagement> -->
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-configuration</artifactId>
+          <version>2.1-SNAPSHOT</version>
+          <inherited>true</inherited>
+          <configuration>
+            <listParam>
+              <!-- NOTE: These values are deliberately not in alpha order! -->
+              <listParam>PARENT-1</listParam>
+              <listParam>PARENT-3</listParam>
+              <listParam>PARENT-2</listParam>
+              <listParam>PARENT-4</listParam>
+            </listParam>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <!-- inherit not via <pluginManagement> -->
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <inherited>true</inherited>
+        <configuration>
+          <stringParams>
+            <!-- NOTE: These values are deliberately not in alpha order! -->
+            <stringParam>PARENT-1</stringParam>
+            <stringParam>PARENT-3</stringParam>
+            <stringParam>PARENT-2</stringParam>
+            <stringParam>PARENT-4</stringParam>
+          </stringParams>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,70 @@
+<?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.mng2591</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0</version>
+  </parent>
+
+  <artifactId>subproject</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <propertiesFile>target/config.properties</propertiesFile>
+          <stringParams combine.children="append">
+            <!-- NOTE: These values are deliberately not in alpha order! -->
+            <stringParam>CHILD-1</stringParam>
+            <stringParam>CHILD-3</stringParam>
+            <stringParam>CHILD-2</stringParam>
+            <stringParam>CHILD-4</stringParam>
+          </stringParams>
+          <listParam combine.children="append">
+            <!-- NOTE: These values are deliberately not in alpha order! -->
+            <listParam>CHILD-1</listParam>
+            <listParam>CHILD-3</listParam>
+            <listParam>CHILD-2</listParam>
+            <listParam>CHILD-4</listParam>
+          </listParam>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>config</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,90 @@
+<?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.mng2591</groupId>
+  <artifactId>parent</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-2591</name> 
+  <description>
+    Test aggregation of list configuration items for build plugins when using
+    'combine.children=append' attribute.
+  </description>
+
+  <modules>
+    <module>subproject</module>
+  </modules>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <!-- inherit via <pluginManagement> -->
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-configuration</artifactId>
+          <version>2.1-SNAPSHOT</version>
+          <inherited>true</inherited>
+          <configuration>
+            <listParam>
+              <!-- NOTE: These values are deliberately not in alpha order! -->
+              <listParam>PARENT-1</listParam>
+              <listParam>PARENT-3</listParam>
+              <listParam>PARENT-2</listParam>
+              <listParam>PARENT-4</listParam>
+            </listParam>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <!-- inherit not via <pluginManagement> -->
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <inherited>true</inherited>
+        <configuration>
+          <stringParams>
+            <!-- NOTE: These values are deliberately not in alpha order! -->
+            <stringParam>PARENT-1</stringParam>
+            <stringParam>PARENT-3</stringParam>
+            <stringParam>PARENT-2</stringParam>
+            <stringParam>PARENT-4</stringParam>
+          </stringParams>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <!-- an active but empty profile to ensure profile injection does not interfere with plugin configuration -->
+      <id>parent</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+  </profiles>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,80 @@
+<?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.mng2591</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0</version>
+  </parent>
+
+  <artifactId>subproject</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <propertiesFile>target/config.properties</propertiesFile>
+          <stringParams combine.children="append">
+            <!-- NOTE: These values are deliberately not in alpha order! -->
+            <stringParam>CHILD-1</stringParam>
+            <stringParam>CHILD-3</stringParam>
+            <stringParam>CHILD-2</stringParam>
+            <stringParam>CHILD-4</stringParam>
+          </stringParams>
+          <listParam combine.children="append">
+            <!-- NOTE: These values are deliberately not in alpha order! -->
+            <listParam>CHILD-1</listParam>
+            <listParam>CHILD-3</listParam>
+            <listParam>CHILD-2</listParam>
+            <listParam>CHILD-4</listParam>
+          </listParam>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>config</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <!-- an active but empty profile to ensure profile injection does not interfere with plugin configuration -->
+      <id>child</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+  </profiles>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml Wed Apr 29 05:20:38 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.mng4053</groupId>
+  <artifactId>test2</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-4053</name> 
+  <description>
+    Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
+    plugin management is used.
+  </description>
+
+  <build>
+    <!-- NOTE: This test used plugin management for the IT plugin -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-configuration</artifactId>
+          <version>2.1-SNAPSHOT</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <propertiesFile>target/config.properties</propertiesFile>
+          <domParam>
+            <copy todir="src" overwrite="true">
+              <fileset dir="target"/>
+            </copy>
+          </domParam>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,74 @@
+<?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.mng4053</groupId>
+  <artifactId>test3</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-4053</name> 
+  <description>
+    Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
+    plugin management and a profile are used.
+  </description>
+
+  <build>
+    <!-- NOTE: This test used plugin management for the IT plugin -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-configuration</artifactId>
+          <version>2.1-SNAPSHOT</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <profiles>
+    <profile>
+      <!-- NOTE: This test injects the plugin configuration via a profile -->
+      <id>maven-core-it</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.its.plugins</groupId>
+            <artifactId>maven-it-plugin-configuration</artifactId>
+            <version>2.1-SNAPSHOT</version>
+            <configuration>
+              <propertiesFile>target/config.properties</propertiesFile>
+              <domParam>
+                <copy todir="src" overwrite="true">
+                  <fileset dir="target"/>
+                </copy>
+              </domParam>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,53 @@
+<?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.mng4053</groupId>
+  <artifactId>test1</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-4053</name> 
+  <description>
+    Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
+    no plugin management is used.
+  </description>
+
+  <build>
+    <!-- NOTE: This test does not use plugin management for the IT plugin -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <propertiesFile>target/config.properties</propertiesFile>
+          <domParam>
+            <copy todir="src" overwrite="true">
+              <fileset dir="target"/>
+            </copy>
+          </domParam>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,76 @@
+<?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.mng3836</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.maven.its.mng3836</groupId>
+  <artifactId>child</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-3836</name> 
+  <description>
+    Verify that children can *override* inherited plugin configuration.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <!--
+          All of these values should override the ones inherited from the parent. In particular, collections should not
+          be merged with the values given by the parent POM.
+          -->
+          <propertiesFile>PASSED</propertiesFile>
+          <stringParams>
+            <stringParam>PASSED-1</stringParam>
+            <stringParam>PASSED-3</stringParam>
+            <stringParam>PASSED-2</stringParam>
+            <stringParam>PASSED-4</stringParam>
+          </stringParams>
+          <listParam>
+            <listParam>PASSED-1</listParam>
+            <listParam>PASSED-3</listParam>
+            <listParam>PASSED-2</listParam>
+            <listParam>PASSED-4</listParam>
+          </listParam>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>config</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,72 @@
+<?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.mng3836</groupId>
+  <artifactId>parent</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3836</name> 
+  <description>
+    Verify that children can *override* inherited plugin configuration.
+  </description>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-configuration</artifactId>
+          <version>2.1-SNAPSHOT</version>
+          <configuration>
+            <propertiesFile>FAILED</propertiesFile>
+            <stringParams>
+              <stringParam>FAILED-1</stringParam>
+              <stringParam>FAILED-3</stringParam>
+              <stringParam>FAILED-2</stringParam>
+              <stringParam>FAILED-4</stringParam>
+            </stringParams>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <propertiesFile>FAILED</propertiesFile>
+          <listParam>
+            <listParam>FAILED-1</listParam>
+            <listParam>FAILED-3</listParam>
+            <listParam>FAILED-2</listParam>
+            <listParam>FAILED-4</listParam>
+          </listParam>
+          <parent>PASSED</parent>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,68 @@
+<?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.mng3827</groupId>
+  <artifactId>test2</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-3827</name> 
+  <description>
+    Verify that plain plugin configuration works correctly.
+  </description>
+
+  <build>
+    <!-- This project uses plugin management for the test plugin -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-configuration</artifactId>
+          <version>2.1-SNAPSHOT</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <configuration>
+          <stringParams>
+            <stringParam>one</stringParam>
+            <stringParam>two</stringParam>
+            <stringParam>three</stringParam>
+            <stringParam>four</stringParam>
+          </stringParams>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>config</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,59 @@
+<?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.mng3827</groupId>
+  <artifactId>test1</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-3827</name> 
+  <description>
+    Verify that plain plugin configuration works correctly.
+  </description>
+
+  <build>
+    <!-- This project does not use plugin management for the test plugin -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <configuration>
+          <stringParams>
+            <stringParam>one</stringParam>
+            <stringParam>two</stringParam>
+            <stringParam>three</stringParam>
+            <stringParam>four</stringParam>
+          </stringParams>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>config</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,30 @@
+<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>a</groupId>
+    <artifactId>b</artifactId>
+    <version>1.0</version>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <version>2.4</version>
+                  <configuration>
+                    <systemProperties>
+                      <property>
+                        <name>my.property</name>
+                        <value>my.value</value>
+                      </property>
+                    </systemProperties>
+                  </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
\ No newline at end of file

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,78 @@
+<?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.mng3827</groupId>
+  <artifactId>test2</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-3864</name> 
+  <description>
+    Verify that plain per-execution plugin configuration works correctly.
+  </description>
+
+  <build>
+    <!-- This project uses plugin management for the test plugin -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-configuration</artifactId>
+          <version>2.1-SNAPSHOT</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>config</goal>
+            </goals>
+            <configuration>
+              <stringParams>
+                <stringParam>one</stringParam>
+                <stringParam>two</stringParam>
+                <stringParam>three</stringParam>
+                <stringParam>four</stringParam>
+              </stringParams>
+              <propertiesParam>
+                <property>
+                  <name>key1</name>
+                  <value>value1</value>
+                </property>
+                <property>
+                  <name>key2</name>
+                  <value>value2</value>
+                </property>
+              </propertiesParam>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,69 @@
+<?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.mng3827</groupId>
+  <artifactId>test1</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-3864</name> 
+  <description>
+    Verify that plain per-execution plugin configuration works correctly.
+  </description>
+
+  <build>
+    <!-- This project does not use plugin management for the test plugin -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-configuration</artifactId>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>config</goal>
+            </goals>
+            <configuration>
+              <stringParams>
+                <stringParam>one</stringParam>
+                <stringParam>two</stringParam>
+                <stringParam>three</stringParam>
+                <stringParam>four</stringParam>
+              </stringParams>
+              <propertiesParam>
+                <property>
+                  <name>key1</name>
+                  <value>value1</value>
+                </property>
+                <property>
+                  <name>key2</name>
+                  <value>value2</value>
+                </property>
+              </propertiesParam>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml Wed Apr 29 05:20:38 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.mng3886</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3886</name> 
+  <description>
+    Test that the goals from a plugin execution are executed in the order given by the POM, regardless whether
+    plugin management is present or not.
+  </description>
+
+  <build>
+    <!-- This project uses plugin management for the test plugin -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-a</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </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>
+            <goals>
+              <goal>b</goal>
+              <goal>a</goal>
+              <goal>d</goal>
+              <goal>c</goal>
+              <goal>e</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,57 @@
+<?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.mng3886</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3886</name> 
+  <description>
+    Test that the goals from a plugin execution are executed in the order given by the POM, regardless whether
+    plugin management is present or not.
+  </description>
+
+  <build>
+    <!-- This project does not use plugin management for the test plugin -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>b</goal>
+              <goal>a</goal>
+              <goal>d</goal>
+              <goal>c</goal>
+              <goal>e</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,56 @@
+<?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.mng3916</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3943</name>
+  <description>
+    Test that plugin executions are properly merged during inheritance, even if the child uses a different
+    plugin version than the parent.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <!-- NOTE: Use different version than child -->
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <id>parent-1</id>
+            <phase>parent-1</phase>
+          </execution>
+          <execution>
+            <id>parent-2</id>
+            <phase>parent-2</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,59 @@
+<?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.mng3916</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3943</name>
+  <description>
+    Test that plugin executions are properly merged during inheritance, even if the child uses a different
+    plugin version than the parent.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <!-- NOTE: Use different version than parent -->
+        <version>2.0</version>
+        <executions>
+          <execution>
+            <id>child-1</id>
+            <phase>child-1</phase>
+          </execution>
+          <execution>
+            <id>child-2</id>
+            <phase>child-2</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,55 @@
+<?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.mng3916</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3916</name> 
+  <description>
+    Test that plugin executions are properly merged during inheritance, even if the child plugin section has no
+    version.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <id>parent-1</id>
+            <phase>parent-1</phase>
+          </execution>
+          <execution>
+            <id>parent-2</id>
+            <phase>parent-2</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,58 @@
+<?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.mng3916</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3916</name> 
+  <description>
+    Test that plugin executions are properly merged during inheritance, even if the child plugin section has no
+    version.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <!-- NOTE: <version> element deliberately omitted here -->
+        <executions>
+          <execution>
+            <id>child-1</id>
+            <phase>child-1</phase>
+          </execution>
+          <execution>
+            <id>child-2</id>
+            <phase>child-2</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,58 @@
+<?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.mng3938</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3938</name> 
+  <description>
+    Test that plugin executions with the same id are merged during inheritance, especially executions using the
+    default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
+  </description>
+
+  <build>
+    <!-- This project uses plugin management for the test plugin -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-a</artifactId>
+          <version>2.1-SNAPSHOT</version>
+          <executions>
+            <execution>
+              <!-- NOTE: Implicitly reference "default" id here, i.e. omit the <id> element -->
+              <phase>parent-default</phase>
+            </execution>
+            <execution>
+              <id>non-default</id>
+              <phase>parent-non-default</phase>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Added: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml?rev=769664&view=auto
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml (added)
+++ maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml Wed Apr 29 05:20:38 2009
@@ -0,0 +1,59 @@
+<?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.mng3938</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3938</name> 
+  <description>
+    Test that plugin executions with the same id are merged during inheritance, especially executions using the
+    default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <!-- NOTE: Explicitly reference "default" id here -->
+            <id>default</id>
+            <phase>child-default</phase>
+          </execution>
+          <execution>
+            <id>non-default</id>
+            <phase>child-non-default</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>