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 54346ff1c0..5ee745d0a2 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 @@ -85,6 +85,7 @@ public class IntegrationTestSuite // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng4349RelocatedArtifactWithInvalidPomTest.class ); suite.addTestSuite( MavenITmng4348NoUnnecessaryRepositoryAccessTest.class ); suite.addTestSuite( MavenITmng4345DefaultPluginExecutionOrderTest.class ); suite.addTestSuite( MavenITmng4344ManagedPluginExecutionOrderTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java new file mode 100644 index 0000000000..463da4c4fd --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java @@ -0,0 +1,67 @@ +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-4349. + * + * @author Benjamin Bentmann + * @version $Id$ + */ +public class MavenITmng4349RelocatedArtifactWithInvalidPomTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4349RelocatedArtifactWithInvalidPomTest() + { + super( ALL_MAVEN_VERSIONS ); + } + + /** + * Test that relocation to an artifact with an invalid POM fails gracefully and still uses the relocated JAR + * (instead of the JAR for the unrelocated artifact). + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4349" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteArtifacts( "org.apache.maven.its.mng4349" ); + verifier.deleteDirectory( "target" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.getCliOptions().add( "--settings" ); + verifier.getCliOptions().add( "settings.xml" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" ); + assertTrue( classpath.toString(), classpath.contains( "new-0.1.jar" ) ); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-4349/pom.xml b/its/core-it-suite/src/test/resources/mng-4349/pom.xml new file mode 100644 index 0000000000..3abd4dab96 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4349/pom.xml @@ -0,0 +1,66 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4349 + test + 0.1 + jar + + Maven Integration Test :: MNG-4349 + + Test that relocation to an artifact with an invalid POM fails gracefully and still uses the relocated JAR + (instead of the JAR for the unrelocated artifact). + + + + + org.apache.maven.its.mng4349 + old + 0.1 + + + + + + + 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-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.jar b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.jar new file mode 100644 index 0000000000..91ca758c60 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.pom b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.pom new file mode 100644 index 0000000000..43bc265861 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4349 + new + 0.1 + jar + + Maven Integration Test :: MNG-4349 :: New Artifact Id + + + + + & + + diff --git a/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml new file mode 100644 index 0000000000..8501ed99f4 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml @@ -0,0 +1,13 @@ + + + org.apache.maven.its.mng4349 + new + 0.1 + + 0.1 + + 0.1 + + 20090909145035 + + diff --git a/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.jar b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.jar new file mode 100644 index 0000000000..705c362571 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.pom b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.pom new file mode 100644 index 0000000000..3651957de7 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.pom @@ -0,0 +1,44 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4349 + old + 0.1 + jar + + Maven Integration Test :: MNG-4349 :: Old Artifact Id + + + + + + + + + org.apache.maven.its.mng4349 + new + + + + diff --git a/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml new file mode 100644 index 0000000000..e3a1cfd3b5 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml @@ -0,0 +1,13 @@ + + + org.apache.maven.its.mng4349 + old + 0.1 + + 0.1 + + 0.1 + + 20090909145021 + + diff --git a/its/core-it-suite/src/test/resources/mng-4349/settings-template.xml b/its/core-it-suite/src/test/resources/mng-4349/settings-template.xml new file mode 100644 index 0000000000..c985d1a689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4349/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +