Author: jdcasey
Date: Tue Apr 1 13:29:51 2008
New Revision: 643554
URL: http://svn.apache.org/viewvc?rev=643554&view=rev
Log:
[MNG-3494] Fixed a bug I introduced with the last commit. All ITs run now, and
I've improved the unit test to make sure that bug doesn't reappear.
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.jar
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.pom
(with props)
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=643554&r1=643553&r2=643554&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Tue Apr 1 13:29:51 2008
@@ -266,7 +266,10 @@
for ( Iterator it = deps.iterator(); it.hasNext(); )
{
Dependency dependency = (Dependency) it.next();
- depsMap.put( dependency.getManagementKey(), dependency );
+ if ( !depsMap.containsKey( dependency.getManagementKey() ) )
+ {
+ depsMap.put( dependency.getManagementKey(), dependency );
+ }
}
}
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java?rev=643554&r1=643553&r2=643554&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t13/ProjectInheritanceTest.java
Tue Apr 1 13:29:51 2008
@@ -80,6 +80,7 @@
Dependency dep1 = (Dependency) dependencies.get( 0 );
assertEquals( "Child dependency should be listed first.",
"test-from-child", dep1.getArtifactId() );
+ assertEquals( "Child dependency should have version '1'.", "1",
dep1.getVersion() );
Dependency dep2 = (Dependency) dependencies.get( 1 );
assertEquals( "Parent dependency should be listed last.",
"test-from-parent", dep2.getArtifactId() );
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml?rev=643554&r1=643553&r2=643554&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/p0/pom.xml
Tue Apr 1 13:29:51 2008
@@ -11,6 +11,11 @@
<artifactId>test-from-parent</artifactId>
<version>1</version>
</dependency>
+ <dependency>
+ <groupId>tests</groupId>
+ <artifactId>test-from-child</artifactId>
+ <version>0.5</version>
+ </dependency>
</dependencies>
</project>
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.jar
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.jar?rev=643554&view=auto
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.jar
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.jar
Tue Apr 1 13:29:51 2008
@@ -0,0 +1,16 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p0</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>tests</groupId>
+ <artifactId>test-from-parent</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.pom
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.pom?rev=643554&view=auto
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.pom
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.pom
Tue Apr 1 13:29:51 2008
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>tests</groupId>
+ <artifactId>test-from-child</artifactId>
+ <version>0.5</version>
+
+</project>
\ No newline at end of file
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t13/repo/tests/test-from-child/0.5/test-from-child-0.5.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
