You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/12/21 16:44:02 UTC
maven-resolver git commit: [MRESOLVER-9] DefaultDependencyCollector
does not correctly handle dependency management.
Repository: maven-resolver
Updated Branches:
refs/heads/master c888bce75 -> 763cac233
[MRESOLVER-9] DefaultDependencyCollector does not correctly handle dependency management.
o Updated to allow disabling the fix externally by providing a
'maven.legacyDependencyManagement' key in the session data.
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/763cac23
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/763cac23
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/763cac23
Branch: refs/heads/master
Commit: 763cac233d37e2240e43dfaf72023ba1f8ffd139
Parents: c888bce
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Dec 21 17:41:30 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Dec 21 17:41:30 2016 +0100
----------------------------------------------------------------------
.../aether/internal/impl/DefaultDependencyCollector.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/763cac23/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
index 0c98ef4..aaf5865 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
@@ -369,13 +369,22 @@ public class DefaultDependencyCollector
DependencyTraverser depTraverser, VersionFilter verFilter, Dependency dependency,
List<Artifact> relocations, boolean disableVersionManagement )
{
+ if ( args.session.getData().get( "maven.legacyDependencyManagement" ) != null
+ && depSelector != null && !depSelector.selectDependency( dependency ) )
+ {
+ // Legacy behaviour before MRESOLVER-9.
+ return;
+ }
+
PremanagedDependency preManaged =
PremanagedDependency.create( depManager, dependency, disableVersionManagement, args.premanagedState );
dependency = preManaged.managedDependency;
- if ( depSelector != null && !depSelector.selectDependency( dependency ) )
+ if ( args.session.getData().get( "maven.legacyDependencyManagement" ) == null
+ && depSelector != null && !depSelector.selectDependency( dependency ) )
{
+ // Corrected behaviour after MRESOLVER-9.
return;
}