Fix review comments

subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/builder/DependencyState.java

@@ -33,7 +33,10 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.ComponentSelectionReasons.*;
+import static org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.ComponentSelectionReasons.BY_ANCESTOR;
+import static org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.ComponentSelectionReasons.CONSTRAINT;
+import static org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.ComponentSelectionReasons.FORCED;
+import static org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.ComponentSelectionReasons.REQUESTED;
 
 class DependencyState {
     private final ComponentSelector requested;

subprojects/docs/src/docs/release/notes.md

@@ -77,10 +77,10 @@ See the documentation for more information on [Gradle Module Metadata generation
 
 ## Variant-aware dependency substitution rules
 
-Gradle now supports substitution of dependencies with classifiers, attributes or capabilities.
-Previously, it wasn't possible for Gradle to substitute a dependency which uses a classifier with a dependency that didn't, nor was it possible to substitute a dependency _without_ classifier with a classified dependency.
+Previously, it wasn't possible for Gradle to substitute a dependency which uses a classifier with a dependency without classifier, nor was it possible to substitute a dependency _without_ classifier with a classified dependency.
 Similarly, dependencies with attributes (typically "platform" dependencies) or capabilities (typically "test fixtures" dependencies) could not be substituted.
 
+Gradle now supports substitution of dependencies with classifiers, attributes or capabilities.
 Gradle's dependency substitution API has been enriched to cover those cases.
 
 See the documentation on [variant-aware substitution](userguide/file:///home/cchampeau/DEV/PROJECTS/GITHUB/gradle/subprojects/docs/build/working/usermanual/render-multi/resolution_rules.html#sec:variant_aware_substitutions) for details.

subprojects/docs/src/docs/userguide/dep-man/03-controlling-transitive-dependencies/resolution_rules.adoc

@@ -190,7 +190,7 @@ Gradle's dependency management engine is <<variant_model.adoc#understanding-vari
 
 What to select is determined by the attributes of the consumer configuration and the attributes of the variants found on the producer side.
 It is, however, possible that some specific dependencies override attributes from the configuration itself.
-This is typically the case when using the <<java_platform_plugin.adoc#java_platform_plugin,Java Platform plugin>>: this plugin builds a special kind of component which is called a "platform" and can be addressed by setting the component category attribute to "platform", in opposition to typical dependencies which are targetting libraries.
+This is typically the case when using the <<java_platform_plugin.adoc#java_platform_plugin,Java Platform plugin>>: this plugin builds a special kind of component which is called a "platform" and can be addressed by setting the component category attribute to `platform`, in opposition to typical dependencies which are targetting libraries.
 
 Therefore, you may face situations where you want to substitute a platform dependency with a regular dependency, or the other way around.