Author: bentmann
Date: Wed Sep 9 21:46:34 2009
New Revision: 813129
URL: http://svn.apache.org/viewvc?rev=813129&view=rev
Log:
[MNG-4350] [regression] Multiple goals bound to the same phase in a lifecycle
mapping get executed out of order
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4350/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4350/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
(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-support/core-it-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.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=813129&r1=813128&r2=813129&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
Wed Sep 9 21:46:34 2009
@@ -85,6 +85,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+ suite.addTestSuite(
MavenITmng4350LifecycleMappingExecutionOrderTest.class );
suite.addTestSuite(
MavenITmng4349RelocatedArtifactWithInvalidPomTest.class );
suite.addTestSuite(
MavenITmng4348NoUnnecessaryRepositoryAccessTest.class );
suite.addTestSuite(
MavenITmng4345DefaultPluginExecutionOrderTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java?rev=813129&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
Wed Sep 9 21:46:34 2009
@@ -0,0 +1,64 @@
+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.List;
+
+/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-4350";>MNG-4350</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4350LifecycleMappingExecutionOrderTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4350LifecycleMappingExecutionOrderTest()
+ {
+ super( ALL_MAVEN_VERSIONS );
+ }
+
+ /**
+ * Test that multiple goals bound to the same phase by a lifecycle mapping
execute in the order given by
+ * the lifecycle mapping. In particular, the order of plugin declarations
in the POM should have no influence
+ * on the lifecycle mappings specified by the packaging.
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-4350" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "process-resources" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List lines = verifier.loadLines( "target/log.txt", "UTF-8" );
+ assertEquals( Arrays.asList( new String[] { "first", "second" } ),
lines );
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4350/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4350/pom.xml?rev=813129&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4350/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4350/pom.xml
Wed Sep 9 21:46:34 2009
@@ -0,0 +1,65 @@
+<?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.mng4350</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>multi-goal-per-phase</packaging>
+
+ <name>Maven Integration Test :: MNG-4350</name>
+ <description>
+ Test that multiple goals bound to the same phase by a lifecycle mapping
execute in the order given by
+ the lifecycle mapping. In particular, the order of plugin declarations in
the POM should have no influence
+ on the lifecycle mappings specified by the packaging.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!--
+ NOTE: The packaging provided by this plugin defines a lifecycle
mapping which maps a goal from the Resources
+ Plugin and a goal from the plugin itself, in that order, to the same
phase. This order must be retained
+ during the build regardless of the POM order of the plugin
declarations which is just the opposite ordering.
+ -->
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-packaging</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <outputFile>target/log.txt</outputFile>
+ <message>second</message>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ <configuration>
+ <pathname>target/log.txt</pathname>
+ <message>first</message>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4350/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4350/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java?rev=813129&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
(added)
+++
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
Wed Sep 9 21:46:34 2009
@@ -0,0 +1,80 @@
+package org.apache.maven.plugin.coreit;
+
+/*
+ * 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.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+
+/**
+ * Appends a message to an UTF-8 encoded plain text file.
+ *
+ * @author Benjamin Bentmann
+ * @goal append
+ */
+public class AppendMojo
+ extends AbstractMojo
+{
+
+ /**
+ * @parameter expression="${append.message}"
+ */
+ private String message;
+
+ /**
+ * @parameter default-value="${project.build.directory}/log.txt"
+ */
+ private File outputFile;
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ getLog().info( "[MAVEN-CORE-IT-LOG] Creating output file: " +
outputFile );
+
+ try
+ {
+ outputFile.getParentFile().mkdirs();
+
+ getLog().info( "[MAVEN-CORE-IT-LOG] " + message );
+
+ OutputStreamWriter writer = new OutputStreamWriter( new
FileOutputStream( outputFile, true ), "UTF-8" );
+ try
+ {
+ writer.write( message );
+ writer.write( "\n" );
+ }
+ finally
+ {
+ writer.close();
+ }
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Output file could not be
created: " + outputFile, e );
+ }
+
+ getLog().info( "[MAVEN-CORE-IT-LOG] Created output file: " +
outputFile );
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml?rev=813129&r1=813128&r2=813129&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml
Wed Sep 9 21:46:34 2009
@@ -17,6 +17,22 @@
</configuration>
</component>
<component>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <role-hint>multi-goal-per-phase</role-hint>
+
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+ <configuration>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <phases>
+ <!-- NOTE: This is intentionally a very minimalistic lifecycle
-->
+
<process-resources>org.apache.maven.plugins:maven-resources-plugin:resources,
org.apache.maven.its.plugins:maven-it-plugin-packaging:append</process-resources>
+ </phases>
+ </lifecycle>
+ </lifecycles>
+ </configuration>
+ </component>
+ <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>it-artifact</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
