diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 7d6ae961bf..4fef8af01a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -207,6 +207,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng3268MultipleDashPCommandLineTest.class ); suite.addTestSuite( MavenITmng3259DepsDroppedInMultiModuleBuildTest.class ); suite.addTestSuite( MavenITmng3220ImportScopeTest.class ); + suite.addTestSuite( MavenITmng3217InterPluginDependencyTest.class ); suite.addTestSuite( MavenITmng3106ProfileMultipleActivatorsTest.class ); suite.addTestSuite( MavenITmng3099SettingsProfilesWithNoPomTest.class ); suite.addTestSuite( MavenITmng3052DepRepoAggregationTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java new file mode 100644 index 0000000000..08bba19121 --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java @@ -0,0 +1,65 @@ +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 MNG-3217. + * + * @author Benjamin Bentmann + * @version $Id$ + */ +public class MavenITmng3217InterPluginDependencyTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng3217InterPluginDependencyTest() + { + super( "[3.0-alpha-1,)" ); + } + + /** + * Verify that the dependency of plugin A on some plugin B does not influence the build of another module in the + * reactor that uses a different version of plugin B for normal build tasks. + */ + public void testitMNG3217() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3217" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "sub-1/target" ); + verifier.deleteDirectory( "sub-2/target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng3217" ); + verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.assertFilePresent( "sub-1/target/touch-1.txt" ); + verifier.assertFilePresent( "sub-2/target/touch-2.txt" ); + } + +} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java index c6ee36e759..eeeb597ae0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java @@ -26,7 +26,7 @@ import java.io.File; import java.util.List; /** - * This is a test set for MNG-4023. + * This is a test set for MNG-4026. * * @author Benjamin Bentmann * @version $Id$ diff --git a/its/core-it-suite/src/test/resources/mng-3217/pom.xml b/its/core-it-suite/src/test/resources/mng-3217/pom.xml new file mode 100644 index 0000000000..bf5c6c5e89 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3217/pom.xml @@ -0,0 +1,65 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3217 + parent + 1.0-SNAPSHOT + pom + + Maven Integration Test :: MNG-3217 + + Verify that the dependency of plugin A on some plugin B does not influence the build of another module in the + reactor that uses a different version of plugin B for normal build tasks. + + + + sub-1 + sub-2 + + + + + maven-core-it + file:///M:/maven/core-it/core-it-suite/src/test/resources/mng-3217/repo + + ignore + + + false + + + + + + maven-core-it + file:///M:/maven/core-it/core-it-suite/src/test/resources/mng-3217/repo + + ignore + + + false + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.1/maven-it-plugin-touch-0.1.jar b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.1/maven-it-plugin-touch-0.1.jar new file mode 100644 index 0000000000..db21e265f1 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.1/maven-it-plugin-touch-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.1/maven-it-plugin-touch-0.1.pom b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.1/maven-it-plugin-touch-0.1.pom new file mode 100644 index 0000000000..9af1061c83 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.1/maven-it-plugin-touch-0.1.pom @@ -0,0 +1,69 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3217 + maven-it-plugin-touch + 0.1 + maven-plugin + + Maven Integration Test Plugin :: Touch + + A test plugin that creates an empty file. + + 2008 + + + + maven-core-it + file:///${basedir}/repo + + + + + true + + + + + org.apache.maven + maven-plugin-api + 2.0 + + + + + + + . + + pom.xml + src/** + + + + src/main/resources + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.2/maven-it-plugin-touch-0.2.jar b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.2/maven-it-plugin-touch-0.2.jar new file mode 100644 index 0000000000..a9feb8e603 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.2/maven-it-plugin-touch-0.2.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.2/maven-it-plugin-touch-0.2.pom b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.2/maven-it-plugin-touch-0.2.pom new file mode 100644 index 0000000000..53409e493c --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/0.2/maven-it-plugin-touch-0.2.pom @@ -0,0 +1,69 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3217 + maven-it-plugin-touch + 0.2 + maven-plugin + + Maven Integration Test Plugin :: Touch + + A test plugin that creates an empty file. + + 2008 + + + + maven-core-it + file:///${basedir}/repo + + + + + true + + + + + org.apache.maven + maven-plugin-api + 2.0 + + + + + + + . + + pom.xml + src/** + + + + src/main/resources + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/maven-metadata.xml new file mode 100644 index 0000000000..24d75e8acd --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-it-plugin-touch/maven-metadata.xml @@ -0,0 +1,14 @@ + + org.apache.maven.its.mng3217 + maven-it-plugin-touch + 0.1 + + 0.2 + 0.2 + + 0.1 + 0.2 + + 20090212184809 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-metadata.xml new file mode 100644 index 0000000000..747b250ed3 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3217/repo/org/apache/maven/its/mng3217/maven-metadata.xml @@ -0,0 +1,9 @@ + + + + Maven Integration Test Plugin :: Touch + ittouch + maven-it-plugin-touch + + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3217/sub-1/pom.xml b/its/core-it-suite/src/test/resources/mng-3217/sub-1/pom.xml new file mode 100644 index 0000000000..8a70d2b86f --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3217/sub-1/pom.xml @@ -0,0 +1,71 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng3217 + parent + 1.0-SNAPSHOT + + + org.apache.maven.its.mng3217 + test-1 + 1.0-SNAPSHOT + + Maven Integration Test :: MNG-3217 :: Module 1 + + Verify that the dependency of plugin A on some plugin B does not influence the build of another module in the + reactor that uses a different version of plugin B for normal build tasks. + + + + + + org.apache.maven.its.plugins + maven-it-plugin-log-file + 2.1-SNAPSHOT + + target/touch-1.txt + + + + test-1 + validate + + reset + + + + + + + org.apache.maven.its.mng3217 + maven-it-plugin-touch + + 0.1 + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3217/sub-2/pom.xml b/its/core-it-suite/src/test/resources/mng-3217/sub-2/pom.xml new file mode 100644 index 0000000000..df36dec7ed --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3217/sub-2/pom.xml @@ -0,0 +1,63 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng3217 + parent + 1.0-SNAPSHOT + + + org.apache.maven.its.mng3217 + test-2 + 1.0-SNAPSHOT + + Maven Integration Test :: MNG-3217 :: Module 2 + + Verify that the dependency of plugin A on some plugin B does not influence the build of another module in the + reactor that uses a different version of plugin B for normal build tasks. + + + + + + org.apache.maven.its.mng3217 + maven-it-plugin-touch + + 0.2 + + target/touch-2.txt + + + + test-2 + validate + + touch + + + + + + +