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 09:04:12 UTC
svn commit: r708817 - in /maven/components/branches/maven-2.0.10-RC:
maven-artifact/src/main/java/org/apache/maven/artifact/
maven-core/src/main/java/org/apache/maven/extension/
maven-project/src/main/java/org/apache/maven/project/
Author: brett
Date: Wed Oct 29 01:04:11 2008
New Revision: 708817
URL: http://svn.apache.org/viewvc?rev=708817&view=rev
Log:
[MNG-3805] Ordering of extension class path is indeterministic
Submitted by: Benjamin Bentmann
Modified:
maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?rev=708817&r1=708816&r2=708817&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java Wed Oct 29 01:04:11 2008
@@ -24,8 +24,8 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -75,7 +75,7 @@
public static Map artifactMapByVersionlessId( Collection artifacts )
{
- Map artifactMap = new HashMap();
+ Map artifactMap = new LinkedHashMap();
if ( artifacts != null )
{
@@ -92,7 +92,7 @@
public static Map artifactMapByArtifactId( Collection artifacts )
{
- Map artifactMap = new HashMap();
+ Map artifactMap = new LinkedHashMap();
if ( artifacts != null )
{
Modified: maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=708817&r1=708816&r2=708817&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Wed Oct 29 01:04:11 2008
@@ -23,8 +23,8 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.jar.JarFile;
@@ -121,9 +121,10 @@
// not declare plexus-utils but need it. MNG-2900
DefaultPluginManager.checkPlexusUtils( resolutionGroup, artifactFactory );
- Set dependencies = new HashSet( resolutionGroup.getArtifacts() );
+ Set dependencies = new LinkedHashSet();
dependencies.add( artifact );
+ dependencies.addAll( resolutionGroup.getArtifacts() );
// Make sure that we do not influence the dependenecy resolution of extensions with the project's
// dependencyManagement
Modified: maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=708817&r1=708816&r2=708817&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Oct 29 01:04:11 2008
@@ -89,7 +89,6 @@
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
@@ -1627,7 +1626,7 @@
List plugins )
throws ProjectBuildingException
{
- Set pluginArtifacts = new HashSet();
+ Set pluginArtifacts = new LinkedHashSet();
for ( Iterator i = plugins.iterator(); i.hasNext(); )
{
@@ -1670,7 +1669,7 @@
List reports )
throws ProjectBuildingException
{
- Set pluginArtifacts = new HashSet();
+ Set pluginArtifacts = new LinkedHashSet();
if ( reports != null )
{
@@ -1716,7 +1715,7 @@
List extensions )
throws ProjectBuildingException
{
- Set extensionArtifacts = new HashSet();
+ Set extensionArtifacts = new LinkedHashSet();
if ( extensions != null )
{