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 10:25:20 UTC
svn commit: r708844 - in /maven/components/branches/maven-2.1.x:
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 02:25:19 2008
New Revision: 708844
URL: http://svn.apache.org/viewvc?rev=708844&view=rev
Log:
[MNG-3805] Ordering of extension class path is indeterministic
Submitted by: Benjamin Bentmann
Merged from: r708817
Modified:
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?rev=708844&r1=708843&r2=708844&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java Wed Oct 29 02:25:19 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.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=708844&r1=708843&r2=708844&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Wed Oct 29 02:25:19 2008
@@ -58,6 +58,7 @@
import java.io.InputStreamReader;
import java.util.Collections;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.jar.JarFile;
@@ -121,12 +122,14 @@
Set rgArtifacts = resolutionGroup.getArtifacts();
rgArtifacts = DefaultPluginManager.checkPlexusUtils( rgArtifacts, artifactFactory );
- rgArtifacts.add( artifact );
+ Set dependencies = new LinkedHashSet();
+ dependencies.add( artifact );
+ dependencies.addAll( rgArtifacts );
// Make sure that we do not influence the dependenecy resolution of extensions with the project's
// dependencyManagement
- ArtifactResolutionResult result = artifactResolver.resolveTransitively( rgArtifacts, project.getArtifact(),
+ ArtifactResolutionResult result = artifactResolver.resolveTransitively( dependencies, project.getArtifact(),
Collections.EMPTY_MAP,
//project.getManagedVersionMap(),
localRepository,
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=708844&r1=708843&r2=708844&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Oct 29 02:25:19 2008
@@ -1655,7 +1655,7 @@
List plugins )
throws ProjectBuildingException
{
- Set pluginArtifacts = new HashSet();
+ Set pluginArtifacts = new LinkedHashSet();
for ( Iterator i = plugins.iterator(); i.hasNext(); )
{
@@ -1698,7 +1698,7 @@
List reports )
throws ProjectBuildingException
{
- Set pluginArtifacts = new HashSet();
+ Set pluginArtifacts = new LinkedHashSet();
if ( reports != null )
{
@@ -1744,7 +1744,7 @@
List extensions )
throws ProjectBuildingException
{
- Set extensionArtifacts = new HashSet();
+ Set extensionArtifacts = new LinkedHashSet();
if ( extensions != null )
{