maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject [03/14] maven git commit: [MNG-6146] Several small stylistic and spelling improvements to code and documentation
Date Sat, 04 Feb 2017 02:43:33 GMT
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 988df76..ba5e3a0 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -94,7 +94,7 @@ public class PomConstructionTest
     }
 
     /**
-     * Tests that modules is not overriden by profile
+     * Tests that modules is not overridden by profile
      *
      * @throws Exception
      */
@@ -207,7 +207,7 @@ public class PomConstructionTest
     {
         try
         {
-            buildPom( "unique-dependency-key/dep-mngt" );
+            buildPom( "unique-dependency-key/dep-mgmt" );
             fail( "Non-unique dependency keys did not cause validation error" );
         }
         catch ( ProjectBuildingException e )
@@ -235,7 +235,7 @@ public class PomConstructionTest
     {
         try
         {
-            buildPom( "unique-dependency-key/dep-mngt-in-profile" );
+            buildPom( "unique-dependency-key/dep-mgmt-in-profile" );
             fail( "Non-unique dependency keys did not cause validation error" );
         }
         catch ( ProjectBuildingException e )
@@ -414,7 +414,7 @@ public class PomConstructionTest
     public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-goals-order/wo-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-exec-goals-order/wo-plugin-mgmt" );
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/executions[1]/goals" ) ).size() );
         assertEquals( "b", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) );
         assertEquals( "a", pom.getValue( "build/plugins[1]/executions[1]/goals[2]" ) );
@@ -427,7 +427,7 @@ public class PomConstructionTest
     public void testOrderOfGoalsFromPluginExecutionWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-goals-order/w-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-exec-goals-order/w-plugin-mgmt" );
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/executions[1]/goals" ) ).size() );
         assertEquals( "b", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) );
         assertEquals( "a", pom.getValue( "build/plugins[1]/executions[1]/goals[2]" ) );
@@ -439,7 +439,7 @@ public class PomConstructionTest
     public void testOrderOfPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-order/wo-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-exec-order/wo-plugin-mgmt" );
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
         assertEquals( "b", pom.getValue( "build/plugins[1]/executions[1]/id" ) );
         assertEquals( "a", pom.getValue( "build/plugins[1]/executions[2]/id" ) );
@@ -452,7 +452,7 @@ public class PomConstructionTest
     public void testOrderOfPluginExecutionsWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-order/w-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-exec-order/w-plugin-mgmt" );
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
         assertEquals( "b", pom.getValue( "build/plugins[1]/executions[1]/id" ) );
         assertEquals( "a", pom.getValue( "build/plugins[1]/executions[2]/id" ) );
@@ -488,7 +488,7 @@ public class PomConstructionTest
     public void testOrderOfMergedPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "merged-plugin-exec-order/wo-plugin-mngt/sub" );
+        PomTestWrapper pom = buildPom( "merged-plugin-exec-order/wo-plugin-mgmt/sub" );
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
         assertEquals( "parent-1", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) );
         assertEquals( "parent-2", pom.getValue( "build/plugins[1]/executions[2]/goals[1]" ) );
@@ -500,7 +500,7 @@ public class PomConstructionTest
     public void testOrderOfMergedPluginExecutionsWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "merged-plugin-exec-order/w-plugin-mngt/sub" );
+        PomTestWrapper pom = buildPom( "merged-plugin-exec-order/w-plugin-mgmt/sub" );
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
         assertEquals( "parent-1", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) );
         assertEquals( "parent-2", pom.getValue( "build/plugins[1]/executions[2]/goals[1]" ) );
@@ -522,7 +522,7 @@ public class PomConstructionTest
     public void testOrderOfMergedPluginExecutionGoalsWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/wo-plugin-mngt/sub" );
+        PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/wo-plugin-mgmt/sub" );
 
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/executions[1]/goals" ) ).size() );
         assertEquals( "child-a", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) );
@@ -535,7 +535,7 @@ public class PomConstructionTest
     public void testOrderOfMergedPluginExecutionGoalsWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/w-plugin-mngt/sub" );
+        PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/w-plugin-mgmt/sub" );
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/executions[1]/goals" ) ).size() );
         assertEquals( "child-a", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) );
         assertEquals( "merged", pom.getValue( "build/plugins[1]/executions[1]/goals[2]" ) );
@@ -548,7 +548,7 @@ public class PomConstructionTest
     public void testOverridingOfInheritedPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-merging/wo-plugin-mngt/sub" );
+        PomTestWrapper pom = buildPom( "plugin-exec-merging/wo-plugin-mgmt/sub" );
         assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
         assertEquals( "child-default", pom.getValue( "build/plugins[1]/executions[@id='default']/phase" ) );
         assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) );
@@ -558,7 +558,7 @@ public class PomConstructionTest
     public void testOverridingOfInheritedPluginExecutionsWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-merging/w-plugin-mngt/sub" );
+        PomTestWrapper pom = buildPom( "plugin-exec-merging/w-plugin-mgmt/sub" );
         assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
         assertEquals( "child-default", pom.getValue( "build/plugins[1]/executions[@id='default']/phase" ) );
         assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) );
@@ -569,7 +569,7 @@ public class PomConstructionTest
     public void testOrderOfMergedPluginDependenciesWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/wo-plugin-mngt/sub" );
+        PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/wo-plugin-mgmt/sub" );
 
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() );
         assertNotNull( pom.getValue( "build/plugins[1]/dependencies[1]" ) );
@@ -588,7 +588,7 @@ public class PomConstructionTest
     public void testOrderOfMergedPluginDependenciesWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/w-plugin-mngt/sub" );
+        PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/w-plugin-mgmt/sub" );
         assertEquals( 5, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() );
         assertEquals( "c", pom.getValue( "build/plugins[1]/dependencies[1]/artifactId" ) );
         assertEquals( "1", pom.getValue( "build/plugins[1]/dependencies[1]/version" ) );
@@ -769,7 +769,7 @@ public class PomConstructionTest
     public void testOrderOfPluginConfigurationElementsWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-config-order/wo-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-config-order/wo-plugin-mgmt" );
         assertEquals( "one", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[1]" ) );
         assertEquals( "two", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[2]" ) );
         assertEquals( "three", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[3]" ) );
@@ -780,7 +780,7 @@ public class PomConstructionTest
     public void testOrderOfPluginConfigurationElementsWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-config-order/w-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-config-order/w-plugin-mgmt" );
         assertEquals( "one", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[1]" ) );
         assertEquals( "two", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[2]" ) );
         assertEquals( "three", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[3]" ) );
@@ -790,7 +790,7 @@ public class PomConstructionTest
     public void testOrderOfPluginExecutionConfigurationElementsWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-config-order/wo-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-exec-config-order/wo-plugin-mgmt" );
         String prefix = "build/plugins[1]/executions[1]/configuration/";
         assertEquals( "one", pom.getValue( prefix + "stringParams/stringParam[1]" ) );
         assertEquals( "two", pom.getValue( prefix + "stringParams/stringParam[2]" ) );
@@ -804,7 +804,7 @@ public class PomConstructionTest
     public void testOrderOfPluginExecutionConfigurationElementsWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-config-order/w-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-exec-config-order/w-plugin-mgmt" );
         String prefix = "build/plugins[1]/executions[1]/configuration/";
         assertEquals( "one", pom.getValue( prefix + "stringParams/stringParam[1]" ) );
         assertEquals( "two", pom.getValue( prefix + "stringParams/stringParam[2]" ) );
@@ -876,7 +876,7 @@ public class PomConstructionTest
     public void testMultiplePluginExecutionsWithAndWithoutIdsWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/wo-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/wo-plugin-mgmt" );
         assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
         assertEquals( "log-string", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) );
         assertEquals( "log-string", pom.getValue( "build/plugins[1]/executions[2]/goals[1]" ) );
@@ -885,7 +885,7 @@ public class PomConstructionTest
     public void testMultiplePluginExecutionsWithAndWithoutIdsWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/w-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/w-plugin-mgmt" );
         assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
         assertEquals( "log-string", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) );
         assertEquals( "log-string", pom.getValue( "build/plugins[1]/executions[2]/goals[1]" ) );
@@ -894,7 +894,7 @@ public class PomConstructionTest
     public void testDependencyOrderWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "dependency-order/wo-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "dependency-order/wo-plugin-mgmt" );
         assertEquals( 4, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
         assertEquals( "a", pom.getValue( "dependencies[1]/artifactId" ) );
         assertEquals( "c", pom.getValue( "dependencies[2]/artifactId" ) );
@@ -905,7 +905,7 @@ public class PomConstructionTest
     public void testDependencyOrderWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "dependency-order/w-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "dependency-order/w-plugin-mgmt" );
         assertEquals( 4, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
         assertEquals( "a", pom.getValue( "dependencies[1]/artifactId" ) );
         assertEquals( "c", pom.getValue( "dependencies[2]/artifactId" ) );
@@ -1033,7 +1033,7 @@ public class PomConstructionTest
     public void testPluginConfigurationUsingAttributesWithoutPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-config-attributes/wo-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-config-attributes/wo-plugin-mgmt" );
         assertEquals( "src", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@todir" ) );
         assertEquals( "true", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@overwrite" ) );
         assertEquals( "target", pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@dir" ) );
@@ -1045,7 +1045,7 @@ public class PomConstructionTest
     public void testPluginConfigurationUsingAttributesWithPluginManagement()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "plugin-config-attributes/w-plugin-mngt" );
+        PomTestWrapper pom = buildPom( "plugin-config-attributes/w-plugin-mgmt" );
         assertEquals( "src", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@todir" ) );
         assertEquals( "true", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@overwrite" ) );
         assertEquals( "target", pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@dir" ) );
@@ -1518,7 +1518,7 @@ public class PomConstructionTest
     {
         Properties sysProps = new Properties();
         sysProps.setProperty( "system.property", "PASSED" );
-        PomTestWrapper pom = buildPom( "sytem-property-interpolation", sysProps );
+        PomTestWrapper pom = buildPom( "system-property-interpolation", sysProps );
         assertEquals( "PASSED", pom.getValue( "name" ) );
     }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
index eda9010..c145ee0 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
@@ -64,11 +64,11 @@ public class ProjectSorterTest
 
     private Dependency createDependency( String groupId, String artifactId, String version )
     {
-        Dependency depdendency = new Dependency();
-        depdendency.setGroupId( groupId );
-        depdendency.setArtifactId( artifactId );
-        depdendency.setVersion( version );
-        return depdendency;
+        Dependency dependency = new Dependency();
+        dependency.setGroupId( groupId );
+        dependency.setArtifactId( artifactId );
+        dependency.setVersion( version );
+        return dependency;
     }
 
     private Plugin createPlugin( MavenProject project )

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
index 536e1a6..5ad762a 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
@@ -84,7 +84,7 @@ public class MavenToolchainMergerTest
             PersistedToolchains jdksExtra = reader.read( jdksExtraIS );
             assertEquals( 2, jdks.getToolchains().size() );
 
-            // switch dominant with reccessive
+            // switch dominant with recessive
             merger.merge( jdksExtra, jdks, TrackableBase.USER_LEVEL );
             assertEquals( 4, jdksExtra.getToolchains().size() );
             assertEquals( 2, jdks.getToolchains().size() );
@@ -119,7 +119,7 @@ public class MavenToolchainMergerTest
             PersistedToolchains jdksExtend = reader.read( jdksExtendIS );
             assertEquals( 2, jdks.getToolchains().size() );
 
-            // switch dominant with reccessive
+            // switch dominant with recessive
             merger.merge( jdksExtend, jdks, TrackableBase.USER_LEVEL );
             assertEquals( 2, jdksExtend.getToolchains().size() );
             Xpp3Dom config0 = (Xpp3Dom) jdksExtend.getToolchains().get( 0 ).getConfiguration();

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java
index 469cb2c..b1ae1ed 100644
--- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java
+++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java
@@ -29,7 +29,7 @@ public class AppTest
     }
 
     /**
-     * Rigourous Test :-)
+     * Rigorous Test :-)
      */
     public void testApp()
     {

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml
new file mode 100644
index 0000000..5882ab5
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml
@@ -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 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.mng4003</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-4003</name>
+  <description>
+    Verify that dependencies survive the project construction in the POM order.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4003</groupId>
+      <artifactId>a</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4003</groupId>
+      <artifactId>c</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4003</groupId>
+      <artifactId>b</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4003</groupId>
+      <artifactId>d</artifactId>
+      <version>1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <!-- NOTE: The combination with a plugin management section is an essential part of the test -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml
deleted file mode 100644
index 5882ab5..0000000
--- a/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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.mng4003</groupId>
-  <artifactId>test</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <name>Maven Integration Test :: MNG-4003</name>
-  <description>
-    Verify that dependencies survive the project construction in the POM order.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.mng4003</groupId>
-      <artifactId>a</artifactId>
-      <version>1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.its.mng4003</groupId>
-      <artifactId>c</artifactId>
-      <version>1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.its.mng4003</groupId>
-      <artifactId>b</artifactId>
-      <version>1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.its.mng4003</groupId>
-      <artifactId>d</artifactId>
-      <version>1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <!-- NOTE: The combination with a plugin management section is an essential part of the test -->
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml
new file mode 100644
index 0000000..57bd6d0
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml
@@ -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 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.mng4003</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-4003</name>
+  <description>
+    Verify that dependencies survive the project construction in the POM order.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4003</groupId>
+      <artifactId>a</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4003</groupId>
+      <artifactId>c</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4003</groupId>
+      <artifactId>b</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4003</groupId>
+      <artifactId>d</artifactId>
+      <version>1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <!-- NOTE: The combination with a plugin section is an essential part of the test -->
+    <plugins>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.3</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml
deleted file mode 100644
index 57bd6d0..0000000
--- a/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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.mng4003</groupId>
-  <artifactId>test</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <name>Maven Integration Test :: MNG-4003</name>
-  <description>
-    Verify that dependencies survive the project construction in the POM order.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.mng4003</groupId>
-      <artifactId>a</artifactId>
-      <version>1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.its.mng4003</groupId>
-      <artifactId>c</artifactId>
-      <version>1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.its.mng4003</groupId>
-      <artifactId>b</artifactId>
-      <version>1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.its.mng4003</groupId>
-      <artifactId>d</artifactId>
-      <version>1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <!-- NOTE: The combination with a plugin section is an essential part of the test -->
-    <plugins>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml
new file mode 100644
index 0000000..aba6bdf
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml
new file mode 100644
index 0000000..1877ea5
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml
deleted file mode 100644
index aba6bdf..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml
deleted file mode 100644
index 1877ea5..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml
new file mode 100644
index 0000000..10226cf
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml
new file mode 100644
index 0000000..1877ea5
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml
deleted file mode 100644
index 10226cf..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml
deleted file mode 100644
index 1877ea5..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml
new file mode 100644
index 0000000..fc09dba
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml
@@ -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.mng3937</groupId>
+  <artifactId>parent-2</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3937</name>
+  <description>
+    Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
+    ordered.
+  </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>
+          <executions>
+            <execution>
+              <id>merge</id>
+              <phase>validate</phase>
+              <goals>
+                <goal>parent-b</goal>
+                <goal>merged</goal>
+                <goal>parent-a</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml
new file mode 100644
index 0000000..2148aa9
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml
@@ -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.mng3937</groupId>
+    <artifactId>parent-2</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child-2</artifactId>
+
+  <name>Maven Integration Test :: MNG-3937</name>
+  <description>
+    Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
+    ordered.
+  </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>merge</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>child-a</goal>
+              <goal>merged</goal>
+              <goal>child-b</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml
deleted file mode 100644
index fc09dba..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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.mng3937</groupId>
-  <artifactId>parent-2</artifactId>
-  <version>0.1</version>
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: MNG-3937</name>
-  <description>
-    Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
-    ordered.
-  </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>
-          <executions>
-            <execution>
-              <id>merge</id>
-              <phase>validate</phase>
-              <goals>
-                <goal>parent-b</goal>
-                <goal>merged</goal>
-                <goal>parent-a</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml
deleted file mode 100644
index 2148aa9..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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.mng3937</groupId>
-    <artifactId>parent-2</artifactId>
-    <version>0.1</version>
-  </parent>
-
-  <artifactId>child-2</artifactId>
-
-  <name>Maven Integration Test :: MNG-3937</name>
-  <description>
-    Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
-    ordered.
-  </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>merge</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>child-a</goal>
-              <goal>merged</goal>
-              <goal>child-b</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml
new file mode 100644
index 0000000..b9c3f18
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml
@@ -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.mng3937</groupId>
+  <artifactId>parent-1</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3937</name>
+  <description>
+    Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
+    ordered.
+  </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>
+            <id>merge</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>parent-b</goal>
+              <goal>merged</goal>
+              <goal>parent-a</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml
new file mode 100644
index 0000000..fab233b
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml
@@ -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.mng3937</groupId>
+    <artifactId>parent-1</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child-1</artifactId>
+
+  <name>Maven Integration Test :: MNG-3937</name>
+  <description>
+    Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
+    ordered.
+  </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>merge</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>child-a</goal>
+              <goal>merged</goal>
+              <goal>child-b</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml
deleted file mode 100644
index b9c3f18..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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.mng3937</groupId>
-  <artifactId>parent-1</artifactId>
-  <version>0.1</version>
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: MNG-3937</name>
-  <description>
-    Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
-    ordered.
-  </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>
-            <id>merge</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>parent-b</goal>
-              <goal>merged</goal>
-              <goal>parent-a</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml
deleted file mode 100644
index fab233b..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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.mng3937</groupId>
-    <artifactId>parent-1</artifactId>
-    <version>0.1</version>
-  </parent>
-
-  <artifactId>child-1</artifactId>
-
-  <name>Maven Integration Test :: MNG-3937</name>
-  <description>
-    Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
-    ordered.
-  </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>merge</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>child-a</goal>
-              <goal>merged</goal>
-              <goal>child-b</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml
new file mode 100644
index 0000000..ee4dedc
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml
@@ -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>
+
+  <groupId>org.apache.maven.its.mng3925</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <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>
+    <!-- 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>
+          <executions>
+            <execution>
+              <id>parent-1</id>
+              <phase>validate</phase>
+              <goals>
+                <goal>parent-1</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>parent-2</id>
+              <phase>validate</phase>
+              <goals>
+                <goal>parent-2</goal>
+              </goals>
+            </execution>
+            <execution>
+              <!-- NOTE: <id> deliberately omitted to use default value -->
+              <phase>validate</phase>
+              <goals>
+                <goal>parent-default</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml
new file mode 100644
index 0000000..bf777db
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml
deleted file mode 100644
index ee4dedc..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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.mng3925</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1</version>
-  <packaging>pom</packaging>
-
-  <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>
-    <!-- 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>
-          <executions>
-            <execution>
-              <id>parent-1</id>
-              <phase>validate</phase>
-              <goals>
-                <goal>parent-1</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>parent-2</id>
-              <phase>validate</phase>
-              <goals>
-                <goal>parent-2</goal>
-              </goals>
-            </execution>
-            <execution>
-              <!-- NOTE: <id> deliberately omitted to use default value -->
-              <phase>validate</phase>
-              <goals>
-                <goal>parent-default</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml
deleted file mode 100644
index bf777db..0000000
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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>

http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml
new file mode 100644
index 0000000..a816975
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml
@@ -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.mng3925</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <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>
+    <!-- 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>
+            <id>parent-1</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>parent-1</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>parent-2</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>parent-2</goal>
+            </goals>
+          </execution>
+          <execution>
+            <!-- NOTE: <id> deliberately omitted to use default value -->
+            <phase>validate</phase>
+            <goals>
+              <goal>parent-default</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>


Mime
View raw message