svn commit: r833032 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/ resources/mng-4403/repo/org/apache/maven/its/mng4403/c/ resources/mng-4403/repo...

[bentmann]

Author: bentmann
Date: Thu Nov  5 12:00:51 2009
New Revision: 833032

URL: http://svn.apache.org/viewvc?rev=833032&view=rev
Log:
o Strengthened IT to check another Maven 2.x feature

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/c-0.1.jar   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/c-0.1.pom
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/maven-metadata.xml   (with props)
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java?rev=833032&r1=833031&r2=833032&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java Thu Nov  5 12:00:51 2009
@@ -43,7 +43,8 @@
 
     /**
      * Test that dependency POMs are only subject to minimal validation during metadata retrieval, i.e. Maven should
-     * ignore most kinds of badness and make a best effort at getting the metadata.
+     * ignore most kinds of badness and make a best effort at getting the metadata. Of particular interest is also,
+     * how Maven deals with duplicate dependency declarations.
      */
     public void testit()
         throws Exception
@@ -67,6 +68,7 @@
         List expected = new ArrayList();
         expected.add( "org.apache.maven.its.mng4403:a:jar:0.1" );
         expected.add( "org.apache.maven.its.mng4403:b:jar:0.1" );
+        expected.add( "org.apache.maven.its.mng4403:c:jar:0.1" );
 
         assertEquals( expected, artifacts );
     }

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/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-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom?rev=833032&r1=833031&r2=833032&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom Thu Nov  5 12:00:51 2009
@@ -42,6 +42,31 @@
   </distributionManagement>
 
   <!-- if the model builder rejected this POM, the test will miss its (compile-time) dependencies -->
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- duplicate managed dependencies (MNG-4005), both declarations apply in POM order, i.e. their effects get merged, using first-wins for values -->
+      <dependency>
+        <groupId>org.apache.maven.its.mng4403</groupId>
+        <artifactId>c</artifactId>
+        <version>0.1</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.its.mng4403</groupId>
+        <artifactId>c</artifactId>
+        <version>0.2</version>
+        <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.maven.its.mng4403</groupId>
+            <artifactId>cc</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.its.mng4403</groupId>
@@ -56,6 +81,11 @@
       <version>${pom.version}</version>
     </dependency>
     <dependency>
+      <!-- dependency managed by duplicate declarations -->
+      <groupId>org.apache.maven.its.mng4403</groupId>
+      <artifactId>c</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.its.mng4403</groupId>
       <artifactId>x</artifactId>
       <!-- unresolvable property in dependency version (MNG-4383) -->

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/c-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/c-0.1.jar?rev=833032&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/c-0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/c-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/c-0.1.pom?rev=833032&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/c-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/0.1/c-0.1.pom Thu Nov  5 12:00:51 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.mng4403</groupId>
+  <artifactId>c</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.mng4403</groupId>
+      <artifactId>cc</artifactId>
+      <version>0.1</version>
+    </dependency>
+  </dependencies>
+</project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/maven-metadata.xml?rev=833032&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/maven-metadata.xml Thu Nov  5 12:00:51 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.maven.its.mng4403</groupId>
+  <artifactId>c</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20090609185317</lastUpdated>
+  </versioning>
+</metadata>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/maven-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/c/maven-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision