Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-3424] Respect ordering of elements as given in POM 

o Merged from r708871

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730079 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2008-12-30 09:33:02 +00:00
parent a64d505aa3
commit 970065b4bd
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
View File

@ -350,7 +350,7 @@ public final class ModelUtils
private static List mergeDependencyList( List child, List parent )
{
Map depsMap = new HashMap();
Map depsMap = new LinkedHashMap();
if ( parent != null )
{

2
maven-core/src/main/mdo/settings.mdo
View File

@ -378,7 +378,7 @@
{
if ( profileMap == null )
{
profileMap = new java.util.HashMap();
profileMap = new java.util.LinkedHashMap();
if ( getProfiles() != null )
{

8
maven-model/src/main/mdo/maven.mdo
View File

@ -761,7 +761,7 @@
{
if ( pluginMap == null )
{
pluginMap = new java.util.HashMap();
pluginMap = new java.util.LinkedHashMap();
if ( plugins != null )
{
for ( java.util.Iterator it = plugins.iterator(); it.hasNext(); )
@ -2639,7 +2639,7 @@
{
if ( executionMap == null )
{
executionMap = new java.util.HashMap();
executionMap = new java.util.LinkedHashMap();
if ( getExecutions() != null )
{
for ( java.util.Iterator i = getExecutions().iterator(); i.hasNext(); )
@ -2850,7 +2850,7 @@
{
if ( reportPluginMap == null )
{
reportPluginMap = new java.util.HashMap();
reportPluginMap = new java.util.LinkedHashMap();
if ( getPlugins() != null )
{
for ( java.util.Iterator it = getPlugins().iterator(); it.hasNext(); )
@ -3191,7 +3191,7 @@
{
if ( reportSetMap == null )
{
reportSetMap = new java.util.HashMap();
reportSetMap = new java.util.LinkedHashMap();
if ( getReportSets() != null )
{
for ( java.util.Iterator i = getReportSets().iterator(); i.hasNext(); )

7
maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
View File

@ -26,7 +26,6 @@ import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@ -397,7 +396,7 @@ public class DefaultProfileInjector
}
else
{
Map depsMap = new HashMap();
Map depsMap = new LinkedHashMap();
List deps = modelDepMgmt.getDependencies();
@ -445,7 +444,7 @@ public class DefaultProfileInjector
modelReporting.setOutputDirectory( profileReporting.getOutputDirectory() );
}
Map mergedReportPlugins = new HashMap();
Map mergedReportPlugins = new LinkedHashMap();
Map profileReportersByKey = profileReporting.getReportPluginsAsMap();
@ -513,7 +512,7 @@ public class DefaultProfileInjector
recessive.setConfiguration( merge( dominantConfig, recessiveConfig ) );
Map mergedReportSets = new HashMap();
Map mergedReportSets = new LinkedHashMap();
Map dominantReportSetsById = dominant.getReportSetsAsMap();