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 2283ebae3d..d405735e44 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 @@ -88,6 +88,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5012CollectionVsArrayParamCoercionTest.class ); suite.addTestSuite( MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class ); suite.addTestSuite( MavenITmng5009AggregationCycleTest.class ); + suite.addTestSuite( MavenITmng5006VersionRangeDependencyParentResolutionTest.class ); suite.addTestSuite( MavenITmng5000ChildPathAwareUrlInheritanceTest.class ); suite.addTestSuite( MavenITmng4992MapStylePropertiesParamConfigTest.class ); suite.addTestSuite( MavenITmng4991NonProxyHostsTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java new file mode 100644 index 0000000000..702a7ef2ab --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java @@ -0,0 +1,70 @@ +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.List; + +/** + * This is a test set for MNG-5006. + * + * @author Benjamin Bentmann + */ +public class MavenITmng5006VersionRangeDependencyParentResolutionTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5006VersionRangeDependencyParentResolutionTest() + { + super( "[2.0.3,3.0-alpha-1),[3.0.3,)" ); + } + + /** + * Verify that resolution of parent POMs of dependencies that use a version range is not restricted to the + * repository from which the specific dependency version was picked. Or put differently, the fact that a:0.1 + * was found in repo-1 does not mean parents/dependencies of a:0.1 are also located in that same repo, they + * could be in any of the originally declared repos. + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5006" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng5006" ); + verifier.getCliOptions().add( "-s" ); + verifier.getCliOptions().add( "settings.xml" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List compile = verifier.loadLines( "target/compile.txt", "UTF-8" ); + + assertTrue( compile.toString(), compile.contains( "a-0.1.jar" ) ); + assertTrue( compile.toString(), compile.contains( "b-0.1.jar" ) ); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-5006/pom.xml b/its/core-it-suite/src/test/resources/mng-5006/pom.xml new file mode 100644 index 0000000000..6039ef4135 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5006/pom.xml @@ -0,0 +1,70 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5006 + test + 0.1 + jar + + Maven Integration Test :: MNG-5006 + + Verify that resolution of parent POMs of dependencies that use a version range is not restricted to the + repository from which the specific dependency version was picked. Or put differently, the fact that a:0.1 + was found in repo-1 does not mean parents/dependencies of a:0.1 are also located in that same repo, they + could be in any of the originally declared repos. + + + + + org.apache.maven.its.mng5006 + a + + [0.1,) + compile + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + 1 + + + + resolve + validate + + compile + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/0.1/a-0.1.jar b/its/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/0.1/a-0.1.jar new file mode 100644 index 0000000000..2e215694c8 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/0.1/a-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/0.1/a-0.1.pom b/its/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/0.1/a-0.1.pom new file mode 100644 index 0000000000..ab274f6eb1 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/0.1/a-0.1.pom @@ -0,0 +1,42 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5006 + parent + 0.1 + + + org.apache.maven.its.mng5006 + a + 0.1 + jar + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/maven-metadata.xml new file mode 100644 index 0000000000..0e956fba8c --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/maven-metadata.xml @@ -0,0 +1,12 @@ + + + org.apache.maven.its.mng5006 + a + 0.1 + + + 0.1 + + 20110223123749 + + diff --git a/its/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/0.1/b-0.1.jar b/its/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/0.1/b-0.1.jar new file mode 100644 index 0000000000..2c26cc7617 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/0.1/b-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/0.1/b-0.1.pom b/its/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/0.1/b-0.1.pom new file mode 100644 index 0000000000..3729e63d94 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/0.1/b-0.1.pom @@ -0,0 +1,36 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5006 + b + 0.1 + jar + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/parent/0.1/parent-0.1.pom b/its/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/parent/0.1/parent-0.1.pom new file mode 100644 index 0000000000..f15a1edc50 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/parent/0.1/parent-0.1.pom @@ -0,0 +1,44 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5006 + parent + 0.1 + pom + + + + org.apache.maven.its.mng5006 + b + 0.1 + + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-5006/settings-template.xml b/its/core-it-suite/src/test/resources/mng-5006/settings-template.xml new file mode 100644 index 0000000000..bb3c94ec72 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5006/settings-template.xml @@ -0,0 +1,53 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it-1 + @baseurl@/repo-1 + + ignore + + + false + + + + maven-core-it-2 + @baseurl@/repo-2 + + ignore + + + false + + + + + + + maven-core-it-repo + +