Author: bentmann
Date: Wed Mar 25 21:06:56 2009
New Revision: 758436
URL: http://svn.apache.org/viewvc?rev=758436&view=rev
Log:
[MNG-2591] Plugins are merged incorrectly
o Extended UT to exhibit negative side-effects of profile injection
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
- copied unchanged from r758386,
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/
- copied from r758386,
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/subproject/
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
- copied, changed from r758386,
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/
- copied from r758386,
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/subproject/
Removed:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/subproject/
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=758436&r1=758435&r2=758436&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Wed Mar 25 21:06:56 2009
@@ -761,11 +761,25 @@
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 @@
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 @@
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()
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Copied:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
(from r758386,
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml?p2=maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml&p1=maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml&r1=758386&r2=758436&rev=758436&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
Wed Mar 25 21:06:56 2009
@@ -77,4 +77,14 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!-- an active but empty profile to ensure profile injection does not
interfere with plugin configuration -->
+ <id>parent</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
</project>
Modified:
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml?rev=758436&r1=758386&r2=758436&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml
Wed Mar 25 21:06:56 2009
@@ -67,4 +67,14 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!-- an active but empty profile to ensure profile injection does not
interfere with plugin configuration -->
+ <id>child</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
</project>
