svn commit: r544249 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java

[jvanzyl]

Author: jvanzyl
Date: Mon Jun  4 13:28:04 2007
New Revision: 544249

URL: http://svn.apache.org/viewvc?view=rev&rev=544249
Log:
MNG-2934 Extensions should not be affected by the project's dependency 
resolution

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?view=diff&rev=544249&r1=544248&r2=544249
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
 Mon Jun  4 13:28:04 2007
@@ -46,7 +46,6 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Used to locate extensions.
@@ -100,7 +99,7 @@
 
         Artifact projectArtifact = artifactFactory.createProjectArtifact( 
groupId, artifactId, version );
 
-        addExtension( extensionArtifact, projectArtifact, 
Collections.EMPTY_MAP, remoteRepositories, localRepository, null );
+        addExtension( extensionArtifact, projectArtifact, remoteRepositories, 
localRepository, null );
     }
 
     public void addExtension( Extension extension,
@@ -114,13 +113,12 @@
 
         Artifact artifact = (Artifact) project.getExtensionArtifactMap().get( 
extensionId );
 
-        addExtension( artifact, project.getArtifact(), 
project.getManagedVersionMap(), project.getRemoteArtifactRepositories(),
+        addExtension( artifact, project.getArtifact(), 
project.getRemoteArtifactRepositories(),
                       localRepository, new ActiveArtifactResolver( project ) );
     }
 
     private void addExtension( Artifact extensionArtifact,
                                Artifact projectArtifact,
-                               Map managedVersionMap,
                                List remoteRepositories,
                                ArtifactRepository localRepository, 
ActiveArtifactResolver activeArtifactResolver )
         throws ArtifactResolutionException, PlexusContainerException, 
ArtifactNotFoundException
@@ -134,7 +132,7 @@
 
             ArtifactResolutionResult result =
                 artifactResolver.resolveTransitively( Collections.singleton( 
extensionArtifact ), projectArtifact,
-                                                      managedVersionMap, 
localRepository, remoteRepositories,
+                                                      Collections.EMPTY_MAP, 
localRepository, remoteRepositories,
                                                       artifactMetadataSource, 
filter );
 
             for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )