Index: D:/Programs/Maven2/maven/components/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (working copy) @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -102,7 +102,7 @@ List remoteRepositories ) throws ArtifactMetadataRetrievalException { - Set dependencies = new HashSet(); + Set dependencies = new LinkedHashSet(); if ( "g".equals( artifact.getArtifactId() ) ) { @@ -156,7 +156,7 @@ List remoteRepositories ) throws ArtifactMetadataRetrievalException { - Set dependencies = new HashSet(); + Set dependencies = new LinkedHashSet(); if ( "i".equals( artifact.getArtifactId() ) ) { Index: D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (working copy) @@ -33,8 +33,8 @@ import java.io.IOException; import java.io.Reader; import java.util.Date; -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; @@ -50,7 +50,7 @@ /** * @todo very primitive. Probably we can cache artifacts themselves in a central location, as well as reset the flag over time in a long running process. */ - private Set cachedMetadata = new HashSet(); + private Set cachedMetadata = new LinkedHashSet(); public void resolve( RepositoryMetadata metadata, List remoteRepositories, ArtifactRepository localRepository ) throws RepositoryMetadataResolutionException @@ -147,7 +147,7 @@ // TODO: this needs to be repeated here so the merging doesn't interfere with the written metadata // - we'd be much better having a pristine input, and an ongoing metadata for merging instead - Map previousMetadata = new HashMap(); + Map previousMetadata = new LinkedHashMap(); ArtifactRepository selected = null; for ( Iterator i = remoteRepositories.iterator(); i.hasNext(); ) { Index: D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (working copy) @@ -18,7 +18,7 @@ import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -32,7 +32,7 @@ private String globalChecksumPolicy; - private final Map artifactRepositories = new HashMap(); + private final Map artifactRepositories = new LinkedHashMap(); public ArtifactRepository createDeploymentArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout, Index: D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java (working copy) @@ -20,7 +20,7 @@ import org.apache.maven.artifact.versioning.VersionRange; import org.codehaus.plexus.logging.Logger; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; /** @@ -34,7 +34,7 @@ { private Logger logger; - private static Set ignoredArtifacts = new HashSet(); + private static Set ignoredArtifacts = new LinkedHashSet(); public WarningResolutionListener( Logger logger ) { Index: D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (working copy) @@ -53,7 +53,7 @@ import java.io.File; import java.io.IOException; import java.security.NoSuchAlgorithmException; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -68,16 +68,16 @@ // TODO: proxies, authentication and mirrors are via settings, and should come in via an alternate method - perhaps // attached to ArtifactRepository before the method is called (so AR would be composed of WR, not inherit it) - private Map proxies = new HashMap(); + private Map proxies = new LinkedHashMap(); - private Map authenticationInfoMap = new HashMap(); + private Map authenticationInfoMap = new LinkedHashMap(); - private Map serverPermissionsMap = new HashMap(); + private Map serverPermissionsMap = new LinkedHashMap(); - private Map mirrors = new HashMap(); + private Map mirrors = new LinkedHashMap(); /** Map( String, XmlPlexusConfiguration ) with the repository id and the wagon configuration */ - private Map serverConfigurationMap = new HashMap(); + private Map serverConfigurationMap = new LinkedHashMap(); private TransferListener downloadMonitor; @@ -161,8 +161,8 @@ wagon.addTransferListener( downloadMonitor ); } - Map checksums = new HashMap( 2 ); - Map sums = new HashMap( 2 ); + Map checksums = new LinkedHashMap( 2 ); + Map sums = new LinkedHashMap( 2 ); // TODO: configure these on the repository try