Repository: maven-resolver Updated Branches: refs/heads/master bec698b6d -> 7d270dae8
[MRESOLVER-8] Direct dependencies incorrectly detected as transitive. This reverts commit e391a27ab3609fc63a625bbe3a25401af6ec02ef and commit 5907bd44682925d8ea795fcb63c39d268157a632 partially. 'ScopeDependencySelector' is behaving the same way it did in pre 1.2.0 again. That's been the issue introduced by me months ago. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/7d270dae Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/7d270dae Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/7d270dae Branch: refs/heads/master Commit: 7d270dae8f72d14376fffd46652a629e2446ae0e Parents: bec698b Author: Christian Schulte <schu...@apache.org> Authored: Mon Nov 14 02:37:48 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Mon Nov 14 02:44:28 2016 +0100 ---------------------------------------------------------------------- .../DefaultDependencyCollectionContext.java | 23 +------------------- .../impl/DefaultDependencyCollector.java | 8 ++----- 2 files changed, 3 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7d270dae/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java ---------------------------------------------------------------------- diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java index e8dd829..1ad6cc7 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java @@ -19,7 +19,6 @@ package org.eclipse.aether.internal.impl; * under the License. */ -import java.util.ArrayList; import java.util.List; import org.eclipse.aether.RepositorySystemSession; @@ -31,7 +30,7 @@ import org.eclipse.aether.graph.Dependency; * @see DefaultDependencyCollector */ final class DefaultDependencyCollectionContext - implements DependencyCollectionContext, Cloneable + implements DependencyCollectionContext { private final RepositorySystemSession session; @@ -84,24 +83,4 @@ final class DefaultDependencyCollectionContext return String.valueOf( getDependency() ); } - /** - * @since 1.2.0 - */ - @Override - public DefaultDependencyCollectionContext clone() - { - try - { - final DefaultDependencyCollectionContext clone = (DefaultDependencyCollectionContext) super.clone(); - clone.managedDependencies = clone.managedDependencies != null - ? new ArrayList<>( clone.managedDependencies ) - : null; - - return clone; - } - catch ( final CloneNotSupportedException e ) - { - throw new AssertionError( e ); - } - } } http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7d270dae/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 c68eb86..2d76f92 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 @@ -476,10 +476,8 @@ public class DefaultDependencyCollector DependencyTraverser depTraverser, VersionFilter verFilter, Dependency d, ArtifactDescriptorResult descriptorResult, DefaultDependencyNode child ) { - final DefaultDependencyCollectionContext savedContext = args.collectionContext; - args.collectionContext = args.collectionContext.clone(); - args.collectionContext.set( d, descriptorResult.getManagedDependencies() ); DefaultDependencyCollectionContext context = args.collectionContext; + context.set( d, descriptorResult.getManagedDependencies() ); DependencySelector childSelector = depSelector != null ? depSelector.deriveChildSelector( context ) : null; DependencyManager childManager = depManager != null ? depManager.deriveChildManager( context ) : null; @@ -510,8 +508,6 @@ public class DefaultDependencyCollector { child.setChildren( children ); } - - args.collectionContext = savedContext; } private ArtifactDescriptorResult getArtifactDescriptorResult( Args args, Results results, boolean noDescriptor, @@ -698,7 +694,7 @@ public class DefaultDependencyCollector final NodeStack nodes; - DefaultDependencyCollectionContext collectionContext; + final DefaultDependencyCollectionContext collectionContext; final DefaultVersionFilterContext versionContext;
