Author: bentmann
Date: Wed Aug 26 11:59:22 2009
New Revision: 807973
URL: http://svn.apache.org/viewvc?rev=807973&view=rev
Log:
[MNG-1073] aggregating goal does not fork a lifecycle
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-1/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-2/pom.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
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=807973&r1=807972&r2=807973&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 Aug 26 11:59:22 2009
@@ -347,6 +347,7 @@
suite.addTestSuite( MavenITmng1323AntrunDependenciesTest.class );
suite.addTestSuite( MavenITmng1233WarDepWithProvidedScopeTest.class );
suite.addTestSuite( MavenITmng1088ReactorPluginResolutionTest.class );
+ suite.addTestSuite( MavenITmng1073AggregatorForksReactorTest.class );
suite.addTestSuite( MavenITmng1052PluginMngtConfigTest.class );
suite.addTestSuite( MavenITmng1021EqualAttachmentBuildNumberTest.class
);
suite.addTestSuite( MavenITmng0985NonExecutedPluginMngtGoalsTest.class
);
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java?rev=807973&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
Wed Aug 26 11:59:22 2009
@@ -0,0 +1,90 @@
+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;
+
+/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-1073";>MNG-1073</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng1073AggregatorForksReactorTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng1073AggregatorForksReactorTest()
+ {
+ super( ALL_MAVEN_VERSIONS );
+ }
+
+ /**
+ * Verify that aggregator mojos invoked from the CLI that fork the
lifecycle do so for the entire reactor.
+ */
+ public void testitForkLifecycle()
+ throws Exception
+ {
+ // excluded 2.1.x and 2.2.x due to MNG-4325
+ requiresMavenVersion( "[2.0,2.0.99),[3.0-alpha-3,)" );
+
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-1073" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteDirectory( "sub-1/target" );
+ verifier.deleteDirectory( "sub-2/target" );
+ verifier.setLogFileName( "log-lifecycle.txt" );
+ verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator"
);
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertFilePresent( "target/forked/touch.txt" );
+ verifier.assertFilePresent( "sub-1/target/forked/touch.txt" );
+ verifier.assertFilePresent( "sub-2/target/forked/touch.txt" );
+ }
+
+ /**
+ * Verify that aggregator mojos invoked from the CLI that fork a goal do
so for the entire reactor.
+ */
+ public void testitForkGoal()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-1073" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteDirectory( "sub-1/target" );
+ verifier.deleteDirectory( "sub-2/target" );
+ verifier.setLogFileName( "log-goal.txt" );
+ verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-goal-aggregator"
);
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertFilePresent( "target/touch.txt" );
+ verifier.assertFilePresent( "sub-1/target/touch.txt" );
+ verifier.assertFilePresent( "sub-2/target/touch.txt" );
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/pom.xml?rev=807973&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/pom.xml
Wed Aug 26 11:59:22 2009
@@ -0,0 +1,39 @@
+<?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.mng1073</groupId>
+ <artifactId>aggregator</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-1073</name>
+ <description>
+ Verify that aggregator mojos invoked from the CLI that fork the build do
so for the entire reactor.
+ </description>
+
+ <modules>
+ <module>sub-1</module>
+ <module>sub-2</module>
+ </modules>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-1/pom.xml?rev=807973&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-1/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-1/pom.xml
Wed Aug 26 11:59:22 2009
@@ -0,0 +1,34 @@
+<?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.mng1073</groupId>
+ <artifactId>sub-1</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-1073 :: Sub-1</name>
+ <description>
+ Verify that aggregator mojos invoked from the CLI that fork the build do
so for the entire reactor.
+ </description>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-2/pom.xml?rev=807973&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-2/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-2/pom.xml
Wed Aug 26 11:59:22 2009
@@ -0,0 +1,34 @@
+<?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.mng1073</groupId>
+ <artifactId>sub-2</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-1073 :: Sub-2</name>
+ <description>
+ Verify that aggregator mojos invoked from the CLI that fork the build do
so for the entire reactor.
+ </description>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1073/sub-2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
