You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/12 21:28:01 UTC
svn commit: r784244 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-4005/ resources/mng-4005/build/
resources/mng-4005/metadata/ resources/mng-4005/metadata/repo/
resources/mng-4005/metadata/re...
Author: bentmann
Date: Fri Jun 12 19:28:00 2009
New Revision: 784244
URL: http://svn.apache.org/viewvc?rev=784244&view=rev
Log:
[MNG-4005] Throw Validation Error if pom contains a dependency with two different versions.
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/build/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/build/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/a-0.2.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/a-0.2.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/b-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/b-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/settings-template.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4193/metadata/repo/org/apache/maven/its/mng4193/b/0.1/b-0.1.pom
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=784244&r1=784243&r2=784244&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 Fri Jun 12 19:28:00 2009
@@ -119,6 +119,7 @@
suite.addTestSuite( MavenITmng4009InheritProfileEffectsTest.class );
suite.addTestSuite( MavenITmng4008MergedFilterOrderTest.class );
suite.addTestSuite( MavenITmng4007PlatformFileSeparatorTest.class );
+ suite.addTestSuite( MavenITmng4005UniqueDependencyKeyTest.class );
suite.addTestSuite( MavenITmng4000MultiPluginExecutionsTest.class );
suite.addTestSuite( MavenITmng3998PluginExecutionConfigTest.class );
suite.addTestSuite( MavenITmng3983PluginResolutionFromProfileReposTest.class );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java?rev=784244&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java Fri Jun 12 19:28:00 2009
@@ -0,0 +1,100 @@
+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.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4005">MNG-4005</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4005UniqueDependencyKeyTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4005UniqueDependencyKeyTest()
+ {
+ super( "[3.0-alpha-3,)" );
+ }
+
+ /**
+ * Test that duplicate dependencies cause a validation error during building.
+ */
+ public void testitProjectBuild()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4005/build" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ try
+ {
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ fail( "Duplicate dependency did not cause validation error" );
+ }
+ catch ( VerificationException e )
+ {
+ // expected
+ }
+ finally
+ {
+ verifier.resetStreams();
+ }
+ }
+
+ /**
+ * Test that duplicate dependencies don't cause a validation error during metadata retrieval.
+ */
+ public void testitMetadataRetrieval()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4005/metadata" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4005" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
+ Collections.sort( artifacts );
+
+ List expected = new ArrayList();
+ expected.add( "org.apache.maven.its.mng4005:a:jar:0.2" );
+ expected.add( "org.apache.maven.its.mng4005:b:jar:0.1" );
+
+ assertEquals( expected, artifacts );
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java?rev=784244&r1=784243&r2=784244&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java Fri Jun 12 19:28:00 2009
@@ -57,7 +57,7 @@
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4190" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.getCliOptions().add( "-X -s" );
+ verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/build/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/build/pom.xml?rev=784244&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/build/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/build/pom.xml Fri Jun 12 19:28:00 2009
@@ -0,0 +1,47 @@
+<?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.mng4005</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4005</name>
+ <description>
+ Test that duplicate dependency declarations cause a validation error during building.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/build/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/build/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/pom.xml?rev=784244&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/pom.xml Fri Jun 12 19:28:00 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.mng4005</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-4005</name>
+ <description>
+ Test that duplicate dependencies do not cause a validation error during metadata retrieval.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <!-- The POM of this dependency is invalid, yet its transitive dependencies should be resolved, too -->
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>b</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>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <configuration>
+ <projectArtifacts>target/artifacts.txt</projectArtifacts>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/a-0.2.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/a-0.2.jar?rev=784244&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/a-0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/a-0.2.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/a-0.2.pom?rev=784244&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/a-0.2.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/0.2/a-0.2.pom Fri Jun 12 19:28:00 2009
@@ -0,0 +1,36 @@
+<?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.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.2</version>
+ <packaging>jar</packaging>
+
+ <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-4005/metadata/repo/org/apache/maven/its/mng4005/a/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/maven-metadata.xml?rev=784244&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/maven-metadata.xml Fri Jun 12 19:28:00 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.2</version>
+ <versioning>
+ <release>0.2</release>
+ <versions>
+ <version>0.2</version>
+ </versions>
+ <lastUpdated>20090612175831</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/b-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/b-0.1.jar?rev=784244&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/b-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/b-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/b-0.1.pom?rev=784244&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/b-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/0.1/b-0.1.pom Fri Jun 12 19:28:00 2009
@@ -0,0 +1,97 @@
+<?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.mng4005</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <!-- The duplicate dependencies in here should not cause a validation error during metadata retrieval -->
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.2</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>test</id>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/maven-metadata.xml?rev=784244&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/maven-metadata.xml Fri Jun 12 19:28:00 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090612180153</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/repo/org/apache/maven/its/mng4005/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/settings-template.xml?rev=784244&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/settings-template.xml Fri Jun 12 19:28:00 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-4005/metadata/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4005/metadata/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4193/metadata/repo/org/apache/maven/its/mng4193/b/0.1/b-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4193/metadata/repo/org/apache/maven/its/mng4193/b/0.1/b-0.1.pom?rev=784244&r1=784243&r2=784244&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4193/metadata/repo/org/apache/maven/its/mng4193/b/0.1/b-0.1.pom (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4193/metadata/repo/org/apache/maven/its/mng4193/b/0.1/b-0.1.pom Fri Jun 12 19:28:00 2009
@@ -34,8 +34,18 @@
</repository>
</distributionManagement>
+ <dependencies>
+ <dependency>
+ <!-- if the model builder rejected this POM, the test will miss this dependency -->
+ <groupId>org.apache.maven.its.mng4193</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <!-- The duplicate repository id's in here should not cause a validation error during metadata retrieval -->
+
<repositories>
- <!-- The duplicate repository id should not cause a validation error during metadata retrieval -->
<repository>
<id>non-unique-id</id>
<url>http://repo1.maven.org</url>
@@ -45,13 +55,40 @@
<url>http://repo2.maven.org</url>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>non-unique-id</id>
+ <url>http://repo1.maven.org</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>non-unique-id</id>
+ <url>http://repo2.maven.org</url>
+ </pluginRepository>
+ </pluginRepositories>
- <dependencies>
- <dependency>
- <!-- if the model builder rejected this POM, the test will miss this dependency -->
- <groupId>org.apache.maven.its.mng4193</groupId>
- <artifactId>a</artifactId>
- <version>0.1</version>
- </dependency>
- </dependencies>
+ <profiles>
+ <profile>
+ <id>test</id>
+ <repositories>
+ <repository>
+ <id>non-unique-id</id>
+ <url>http://repo1.maven.org</url>
+ </repository>
+ <repository>
+ <id>non-unique-id</id>
+ <url>http://repo2.maven.org</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>non-unique-id</id>
+ <url>http://repo1.maven.org</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>non-unique-id</id>
+ <url>http://repo2.maven.org</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
</project>