Author: bentmann
Date: Wed Sep 9 15:23:43 2009
New Revision: 812990
URL: http://svn.apache.org/viewvc?rev=812990&view=rev
Log:
[MNG-4349] [regression] Maven hangs in endless loop if POM of relocated
artifact is invalid
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/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=812990&r1=812989&r2=812990&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 Sep 9 15:23:43 2009
@@ -85,6 +85,7 @@
// 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 );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java?rev=812990&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
Wed Sep 9 15:23:43 2009
@@ -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 <a
href="http://jira.codehaus.org/browse/MNG-4349";>MNG-4349</a>.
+ *
+ * @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" )
);
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/pom.xml?rev=812990&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/pom.xml
Wed Sep 9 15:23:43 2009
@@ -0,0 +1,66 @@
+<?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.mng4349</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4349</name>
+ <description>
+ 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).
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4349</groupId>
+ <artifactId>old</artifactId>
+ <version>0.1</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>
+ <compileClassPath>target/classpath.txt</compileClassPath>
+ <significantPathLevels>1</significantPathLevels>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.jar?rev=812990&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.pom?rev=812990&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/0.1/new-0.1.pom
Wed Sep 9 15:23:43 2009
@@ -0,0 +1,40 @@
+<?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.mng4349</groupId>
+ <artifactId>new</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4349 :: New Artifact Id</name>
+
+ <!--
+ NOTE: That this POM is invalid is the essential part of this test.
Nevertheless, Maven should use
+ the JAR corresponding to this POM and not from the original/relocated
artifact for dependency resolution.
+ -->
+
+ <!-- bad entity -->
+ &
+
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml?rev=812990&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml
Wed Sep 9 15:23:43 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4349</groupId>
+ <artifactId>new</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090909145035</lastUpdated>
+ </versioning>
+</metadata>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/new/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.jar?rev=812990&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.pom?rev=812990&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/0.1/old-0.1.pom
Wed Sep 9 15:23:43 2009
@@ -0,0 +1,44 @@
+<?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.mng4349</groupId>
+ <artifactId>old</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4349 :: Old Artifact Id</name>
+ <description>
+
+ </description>
+
+ <!-- NOTE: Despite the relocation, this artifact has a JAR which Maven
should however never touch -->
+
+ <distributionManagement>
+ <relocation>
+ <groupId>org.apache.maven.its.mng4349</groupId>
+ <artifactId>new</artifactId>
+ </relocation>
+ </distributionManagement>
+
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml?rev=812990&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml
Wed Sep 9 15:23:43 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4349</groupId>
+ <artifactId>old</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090909145021</lastUpdated>
+ </versioning>
+</metadata>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/repo/org/apache/maven/its/mng4349/old/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/settings-template.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/settings-template.xml?rev=812990&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/settings-template.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/settings-template.xml
Wed Sep 9 15:23:43 2009
@@ -0,0 +1,43 @@
+<?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>
+ <profiles>
+ <profile>
+ <id>maven-core-it-repo</id>
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </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-4349/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4349/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
