You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/10/29 11:58:50 UTC
svn commit: r708871 - in /maven/components/branches/maven-2.0.x:
maven-model/src/main/mdo/
maven-project/src/main/java/org/apache/maven/project/
maven-project/src/main/java/org/apache/maven/project/injection/
maven-settings/src/main/mdo/
Author: brett
Date: Wed Oct 29 03:58:50 2008
New Revision: 708871
URL: http://svn.apache.org/viewvc?rev=708871&view=rev
Log:
[MNG-3424] Respect ordering of elements as given in POM
Submitted by: Benjamin Bentmann
Merged from: r708869
Modified:
maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
maven/components/branches/maven-2.0.x/maven-settings/src/main/mdo/settings.mdo
Modified: maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo?rev=708871&r1=708870&r2=708871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo Wed Oct 29 03:58:50 2008
@@ -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(); )
@@ -2640,7 +2640,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(); )
@@ -2845,7 +2845,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(); )
@@ -3170,7 +3170,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(); )
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=708871&r1=708870&r2=708871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Wed Oct 29 03:58:50 2008
@@ -51,8 +51,8 @@
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;
import java.util.Map;
import java.util.Properties;
@@ -1150,7 +1150,7 @@
public static List mergeDependencyList( List child, List parent )
{
- Map depsMap = new HashMap();
+ Map depsMap = new LinkedHashMap();
if ( parent != null )
{
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java?rev=708871&r1=708870&r2=708871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java Wed Oct 29 03:58:50 2008
@@ -39,7 +39,6 @@
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;
@@ -411,7 +410,7 @@
}
else
{
- Map depsMap = new HashMap();
+ Map depsMap = new LinkedHashMap();
List deps = modelDepMgmt.getDependencies();
@@ -459,7 +458,7 @@
modelReporting.setOutputDirectory( profileReporting.getOutputDirectory() );
}
- Map mergedReportPlugins = new HashMap();
+ Map mergedReportPlugins = new LinkedHashMap();
Map profileReportersByKey = profileReporting.getReportPluginsAsMap();
@@ -527,7 +526,7 @@
recessive.setConfiguration( merge( dominantConfig, recessiveConfig ) );
- Map mergedReportSets = new HashMap();
+ Map mergedReportSets = new LinkedHashMap();
Map dominantReportSetsById = dominant.getReportSetsAsMap();
Modified: maven/components/branches/maven-2.0.x/maven-settings/src/main/mdo/settings.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/src/main/mdo/settings.mdo?rev=708871&r1=708870&r2=708871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-settings/src/main/mdo/settings.mdo (original)
+++ maven/components/branches/maven-2.0.x/maven-settings/src/main/mdo/settings.mdo Wed Oct 29 03:58:50 2008
@@ -377,7 +377,7 @@
{
if ( profileMap == null )
{
- profileMap = new java.util.HashMap();
+ profileMap = new java.util.LinkedHashMap();
if ( getProfiles() != null )
{