From 1de1ce1fdc50a8574a6b0e32ce4adc8389fcf73a Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sat, 25 Mar 2017 23:01:03 +0100 Subject: [PATCH] [MNG-2893] Update the DefaultPluginManager to not use a project depMan for controlling it's transitive dependencies --- .../plugin/internal/DefaultPluginDependenciesResolver.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java index b79b15f264b7..28dfb054a9f0 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java @@ -54,6 +54,7 @@ import org.eclipse.aether.util.artifact.JavaScopes; import org.eclipse.aether.util.filter.AndDependencyFilter; import org.eclipse.aether.util.filter.ScopeDependencyFilter; +import org.eclipse.aether.util.graph.manager.ClassicDependencyManager; import org.eclipse.aether.util.graph.selector.AndDependencySelector; import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer; import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy; @@ -178,6 +179,7 @@ private DependencyNode resolveInternal( Plugin plugin, Artifact pluginArtifact, DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session ); pluginSession.setDependencySelector( selector ); pluginSession.setDependencyGraphTransformer( transformer ); + pluginSession.setDependencyManager( new ClassicDependencyManager() ); CollectRequest request = new CollectRequest(); request.setRequestContext( REPOSITORY_CONTEXT ); @@ -192,6 +194,7 @@ private DependencyNode resolveInternal( Plugin plugin, Artifact pluginArtifact, pluginDep = pluginDep.setScope( JavaScopes.RUNTIME ); } request.addDependency( pluginDep ); + request.addManagedDependency( pluginDep ); } DependencyRequest depRequest = new DependencyRequest( request, resolutionFilter );