From 8b4623653c1d842114984d529cf1028d3fb6b2ca Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 1 Aug 2025 06:57:06 +0100 Subject: [PATCH] Simplify code by making of us shouldResolveConsistentlyWith Closes gh-46642 --- .../boot/gradle/plugin/JavaPluginAction.java | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java index 9a90b95d244..c40bdfa8a1f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java @@ -20,17 +20,12 @@ import java.io.File; import java.util.List; import java.util.Set; import java.util.concurrent.Callable; -import java.util.stream.Stream; import org.gradle.api.Action; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.Task; import org.gradle.api.artifacts.Configuration; -import org.gradle.api.artifacts.DependencyConstraint; -import org.gradle.api.artifacts.component.ModuleComponentIdentifier; -import org.gradle.api.artifacts.dsl.DependencyConstraintHandler; -import org.gradle.api.artifacts.result.ResolvedArtifactResult; import org.gradle.api.attributes.Attribute; import org.gradle.api.attributes.AttributeContainer; import org.gradle.api.file.FileCollection; @@ -297,26 +292,7 @@ final class JavaPluginAction implements PluginApplicationAction { productionRuntimeClasspath.setExtendsFrom(runtimeClasspath.getExtendsFrom()); productionRuntimeClasspath.setCanBeResolved(runtimeClasspath.isCanBeResolved()); productionRuntimeClasspath.setCanBeConsumed(runtimeClasspath.isCanBeConsumed()); - productionRuntimeClasspath.getDependencyConstraints() - .addAllLater(project.getProviders().provider(() -> constraintsFrom(runtimeClasspath, project))); - } - - private Iterable constraintsFrom(Configuration configuration, Project project) { - DependencyConstraintHandler constraints = project.getDependencies().getConstraints(); - return resolvedArtifactsOf(configuration).map((artifact) -> artifact.getId().getComponentIdentifier()) - .filter(ModuleComponentIdentifier.class::isInstance) - .map(ModuleComponentIdentifier.class::cast) - .map(this::asConstraintNotation) - .map(constraints::create) - .toList(); - } - - private Stream resolvedArtifactsOf(Configuration configuration) { - return configuration.getIncoming().getArtifacts().getArtifacts().stream(); - } - - private String asConstraintNotation(ModuleComponentIdentifier identifier) { - return "%s:%s:%s".formatted(identifier.getGroup(), identifier.getModule(), identifier.getVersion()); + productionRuntimeClasspath.shouldResolveConsistentlyWith(runtimeClasspath); } private void configureDevelopmentOnlyConfiguration(Project project) {