diff --git a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 49c0184580..2651d501a4 100644
--- a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -761,11 +761,25 @@ public class PomConstructionTest
assertEquals( "PASSED-4", pom.getValue( prefix + "listParam/listParam[4]" ) );
}
- /* FIXME: MNG-2591*/
- public void testAppendOfInheritedPluginConfiguration()
+ /* MNG-2591 */
+ public void testAppendOfInheritedPluginConfigurationWithNoProfile()
throws Exception
{
- PomTestWrapper pom = buildPom( "plugin-config-append/subproject" );
+ testAppendOfInheritedPluginConfiguration( "no-profile" );
+ }
+
+ /* FIXME: MNG-2591
+ public void testAppendOfInheritedPluginConfigurationWithActiveProfile()
+ throws Exception
+ {
+ testAppendOfInheritedPluginConfiguration( "with-profile" );
+ }
+ //*/
+
+ private void testAppendOfInheritedPluginConfiguration( String test )
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "plugin-config-append/" + test + "/subproject" );
String prefix = "build/plugins[1]/configuration/";
assertEquals( "PARENT-1", pom.getValue( prefix + "stringParams/stringParam[1]" ) );
@@ -776,6 +790,7 @@ public class PomConstructionTest
assertEquals( "CHILD-3", pom.getValue( prefix + "stringParams/stringParam[6]" ) );
assertEquals( "CHILD-2", pom.getValue( prefix + "stringParams/stringParam[7]" ) );
assertEquals( "CHILD-4", pom.getValue( prefix + "stringParams/stringParam[8]" ) );
+ assertEquals( null, pom.getValue( prefix + "stringParams/stringParam[9]" ) );
assertEquals( "PARENT-1", pom.getValue( prefix + "listParam/listParam[1]" ) );
assertEquals( "PARENT-3", pom.getValue( prefix + "listParam/listParam[2]" ) );
assertEquals( "PARENT-2", pom.getValue( prefix + "listParam/listParam[3]" ) );
@@ -784,8 +799,8 @@ public class PomConstructionTest
assertEquals( "CHILD-3", pom.getValue( prefix + "listParam/listParam[6]" ) );
assertEquals( "CHILD-2", pom.getValue( prefix + "listParam/listParam[7]" ) );
assertEquals( "CHILD-4", pom.getValue( prefix + "listParam/listParam[8]" ) );
+ assertEquals( null, pom.getValue( prefix + "listParam/listParam[9]" ) );
}
- //*/
/* MNG-4000 */
public void testMultiplePluginExecutionsWithAndWithoutIdsWithoutPluginManagement()
diff --git a/maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
similarity index 100%
rename from maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml
rename to maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
diff --git a/maven-project/src/test/resources-project-builder/plugin-config-append/subproject/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml
similarity index 100%
rename from maven-project/src/test/resources-project-builder/plugin-config-append/subproject/pom.xml
rename to maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml
diff --git a/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
new file mode 100644
index 0000000000..48a8d393ba
--- /dev/null
+++ b/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+ 4.0.0
+
+ org.apache.maven.its.mng2591
+ parent
+ 1.0
+ pom
+
+ Maven Integration Test :: MNG-2591
+
+ Test aggregation of list configuration items for build plugins when using
+ 'combine.children=append' attribute.
+
+
+
+ subproject
+
+
+
+
+
+
+
+ org.apache.maven.its.plugins
+ maven-it-plugin-configuration
+ 2.1-SNAPSHOT
+ true
+
+
+
+ PARENT-1
+ PARENT-3
+ PARENT-2
+ PARENT-4
+
+
+
+
+
+
+
+
+ org.apache.maven.its.plugins
+ maven-it-plugin-configuration
+ 2.1-SNAPSHOT
+ true
+
+
+
+ PARENT-1
+ PARENT-3
+ PARENT-2
+ PARENT-4
+
+
+
+
+
+
+
+
+
+ parent
+
+ true
+
+
+
+
diff --git a/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml
new file mode 100644
index 0000000000..7023503089
--- /dev/null
+++ b/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+ 4.0.0
+
+
+ org.apache.maven.its.mng2591
+ parent
+ 1.0
+
+
+ subproject
+ 1.0
+ jar
+
+
+
+
+ org.apache.maven.its.plugins
+ maven-it-plugin-configuration
+ 2.1-SNAPSHOT
+
+ target/config.properties
+
+
+ CHILD-1
+ CHILD-3
+ CHILD-2
+ CHILD-4
+
+
+
+ CHILD-1
+ CHILD-3
+ CHILD-2
+ CHILD-4
+
+
+
+
+ test
+ validate
+
+ config
+
+
+
+
+
+
+
+
+
+
+ child
+
+ true
+
+
+
+