Index: maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java =================================================================== --- maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java (revision 507746) +++ maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java (working copy) @@ -36,8 +36,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; @@ -742,7 +741,7 @@ { private Artifact artifact; - private Set dependencies = new HashSet(); + private Set dependencies = new LinkedHashSet(); public ArtifactSpec addDependency( String id, String version ) throws InvalidVersionSpecificationException @@ -783,9 +782,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 ) @@ -816,7 +815,7 @@ ArtifactFilter dependencyFilter ) throws InvalidVersionSpecificationException { - Set projectArtifacts = new HashSet(); + Set projectArtifacts = new LinkedHashSet(); for ( Iterator i = dependencies.iterator(); i.hasNext(); ) { Index: maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java =================================================================== --- maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java (revision 507746) +++ maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java (working copy) @@ -19,7 +19,7 @@ * under the License. */ -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -74,7 +74,7 @@ if ( map == null ) { - map = new HashMap(); + map = new LinkedHashMap(); } map.put( key, this ); } Index: maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java =================================================================== --- maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (revision 507746) +++ maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (working copy) @@ -31,7 +31,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; @@ -250,7 +250,7 @@ { if ( metadataMap == null ) { - metadataMap = new HashMap(); + metadataMap = new LinkedHashMap(); } ArtifactMetadata m = (ArtifactMetadata) metadataMap.get( metadata.getKey() ); Index: maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java =================================================================== --- maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (revision 507746) +++ maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (working copy) @@ -23,7 +23,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; @@ -74,7 +74,7 @@ public static Map artifactMapByVersionlessId( Collection artifacts ) { - Map artifactMap = new HashMap(); + Map artifactMap = new LinkedHashMap(); if ( artifacts != null ) { @@ -91,7 +91,7 @@ public static Map artifactMapByArtifactId( Collection artifacts ) { - Map artifactMap = new HashMap(); + Map artifactMap = new LinkedHashMap(); if ( artifacts != null ) { Index: maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java =================================================================== --- maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (revision 507746) +++ maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (working copy) @@ -19,7 +19,7 @@ * under the License. */ -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Iterator; import java.util.Set; @@ -42,7 +42,7 @@ { if ( artifacts == null ) { - artifacts = new HashSet(); + artifacts = new LinkedHashSet(); for ( Iterator it = resolutionNodes.iterator(); it.hasNext(); ) { Index: maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java =================================================================== --- maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (revision 507746) +++ maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (working copy) @@ -22,7 +22,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; @@ -167,7 +167,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: maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java =================================================================== --- maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (revision 507746) +++ maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (working copy) @@ -31,8 +31,8 @@ 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; @@ -61,7 +61,7 @@ ArtifactMetadataSource source, ArtifactFilter filter, List listeners ) throws ArtifactResolutionException { - Map resolvedArtifacts = new HashMap(); + Map resolvedArtifacts = new LinkedHashMap(); ResolutionNode root = new ResolutionNode( originatingArtifact, remoteRepositories ); @@ -70,7 +70,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(); ) { Index: maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java =================================================================== --- maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (revision 507746) +++ maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (working copy) @@ -28,7 +28,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; @@ -105,7 +105,7 @@ List remoteRepositories ) throws ArtifactMetadataRetrievalException { - Set dependencies = new HashSet(); + Set dependencies = new LinkedHashSet(); if ( "g".equals( artifact.getArtifactId() ) ) { @@ -159,7 +159,7 @@ List remoteRepositories ) throws ArtifactMetadataRetrievalException { - Set dependencies = new HashSet(); + Set dependencies = new LinkedHashSet(); if ( "i".equals( artifact.getArtifactId() ) ) { Index: maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java =================================================================== --- maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (revision 507746) +++ maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (working copy) @@ -36,7 +36,7 @@ import java.io.IOException; import java.io.Reader; import java.util.Date; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -154,7 +154,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: maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java =================================================================== --- maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (revision 507746) +++ maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (working copy) @@ -57,7 +57,7 @@ import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.util.Collection; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -72,18 +72,18 @@ // 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; @@ -93,7 +93,7 @@ private boolean interactive = true; - private Map availableWagons = new HashMap(); + private Map availableWagons = new LinkedHashMap(); // TODO: this leaks the component in the public api - it is never released back to the container public Wagon getWagon( Repository repository ) @@ -183,8 +183,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 Index: maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java =================================================================== --- maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java (revision 507746) +++ maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java (working copy) @@ -39,7 +39,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -390,7 +390,7 @@ } else { - Map depsMap = new HashMap(); + Map depsMap = new LinkedHashMap(); List deps = modelDepMgmt.getDependencies(); @@ -438,7 +438,7 @@ modelReporting.setOutputDirectory( profileReporting.getOutputDirectory() ); } - Map mergedReportPlugins = new HashMap(); + Map mergedReportPlugins = new LinkedHashMap(); Map profileReportersByKey = profileReporting.getReportPluginsAsMap(); @@ -506,7 +506,7 @@ recessive.setConfiguration( Xpp3Dom.mergeXpp3Dom( dominantConfig, recessiveConfig ) ); - Map mergedReportSets = new HashMap(); + Map mergedReportSets = new LinkedHashMap(); Map dominantReportSetsById = dominant.getReportSetsAsMap(); @@ -574,7 +574,7 @@ private void injectDependencies( Profile profile, Model model ) { - Map depsMap = new HashMap(); + Map depsMap = new LinkedHashMap(); List deps = model.getDependencies(); Index: maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java =================================================================== --- maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (revision 507746) +++ maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (working copy) @@ -87,8 +87,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.LinkedList; @@ -155,9 +154,9 @@ private ModelValidator validator; - private Map rawProjectCache = new HashMap(); + private Map rawProjectCache = new LinkedHashMap(); - private Map processedProjectCache = new HashMap(); + private Map processedProjectCache = new LinkedHashMap(); // TODO: make it a component private MavenXpp3Reader modelReader; @@ -392,7 +391,7 @@ Map map; if ( dependencyManagement != null && dependencyManagement.getDependencies() != null ) { - map = new HashMap(); + map = new LinkedHashMap(); for ( Iterator i = dependencyManagement.getDependencies().iterator(); i.hasNext(); ) { Dependency d = (Dependency) i.next(); @@ -871,7 +870,7 @@ // TODO: Clean this up...we're using this to 'jump' the interpolation step for model properties not expressed in XML. // [BP] - Can this above comment be explained? // We don't need all the project methods that are added over those in the model, but we do need basedir - Map context = new HashMap( System.getProperties() ); + Map context = new LinkedHashMap( System.getProperties() ); if ( projectDir != null ) { @@ -1379,7 +1378,7 @@ protected Set createPluginArtifacts( String projectId, List plugins ) throws ProjectBuildingException { - Set pluginArtifacts = new HashSet(); + Set pluginArtifacts = new LinkedHashSet(); for ( Iterator i = plugins.iterator(); i.hasNext(); ) { @@ -1421,7 +1420,7 @@ protected Set createReportArtifacts( String projectId, List reports ) throws ProjectBuildingException { - Set pluginArtifacts = new HashSet(); + Set pluginArtifacts = new LinkedHashSet(); if ( reports != null ) { @@ -1466,7 +1465,7 @@ protected Set createExtensionArtifacts( String projectId, List extensions ) throws ProjectBuildingException { - Set extensionArtifacts = new HashSet(); + Set extensionArtifacts = new LinkedHashSet(); if ( extensions != null ) { Index: maven-project/src/main/java/org/apache/maven/project/ModelUtils.java =================================================================== --- maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (revision 507746) +++ maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (working copy) @@ -56,7 +56,7 @@ import java.util.Map; import java.util.Properties; import java.util.TreeMap; -import java.util.HashMap; +import java.util.LinkedHashMap; public final class ModelUtils { @@ -1098,7 +1098,7 @@ public static List mergeDependencyList( List child, List parent ) { - Map depsMap = new HashMap(); + Map depsMap = new LinkedHashMap(); if ( parent != null ) { Index: maven-project/src/main/java/org/apache/maven/project/MavenProject.java =================================================================== --- maven-project/src/main/java/org/apache/maven/project/MavenProject.java (revision 507746) +++ maven-project/src/main/java/org/apache/maven/project/MavenProject.java (working copy) @@ -24,7 +24,7 @@ import java.io.Writer; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -139,7 +139,7 @@ private Map extensionArtifactMap; - private Map projectReferences = new HashMap(); + private Map projectReferences = new LinkedHashMap(); private Build buildOverlay; @@ -277,7 +277,7 @@ if ( moduleAdjustments == null ) { - moduleAdjustments = new HashMap(); + moduleAdjustments = new LinkedHashMap(); List modules = getModules(); if ( modules != null )