Skip to content

Commit 9c21863

Browse files
committed
[MNG-7020] Remove Maven 2 WagonExcluder backward compat code
This closes #394
1 parent 7f63dac commit 9c21863

File tree

3 files changed

+1
-265
lines changed

3 files changed

+1
-265
lines changed

maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.eclipse.aether.artifact.DefaultArtifact;
4444
import org.eclipse.aether.collection.CollectRequest;
4545
import org.eclipse.aether.collection.DependencyCollectionException;
46-
import org.eclipse.aether.collection.DependencySelector;
4746
import org.eclipse.aether.graph.DependencyFilter;
4847
import org.eclipse.aether.graph.DependencyNode;
4948
import org.eclipse.aether.graph.DependencyVisitor;
@@ -59,7 +58,6 @@
5958
import org.eclipse.aether.util.filter.AndDependencyFilter;
6059
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
6160
import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
62-
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
6361
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
6462

6563
/**
@@ -173,11 +171,8 @@ private DependencyNode resolveInternal( Plugin plugin, Artifact pluginArtifact,
173171

174172
try
175173
{
176-
DependencySelector selector =
177-
AndDependencySelector.newInstance( session.getDependencySelector(), new WagonExcluder() );
178-
179174
DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session );
180-
pluginSession.setDependencySelector( selector );
175+
pluginSession.setDependencySelector( session.getDependencySelector() );
181176
pluginSession.setDependencyGraphTransformer( session.getDependencyGraphTransformer() );
182177

183178
CollectRequest request = new CollectRequest();

maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java

Lines changed: 0 additions & 150 deletions
This file was deleted.

maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)