Author: bentmann
Date: Fri Dec 26 05:04:04 2008
New Revision: 729492
URL: http://svn.apache.org/viewvc?rev=729492&view=rev
Log:
[MNG-3943] [regression] Inherited plugin executions are lost if child and
parent specify different plugin versions
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/sub/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/sub/pom.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/sub/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=729492&r1=729491&r2=729492&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Fri Dec 26 05:04:04 2008
@@ -90,12 +90,13 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+ suite.addTestSuite( MavenITmng3943PluginExecutionInheritanceTest.class
);
suite.addTestSuite( MavenITmng3940EnvVarInterpolationTest.class );
suite.addTestSuite( MavenITmng3938MergePluginExecutionsTest.class );
suite.addTestSuite( MavenITmng3937MergedPluginExecutionGoalsTest.class
);
suite.addTestSuite(
MavenITmng3927PluginDefaultExecutionConfigTest.class );
- suite.addTestSuite( MavenITmng3924XmlMarkupInterpolationTest.class );
suite.addTestSuite( MavenITmng3925MergedPluginExecutionOrderTest.class
);
+ suite.addTestSuite( MavenITmng3924XmlMarkupInterpolationTest.class );
suite.addTestSuite( MavenITmng3916PluginExecutionInheritanceTest.class
);
suite.addTestSuite(
MavenITmng3906MergedPluginClassPathOrderingTest.class );
suite.addTestSuite(
MavenITmng3904NestedBuildDirInterpolationTest.class );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java?rev=729492&r1=729491&r2=729492&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
Fri Dec 26 05:04:04 2008
@@ -43,8 +43,8 @@
}
/**
- * Test that plugin executions are properly merged during inheritance,
even if the plugin sections have different
- * versions.
+ * Test that plugin executions are properly merged during inheritance,
even if the child plugin section has no
+ * version.
*/
public void testitMNG3916()
throws Exception
@@ -61,7 +61,7 @@
List executions = verifier.loadLines( "target/exec.log", "UTF-8" );
// NOTE: Ordering of executions is another issue (MNG-3887), so
ignore/normalize order
Collections.sort( executions );
- List expected = Arrays.asList( new String[] { "child-1", "child-2",
"child-default", "parent-1", "parent-2" } );
+ List expected = Arrays.asList( new String[] { "child-1",
"child-default", "parent-1" } );
assertEquals( expected, executions );
}
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java?rev=729492&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
Fri Dec 26 05:04:04 2008
@@ -0,0 +1,68 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-3943";>MNG-3943</a>.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng3943PluginExecutionInheritanceTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng3943PluginExecutionInheritanceTest()
+ {
+ super( "(2.0.4,)" );
+ }
+
+ /**
+ * Test that plugin executions are properly merged during inheritance,
even if the child uses a different
+ * plugin version than the parent.
+ */
+ public void testitMNG3943()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3943" );
+
+ Verifier verifier = new Verifier( new File( testDir, "sub"
).getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List executions = verifier.loadLines( "target/exec.log", "UTF-8" );
+ // NOTE: Ordering of executions is another issue (MNG-3887), so
ignore/normalize order
+ Collections.sort( executions );
+ List expected = Arrays.asList( new String[] { "child-1",
"child-default", "parent-1" } );
+ assertEquals( expected, executions );
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/pom.xml?rev=729492&r1=729491&r2=729492&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/pom.xml
Fri Dec 26 05:04:04 2008
@@ -29,8 +29,8 @@
<name>Maven Integration Test :: MNG-3916</name>
<description>
- Test that plugin executions are properly merged during inheritance, even
if the plugin sections have different
- versions.
+ Test that plugin executions are properly merged during inheritance, even
if the child plugin section has no
+ version.
</description>
<build>
@@ -52,17 +52,6 @@
</configuration>
</execution>
<execution>
- <id>parent-2</id>
- <phase>validate</phase>
- <goals>
- <goal>log-string</goal>
- </goals>
- <configuration>
- <logFile>target/exec.log</logFile>
- <string>parent-2</string>
- </configuration>
- </execution>
- <execution>
<!-- NOTE: <id> deliberately omitted to use default value -->
<phase>validate</phase>
<goals>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/sub/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/sub/pom.xml?rev=729492&r1=729491&r2=729492&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/sub/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3916/sub/pom.xml
Fri Dec 26 05:04:04 2008
@@ -32,8 +32,8 @@
<name>Maven Integration Test :: MNG-3916</name>
<description>
- Test that plugin executions are properly merged during inheritance, even
if the plugin sections have different
- versions.
+ Test that plugin executions are properly merged during inheritance, even
if the child plugin section has no
+ version.
</description>
<build>
@@ -55,17 +55,6 @@
</configuration>
</execution>
<execution>
- <id>child-2</id>
- <phase>validate</phase>
- <goals>
- <goal>log-string</goal>
- </goals>
- <configuration>
- <logFile>target/exec.log</logFile>
- <string>child-2</string>
- </configuration>
- </execution>
- <execution>
<!-- NOTE: <id> deliberately omitted to use default value -->
<phase>validate</phase>
<goals>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/pom.xml?rev=729492&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/pom.xml
Fri Dec 26 05:04:04 2008
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3943</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3943</name>
+ <description>
+ Test that plugin executions are properly merged during inheritance, even
if the child uses a different
+ plugin version than the parent.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <!-- NOTE: Use different version than child -->
+ <version>0.1</version>
+ <executions>
+ <execution>
+ <id>parent-1</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ <configuration>
+ <logFile>target/exec.log</logFile>
+ <string>parent-1</string>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- NOTE: <id> deliberately omitted to use default value -->
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ <configuration>
+ <logFile>target/exec.log</logFile>
+ <string>parent-default</string>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/sub/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/sub/pom.xml?rev=729492&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/sub/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/sub/pom.xml
Fri Dec 26 05:04:04 2008
@@ -0,0 +1,73 @@
+<?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.mng3943</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+
+ <name>Maven Integration Test :: MNG-3943</name>
+ <description>
+ Test that plugin executions are properly merged during inheritance, even
if the child uses a different
+ plugin version than the parent.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <!-- NOTE: Use different version than parent -->
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>child-1</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ <configuration>
+ <logFile>target/exec.log</logFile>
+ <string>child-1</string>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- NOTE: <id> deliberately omitted to use default value -->
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ <configuration>
+ <logFile>target/exec.log</logFile>
+ <string>child-default</string>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/sub/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3943/sub/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
