You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/08/11 00:39:16 UTC
svn commit: r430569 - in
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project:
artifact/MavenMetadataSource.java
inheritance/DefaultModelInheritanceAssembler.java
Author: jdcasey
Date: Thu Aug 10 15:39:15 2006
New Revision: 430569
URL: http://svn.apache.org/viewvc?rev=430569&view=rev
Log:
Dependency ordering should be preserved.
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=430569&r1=430568&r2=430569&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Thu Aug 10 15:39:15 2006
@@ -50,6 +50,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -302,7 +303,7 @@
ArtifactFilter dependencyFilter, MavenProject project )
throws InvalidDependencyVersionException
{
- Set projectArtifacts = new HashSet( dependencies.size() );
+ Set projectArtifacts = new LinkedHashSet( dependencies.size() );
for ( Iterator i = dependencies.iterator(); i.hasNext(); )
{
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=430569&r1=430568&r2=430569&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 Thu Aug 10 15:39:15 2006
@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -243,7 +244,7 @@
private void assembleDependencyInheritance( Model child, Model parent )
{
- Map depsMap = new HashMap();
+ Map depsMap = new LinkedHashMap();
List deps = parent.getDependencies();