Author: jvanzyl
Date: Mon Jun  4 13:01:11 2007
New Revision: 544233

URL: http://svn.apache.org/viewvc?view=rev&rev=544233
Log:
MNG-2934 Fixing extension dependency resolution. Extension dependency 
resolution should not be influenced by the dependencies of the project.

Modified:
    
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java

Modified: 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?view=diff&rev=544233&r1=544232&r2=544233
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
 Mon Jun  4 13:01:11 2007
@@ -115,8 +115,12 @@
 
             dependencies.add( artifact );
 
+            // Make sure that we do not influence the dependenecy resolution 
of extensions with the project's
+            // dependencyManagement
+
             ArtifactResolutionResult result = 
artifactResolver.resolveTransitively( dependencies, project.getArtifact(),
-                                                                               
     project.getManagedVersionMap(),
+                                                                               
     Collections.EMPTY_MAP,
+                                                                               
     //project.getManagedVersionMap(),
                                                                                
     localRepository,
                                                                                
     project.getRemoteArtifactRepositories(),
                                                                                
     artifactMetadataSource, filter );
@@ -184,6 +188,11 @@
 
                     extensionContainer.addJarResource( a.getFile() );
                 }
+            }
+
+            if ( getLogger().isDebugEnabled() )
+            {
+                extensionContainer.getContainerRealm().display();
             }
         }
     }


Reply via email to