Index: D:/Programs/Maven2/maven/components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java (working copy) @@ -33,8 +33,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; @@ -739,7 +738,7 @@ { private Artifact artifact; - private Set dependencies = new HashSet(); + private Set dependencies = new LinkedHashSet(); public ArtifactSpec addDependency( String id, String version ) throws InvalidVersionSpecificationException @@ -780,9 +779,9 @@ private class Source implements ArtifactMetadataSource { - private Map artifacts = new HashMap(); + private Map artifacts = new LinkedHashMap(); - private Map versions = new HashMap(); + private Map versions = new LinkedHashMap(); public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories ) @@ -813,7 +812,7 @@ ArtifactFilter dependencyFilter ) throws InvalidVersionSpecificationException { - Set projectArtifacts = new HashSet(); + Set projectArtifacts = new LinkedHashSet(); for ( Iterator i = dependencies.iterator(); i.hasNext(); ) { Index: D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java (working copy) @@ -16,7 +16,7 @@ * limitations under the License. */ -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -71,7 +71,7 @@ if ( map == null ) { - map = new HashMap(); + map = new LinkedHashMap(); } map.put( key, this ); } Index: D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (working copy) @@ -28,7 +28,7 @@ import java.io.File; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.regex.Matcher; @@ -247,7 +247,7 @@ { if ( metadataMap == null ) { - metadataMap = new HashMap(); + metadataMap = new LinkedHashMap(); } ArtifactMetadata m = (ArtifactMetadata) metadataMap.get( metadata.getKey() ); Index: D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (working copy) @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -71,7 +71,7 @@ public static Map artifactMapByVersionlessId( Collection artifacts ) { - Map artifactMap = new HashMap(); + Map artifactMap = new LinkedHashMap(); if ( artifacts != null ) { @@ -88,7 +88,7 @@ public static Map artifactMapByArtifactId( Collection artifacts ) { - Map artifactMap = new HashMap(); + Map artifactMap = new LinkedHashMap(); if ( artifacts != null ) { Index: D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (working copy) @@ -16,7 +16,7 @@ * limitations under the License. */ -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Iterator; import java.util.Set; @@ -39,7 +39,7 @@ { if ( artifacts == null ) { - artifacts = new HashSet(); + artifacts = new LinkedHashSet(); for ( Iterator it = resolutionNodes.iterator(); it.hasNext(); ) { Index: D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (working copy) @@ -19,7 +19,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Iterator; import java.util.List; @@ -164,7 +164,7 @@ sb.append( "from the specified remote repositories:" ); sb.append( LS + " " ); - for ( Iterator i = new HashSet( remoteRepositories ).iterator(); i.hasNext(); ) + for ( Iterator i = new LinkedHashSet( remoteRepositories ).iterator(); i.hasNext(); ) { ArtifactRepository remoteRepository = (ArtifactRepository) i.next(); Index: D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java (working copy) @@ -19,7 +19,7 @@ import org.apache.maven.artifact.Artifact; import java.util.Arrays; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; /** @@ -33,7 +33,7 @@ public ExclusionSetFilter( String[] excludes ) { - this.excludes = new HashSet( Arrays.asList( excludes ) ); + this.excludes = new LinkedHashSet( Arrays.asList( excludes ) ); } public ExclusionSetFilter( Set excludes ) Index: D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (working copy) @@ -26,10 +26,12 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException; import org.apache.maven.artifact.versioning.VersionRange; +import sun.security.action.GetLongAction; + import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -58,7 +60,7 @@ ArtifactMetadataSource source, ArtifactFilter filter, List listeners ) throws ArtifactResolutionException { - Map resolvedArtifacts = new HashMap(); + Map resolvedArtifacts = new LinkedHashMap(); ResolutionNode root = new ResolutionNode( originatingArtifact, remoteRepositories ); @@ -67,7 +69,7 @@ recurse( root, resolvedArtifacts, managedVersions, localRepository, remoteRepositories, source, filter, listeners ); - Set set = new HashSet(); + Set set = new LinkedHashSet(); for ( Iterator i = resolvedArtifacts.values().iterator(); i.hasNext(); ) {