[MNG-7020] Remove Maven 2 WagonExcluder backward compat code

This closes #394
apache · Dec 29, 2020 · bfd2bff · bfd2bff
1 parent c79682b
commit bfd2bff
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 265 deletions.
diff --git a/...ore/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/...ore/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -43,7 +43,6 @@
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
 import org.eclipse.aether.collection.DependencyCollectionException;
-import org.eclipse.aether.collection.DependencySelector;
 import org.eclipse.aether.graph.DependencyFilter;
 import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.graph.DependencyVisitor;
@@ -59,7 +58,6 @@
 import org.eclipse.aether.util.filter.AndDependencyFilter;
 import org.eclipse.aether.util.filter.ScopeDependencyFilter;
 import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
-import org.eclipse.aether.util.graph.selector.AndDependencySelector;
 import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
 
 /**
@@ -173,11 +171,8 @@ private DependencyNode resolveInternal( Plugin plugin, Artifact pluginArtifact,
 
         try
         {
-            DependencySelector selector =
-                AndDependencySelector.newInstance( session.getDependencySelector(), new WagonExcluder() );
-
             DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session );
-            pluginSession.setDependencySelector( selector );
+            pluginSession.setDependencySelector( session.getDependencySelector() );
             pluginSession.setDependencyGraphTransformer( session.getDependencyGraphTransformer() );
 
             CollectRequest request = new CollectRequest();

diff --git a/...re/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java b/...re/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java