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 15ec6e39a8..721151e239 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 @@ -89,6 +89,7 @@ public static Test suite() // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng4269BadReactorResolutionFromOutDirTest.class ); suite.addTestSuite( MavenITmng4262MakeLikeReactorDottedPathTest.class ); suite.addTestSuite( MavenITmng4254SelectableWagonProvidersTest.class ); suite.addTestSuite( MavenITmng4238ArtifactHandlerExtensionUsageTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java new file mode 100644 index 0000000000..0bb0f97269 --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java @@ -0,0 +1,69 @@ +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-4269. + * + * @author Brian Fox + */ +public class MavenITmng4269BadReactorResolutionFromOutDirTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4269BadReactorResolutionFromOutDirTest() + { + super( ALL_MAVEN_VERSIONS ); + } + + /** + * Test that dependency resolution from the reactor is not too eager and does not resolve plugin artifacts from + * the build directory of their plugin project when the plugin project hasn't been built yet. The technical + * problem is that the mere existence of a project output directory like target/classes is no sufficient indicator + * that we can use that for artifact resolution. The project's output directory might just be a left over from a + * previous build and could be in any state, e.g. incomplete. + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4269" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + // NOTE: It's a crucial prerequisite to create the output directory, i.e. the bad choice + new File( testDir, "target/classes" ).mkdirs(); + verifier.deleteArtifacts( "org.apache.maven.its.mng4269" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.getCliOptions().add( "-s" ); + verifier.getCliOptions().add( "settings.xml" ); + // This should use the previous installation/deployment from the repo, not the invalid output directory + verifier.executeGoal( "org.apache.maven.its.mng4269:maven-mng4269-plugin:0.1:touch" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.assertFilePresent( "target/touch.txt" ); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-4269/pom.xml b/its/core-it-suite/src/test/resources/mng-4269/pom.xml new file mode 100644 index 0000000000..d7e4751b6f --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4269/pom.xml @@ -0,0 +1,42 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng4269 + maven-mng4269-plugin + 0.1 + maven-plugin + + Maven Integration Test :: MNG-4269 + + Test that dependency resolution from the reactor is not too eager and does not resolve plugin artifacts from + the build directory of their plugin project when the plugin project hasn't been built yet. The technical + problem is that the mere existence of a project output directory like target/classes is no sufficient indicator + that we can use that for artifact resolution. The project's output directory might just be a left over from a + previous build and could be in any state, e.g. incomplete. + + diff --git a/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-metadata.xml new file mode 100644 index 0000000000..6020b7200e --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-metadata.xml @@ -0,0 +1,10 @@ + + + + + Maven Integration Test Plugin :: Touch + mng4269 + maven-mng4269-plugin + + + diff --git a/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-mng4269-plugin/0.1/maven-mng4269-plugin-0.1.jar b/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-mng4269-plugin/0.1/maven-mng4269-plugin-0.1.jar new file mode 100644 index 0000000000..2aef87a7cc Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-mng4269-plugin/0.1/maven-mng4269-plugin-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-mng4269-plugin/0.1/maven-mng4269-plugin-0.1.pom b/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-mng4269-plugin/0.1/maven-mng4269-plugin-0.1.pom new file mode 100644 index 0000000000..d7f00ce8f1 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-mng4269-plugin/0.1/maven-mng4269-plugin-0.1.pom @@ -0,0 +1,69 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4269 + maven-mng4269-plugin + 0.1 + maven-plugin + + Maven Integration Test Plugin :: Touch + + A test plugin that creates an empty file. + + 2009 + + + + 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-4269/repo/org/apache/maven/its/mng4269/maven-mng4269-plugin/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-mng4269-plugin/maven-metadata.xml new file mode 100644 index 0000000000..ccc9f7106e --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4269/repo/org/apache/maven/its/mng4269/maven-mng4269-plugin/maven-metadata.xml @@ -0,0 +1,14 @@ + + + org.apache.maven.its.mng4269 + maven-mng4269-plugin + 0.1 + + 0.1 + 0.1 + + 0.1 + + 20090731172951 + + diff --git a/its/core-it-suite/src/test/resources/mng-4269/settings-template.xml b/its/core-it-suite/src/test/resources/mng-4269/settings-template.xml new file mode 100644 index 0000000000..408c5ccd9e --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4269/settings-template.xml @@ -0,0 +1,35 @@ + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +