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 4b284961f3..2dbf180cf3 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 @@ -83,6 +83,7 @@ public static Test suite() suite.addTestSuite( MavenITmng4768NearestMatchConflictResolutionTest.class ); suite.addTestSuite( MavenITmng4765LocalPomProjectBuilderTest.class ); + suite.addTestSuite( MavenITmng4755FetchRemoteMetadataForVersionRangeTest.class ); suite.addTestSuite( MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.class ); suite.addTestSuite( MavenITmng4747JavaAgentUsedByPluginTest.class ); // suite.addTestSuite( MavenITmng4745PluginVersionUpdateTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java new file mode 100644 index 0000000000..a23a5df9e6 --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java @@ -0,0 +1,75 @@ +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-4755. + * + * @author Benjamin Bentmann + */ +public class MavenITmng4755FetchRemoteMetadataForVersionRangeTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4755FetchRemoteMetadataForVersionRangeTest() + { + super( "[2.0.3,3.0-alpha-1),[3.0-beta-3,)" ); + } + + /** + * Verify that locally installed artifacts don't suppress fetching of g:a-level remote metadata which is required + * to locate alternative version (as required by version ranges). + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4755" ); + + // setup: install a local version + Verifier verifier = newVerifier( new File( testDir, "dependency" ).getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteArtifacts( "org.apache.maven.its.mng4755" ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + // test: resolve remote version + verifier = newVerifier( new File( testDir, "test" ).getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + 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 cp = verifier.loadLines( "target/classpath.txt", "UTF-8" ); + assertTrue( cp.toString(), cp.contains( "dep-1.jar" ) ); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-4755/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-4755/dependency/pom.xml new file mode 100644 index 0000000000..9f11990bca --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4755/dependency/pom.xml @@ -0,0 +1,66 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4755 + dep + 2 + jar + + Maven Integration Test :: MNG-4755 + + Verify that locally installed artifacts don't suppress fetching of g:a-level remote metadata which is required + to locate alternative version (as required by version ranges). + + + + + + org.apache.maven.its.plugins + maven-it-plugin-artifact + 2.1-SNAPSHOT + + pom.xml + + + + test + validate + + set + attach-pom + install + + + + + + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-4755/test/pom.xml b/its/core-it-suite/src/test/resources/mng-4755/test/pom.xml new file mode 100644 index 0000000000..9a23e630d6 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4755/test/pom.xml @@ -0,0 +1,70 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4755 + test + 0.1-SNAPSHOT + jar + + Maven Integration Test :: MNG-4755 + + Verify that locally installed artifacts don't suppress fetching of g:a-level remote metadata which is required + to locate alternative version (as required by version ranges). + + + + + + org.apache.maven.its.mng4755 + dep + [1,2) + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/classpath.txt + 1 + + + + test + validate + + compile + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-4755/test/repo/org/apache/maven/its/mng4755/dep/1/dep-1.jar b/its/core-it-suite/src/test/resources/mng-4755/test/repo/org/apache/maven/its/mng4755/dep/1/dep-1.jar new file mode 100644 index 0000000000..efe378fade Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-4755/test/repo/org/apache/maven/its/mng4755/dep/1/dep-1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-4755/test/repo/org/apache/maven/its/mng4755/dep/1/dep-1.pom b/its/core-it-suite/src/test/resources/mng-4755/test/repo/org/apache/maven/its/mng4755/dep/1/dep-1.pom new file mode 100644 index 0000000000..efe378fade --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4755/test/repo/org/apache/maven/its/mng4755/dep/1/dep-1.pom @@ -0,0 +1,67 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4755 + dep + 1 + jar + + Maven Integration Test :: MNG-4755 + + Verify that locally installed artifacts don't suppress fetching of g:a-level remote metadata which is required + to locate alternative version (as required by version ranges). + + + + + + org.apache.maven.its.plugins + maven-it-plugin-artifact + 2.1-SNAPSHOT + + pom.xml + + + + test + validate + + set + attach-pom + install + deploy + + + + + + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-4755/test/repo/org/apache/maven/its/mng4755/dep/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4755/test/repo/org/apache/maven/its/mng4755/dep/maven-metadata.xml new file mode 100644 index 0000000000..b427dfd7d2 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4755/test/repo/org/apache/maven/its/mng4755/dep/maven-metadata.xml @@ -0,0 +1,12 @@ + + + org.apache.maven.its.mng4755 + dep + 1 + + + 1 + + 20100820110209 + + diff --git a/its/core-it-suite/src/test/resources/mng-4755/test/settings-template.xml b/its/core-it-suite/src/test/resources/mng-4755/test/settings-template.xml new file mode 100644 index 0000000000..c985d1a689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4755/test/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +