Author: bentmann
Date: Wed Mar 25 21:09:53 2009
New Revision: 758437
URL: http://svn.apache.org/viewvc?rev=758437&view=rev
Log:
[MNG-2591] Plugins are merged incorrectly
o Extended IT to exhibit negative side-effects of profile injection
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/no-profile/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/no-profile/pom.xml
- copied unchanged from r757826,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/no-profile/subproject/
- copied from r757826,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/subproject/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/pom.xml
- copied, changed from r757826,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/subproject/
- copied from r757826,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/subproject/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/subproject/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/subproject/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java?rev=758437&r1=758436&r2=758437&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
Wed Mar 25 21:09:53 2009
@@ -41,13 +41,29 @@
}
/**
- * Test aggregation of list configuration items for build plugins when
using
- * 'combine.children=append' attribute.
+ * Test aggregation of list configuration items for build plugins when
using 'combine.children=append' attribute.
+ * This variation of the test does not employ profiles.
*/
- public void testitMNG2591()
+ public void testitNoProfile()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2591" );
+ testit( "no-profile" );
+ }
+
+ /**
+ * Test aggregation of list configuration items for build plugins when
using 'combine.children=append' attribute.
+ * This variation of the test employs active profiles which however are
empty and should not change the result.
+ */
+ public void testitWithProfile()
+ throws Exception
+ {
+ testit( "with-profile" );
+ }
+
+ private void testit( String project )
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2591/" + project );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "subproject/target" );
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/pom.xml
(from r757826,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/pom.xml&r1=757826&r2=758437&rev=758437&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/pom.xml
Wed Mar 25 21:09:53 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/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/subproject/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/subproject/pom.xml?rev=758437&r1=757826&r2=758437&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/subproject/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/with-profile/subproject/pom.xml
Wed Mar 25 21:09:53 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>
