Repository: maven-resolver Updated Branches: refs/heads/master 763cac233 -> 8cec8a788
[MRESOLVER-9] DefaultDependencyCollector does not correctly handle dependency management. [MNG-6139] Addition of command line option 'legacy-dependency-management'. This reverts commit 763cac233d37e2240e43dfaf72023ba1f8ffd139. There will be no such command line option following the discussion on dev@. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/8cec8a78 Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/8cec8a78 Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/8cec8a78 Branch: refs/heads/master Commit: 8cec8a788c59fd62a2c8486073412f5b3efd47a5 Parents: 763cac2 Author: Christian Schulte <schu...@apache.org> Authored: Sat Dec 31 19:24:17 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Sat Dec 31 19:45:43 2016 +0100 ---------------------------------------------------------------------- .../aether/internal/impl/DefaultDependencyCollector.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/8cec8a78/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 aaf5865..0c98ef4 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,22 +369,13 @@ 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 ( args.session.getData().get( "maven.legacyDependencyManagement" ) == null - && depSelector != null && !depSelector.selectDependency( dependency ) ) + if ( depSelector != null && !depSelector.selectDependency( dependency ) ) { - // Corrected behaviour after MRESOLVER-9. return; }
