Author: bentmann Date: Wed Dec 16 11:25:35 2009 New Revision: 891194 URL: http://svn.apache.org/viewvc?rev=891194&view=rev Log: [MNG-4498] Don't fail dependency resolution if one remote repo's metadata is broken
o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/dep-0.1-20091216.104450-1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/dep-0.1-20091216.104450-1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/settings-template.xml (with props) Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=891194&r1=891193&r2=891194&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Wed Dec 16 11:25:35 2009 @@ -85,6 +85,7 @@ // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng4498IgnoreBrokenMetadataTest.class ); suite.addTestSuite( MavenITmng4489MirroringOfExtensionRepoTest.class ); suite.addTestSuite( MavenITmng4488ValidateExternalParenPomLenientTest.class ); suite.addTestSuite( MavenITmng4482ForcePluginSnapshotUpdateTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java?rev=891194&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java Wed Dec 16 11:25:35 2009 @@ -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; +import java.util.List; + +/** + * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4498">MNG-4498</a>. + * + * @author Benjamin Bentmann + */ +public class MavenITmng4498IgnoreBrokenMetadataTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4498IgnoreBrokenMetadataTest() + { + super( "[3.0-alpha-6,)" ); + } + + /** + * Test that unreadable metadata from one repository does not fail the entire dependency resolution. + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4498" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng4498" ); + 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( "dep-0.1-SNAPSHOT.jar" ) ); + } + +} Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/pom.xml?rev=891194&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/pom.xml Wed Dec 16 11:25:35 2009 @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng4489</groupId> + <artifactId>test</artifactId> + <version>0.1</version> + + <name>Maven Integration Test :: MNG-4489</name> + <description> + Test that unreadable metadata from one repository does not fail the entire dependency resolution. + </description> + + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng4498</groupId> + <artifactId>dep</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>maven-it-plugin-dependency-resolution</artifactId> + <version>2.1-SNAPSHOT</version> + <configuration> + <testClassPath>target/classpath.txt</testClassPath> + <significantPathLevels>1</significantPathLevels> + </configuration> + <executions> + <execution> + <id>test</id> + <phase>validate</phase> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml?rev=891194&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml Wed Dec 16 11:25:35 2009 @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> +<!-- This metadata is not even well-formed XML (e.g. could be HTML) and needs to be gracefully handled (i.e. ignored) --> Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/maven-metadata.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/maven-metadata.xml?rev=891194&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/maven-metadata.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/maven-metadata.xml Wed Dec 16 11:25:35 2009 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>org.apache.maven.its.mng4498</groupId> + <artifactId>dep</artifactId> + <version>0.1-SNAPSHOT</version> + <versioning> + <versions> + <version>0.1-SNAPSHOT</version> + </versions> + <lastUpdated>20091216104450</lastUpdated> + </versioning> +</metadata> Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/maven-metadata.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-a/org/apache/maven/its/mng4498/dep/maven-metadata.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/dep-0.1-20091216.104450-1.jar URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/dep-0.1-20091216.104450-1.jar?rev=891194&view=auto ============================================================================== Binary file - no diff available. Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/dep-0.1-20091216.104450-1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/dep-0.1-20091216.104450-1.pom URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/dep-0.1-20091216.104450-1.pom?rev=891194&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/dep-0.1-20091216.104450-1.pom (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/dep-0.1-20091216.104450-1.pom Wed Dec 16 11:25:35 2009 @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng4498</groupId> + <artifactId>dep</artifactId> + <version>0.1-SNAPSHOT</version> + <packaging>jar</packaging> + + <name>Maven Integration Test :: MNG-4498</name> + + <distributionManagement> + <repository> + <id>maven-core-it</id> + <url>file:///${basedir}/repo</url> + </repository> + </distributionManagement> +</project> Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml?rev=891194&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml Wed Dec 16 11:25:35 2009 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>org.apache.maven.its.mng4498</groupId> + <artifactId>dep</artifactId> + <version>0.1-SNAPSHOT</version> + <versioning> + <snapshot> + <timestamp>20091216.104450</timestamp> + <buildNumber>1</buildNumber> + </snapshot> + <lastUpdated>20091216104450</lastUpdated> + </versioning> +</metadata> Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/0.1-SNAPSHOT/maven-metadata.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/maven-metadata.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/maven-metadata.xml?rev=891194&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/maven-metadata.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/maven-metadata.xml Wed Dec 16 11:25:35 2009 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>org.apache.maven.its.mng4498</groupId> + <artifactId>dep</artifactId> + <version>0.1-SNAPSHOT</version> + <versioning> + <versions> + <version>0.1-SNAPSHOT</version> + </versions> + <lastUpdated>20091216104450</lastUpdated> + </versioning> +</metadata> Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/maven-metadata.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/repo-b/org/apache/maven/its/mng4498/dep/maven-metadata.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/settings-template.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/settings-template.xml?rev=891194&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/settings-template.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/settings-template.xml Wed Dec 16 11:25:35 2009 @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<settings> + <mirrors> + <mirror> + <id>central-mirror</id> + <mirrorOf>central</mirrorOf> + <url>@baseurl@/target/null</url> + </mirror> + </mirrors> + <profiles> + <profile> + <id>maven-core-it-repo</id> + <repositories> + <repository> + <id>maven-core-it-a</id> + <url>@baseurl@/repo-a</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <checksumPolicy>ignore</checksumPolicy> + </snapshots> + </repository> + <repository> + <id>maven-core-it-b</id> + <url>@baseurl@/repo-b</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <checksumPolicy>ignore</checksumPolicy> + </snapshots> + </repository> + </repositories> + </profile> + </profiles> + <activeProfiles> + <activeProfile>maven-core-it-repo</activeProfile> + </activeProfiles> +</settings> Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/settings-template.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4498/settings-template.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision