svn commit: r899004 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java

[bentmann]

Author: bentmann
Date: Thu Jan 14 00:09:12 2010
New Revision: 899004

URL: http://svn.apache.org/viewvc?rev=899004&view=rev
Log:
[MNG-4528] [regression] mvn deploy ignores proxy settings

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java?rev=899004&r1=899003&r2=899004&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
 Thu Jan 14 00:09:12 2010
@@ -47,6 +47,7 @@
 import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
 import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.classrealm.ClassRealmManager;
 import org.apache.maven.execution.MavenSession;
@@ -441,6 +442,19 @@
 
         ArtifactFilter collectionFilter = new ScopeArtifactFilter( 
Artifact.SCOPE_RUNTIME_PLUS_SYSTEM );
 
+        /*
+         * NOTE: This is a hack to support maven-deploy-plugin:[2.2.1,2.4] 
which has dependencies on old/buggy wagons.
+         * Under our class loader hierarchy those would take precedence over 
the wagons from the distro, causing grief
+         * due to their bugs (e.g. MNG-4528).
+         */
+        if ( "maven-deploy-plugin".equals( plugin.getArtifactId() )
+            && "org.apache.maven.plugins".equals( plugin.getGroupId() ) )
+        {
+            collectionFilter =
+                new AndArtifactFilter( Arrays.asList( collectionFilter,
+                                                      new ExclusionSetFilter( 
new String[] { "maven-core" } ) ) );
+        }
+
         ArtifactFilter resolutionFilter = 
artifactFilterManager.getCoreArtifactFilter();
 
         if ( dependencyFilter != null )