Index: D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java (working copy) @@ -36,7 +36,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; @@ -385,7 +385,7 @@ } else { - Map depsMap = new HashMap(); + Map depsMap = new LinkedHashMap(); List deps = modelDepMgmt.getDependencies(); @@ -433,7 +433,7 @@ modelReporting.setOutputDirectory( profileReporting.getOutputDirectory() ); } - Map mergedReportPlugins = new HashMap(); + Map mergedReportPlugins = new LinkedHashMap(); Map profileReportersByKey = profileReporting.getReportPluginsAsMap(); @@ -501,7 +501,7 @@ recessive.setConfiguration( Xpp3Dom.mergeXpp3Dom( dominantConfig, recessiveConfig ) ); - Map mergedReportSets = new HashMap(); + Map mergedReportSets = new LinkedHashMap(); Map dominantReportSetsById = dominant.getReportSetsAsMap(); @@ -569,7 +569,7 @@ private void injectDependencies( Profile profile, Model model ) { - Map depsMap = new HashMap(); + Map depsMap = new LinkedHashMap(); List deps = model.getDependencies(); Index: D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/ProjectSorter.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/ProjectSorter.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/ProjectSorter.java (working copy) @@ -27,7 +27,7 @@ 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; @@ -63,7 +63,7 @@ { dag = new DAG(); - Map projectMap = new HashMap(); + Map projectMap = new LinkedHashMap(); for ( Iterator i = projects.iterator(); i.hasNext(); ) { Index: D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (working copy) @@ -85,8 +85,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; @@ -152,9 +151,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; @@ -386,7 +385,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(); @@ -865,7 +864,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 ) { @@ -1358,7 +1357,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(); ) { @@ -1400,7 +1399,7 @@ protected Set createReportArtifacts( String projectId, List reports ) throws ProjectBuildingException { - Set pluginArtifacts = new HashSet(); + Set pluginArtifacts = new LinkedHashSet(); if ( reports != null ) { @@ -1445,7 +1444,7 @@ protected Set createExtensionArtifacts( String projectId, List extensions ) throws ProjectBuildingException { - Set extensionArtifacts = new HashSet(); + Set extensionArtifacts = new LinkedHashSet(); if ( extensions != null ) { Index: D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (working copy) @@ -30,7 +30,7 @@ import org.codehaus.plexus.util.StringUtils; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -243,7 +243,7 @@ private void assembleDependencyInheritance( Model child, Model parent ) { - Map depsMap = new HashMap(); + Map depsMap = new LinkedHashMap(); List deps = parent.getDependencies(); Index: D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (working copy) @@ -48,7 +48,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -302,7 +302,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(); ) { Index: D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (working copy) @@ -53,7 +53,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 { @@ -1009,7 +1009,7 @@ public static List mergeDependencyList( List child, List parent ) { - Map depsMap = new HashMap(); + Map depsMap = new LinkedHashMap(); if ( parent != null ) { Index: D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java =================================================================== --- D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (revision 417955) +++ D:/Programs/Maven2/maven/components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (working copy) @@ -56,7 +56,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; @@ -137,7 +137,7 @@ private Map extensionArtifactMap; - private Map projectReferences = new HashMap(); + private Map projectReferences = new LinkedHashMap(); private Build buildOverlay; @@ -272,7 +272,7 @@ if ( moduleAdjustments == null ) { - moduleAdjustments = new HashMap(); + moduleAdjustments = new LinkedHashMap(); List modules = getModules(); if ( modules != null )