diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java index a9f4a00719ad567d6728d47ee27ee1efa979c937..57d91d85dc59bc3e28f9444d0c6dbbd37d5074ab 100644 --- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java +++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java @@ -954,19 +954,7 @@ public final class ConflictResolver } /** - * Gets the original scope of the winning dependency, not to be confused with {@link #getScope()} which returns - * the effective scope. - * - * @return The original scope of the winning dependency or {@code null} if no winner has been selected yet. - */ - public String getWinnerScope() - { - return ( winner != null ) ? winner.node.getDependency().getScope() : null; - } - - /** - * Gets the effective scope of the winning dependency, not to be confused with {@link #getWinnerScope()} which - * returns the original scope. + * Gets the effective scope of the winning dependency. * * @return The effective scope of the winning dependency or {@code null} if not set yet. */ diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java index 48b64d033198fd18e8ac5ecae357d7fcb56139ee..17db0040fa7d908777e3f6ef9963f139020dcc21 100644 --- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java +++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java @@ -40,7 +40,7 @@ public final class JavaScopeSelector public void selectScope( ConflictContext context ) throws RepositoryException { - String scope = context.getWinnerScope(); + String scope = context.getWinner().getDependency().getScope(); if ( !JavaScopes.SYSTEM.equals( scope ) ) { scope = chooseEffectiveScope( context.getItems() );