You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2024/10/15 12:26:21 UTC

(maven) branch master updated: [MNG-8295] Dependency Manager Transitivity (now default) handles dependency management inconsistently (#1788)

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new d742fd624c [MNG-8295] Dependency Manager Transitivity (now default) handles dependency management inconsistently (#1788)
d742fd624c is described below

commit d742fd624c2c8f2ed1c4dad6d6f741c28591dd9a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Oct 15 14:26:16 2024 +0200

    [MNG-8295] Dependency Manager Transitivity (now default) handles dependency management inconsistently (#1788)
    
    Actually use TransitiveDependencyManager when maven.resolver.dependencyManagerTransitivity=true
    
    Co-authored-by: DidierLoiseau <di...@gmail.com>
---
 .../maven/internal/impl/resolver/MavenSessionBuilderSupplier.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java
index 8b79d2bbae..cadf317de9 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java
@@ -43,6 +43,7 @@ import org.eclipse.aether.internal.impl.scope.ScopeManagerImpl;
 import org.eclipse.aether.resolution.ArtifactDescriptorPolicy;
 import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry;
 import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
 import org.eclipse.aether.util.graph.selector.AndDependencySelector;
 import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
 import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
@@ -84,7 +85,10 @@ public class MavenSessionBuilderSupplier implements Supplier<SessionBuilder> {
     }
 
     public DependencyManager getDependencyManager(boolean transitive) {
-        return new ClassicDependencyManager(transitive, getScopeManager());
+        if (transitive) {
+            return new TransitiveDependencyManager(getScopeManager());
+        }
+        return new ClassicDependencyManager(getScopeManager());
     }
 
     protected DependencySelector getDependencySelector() {