From e8ec49b4c5d9fb3d9fb30e7503ad8439491ebe41 Mon Sep 17 00:00:00 2001 From: Marcus Hert Da Coregio Date: Mon, 30 Oct 2023 14:46:12 -0300 Subject: [PATCH] Resolve versions without downloading dependencies Issue gh-14047 --- .../VerifyDependenciesVersionsPlugin.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/security/convention/versions/VerifyDependenciesVersionsPlugin.java b/buildSrc/src/main/java/org/springframework/security/convention/versions/VerifyDependenciesVersionsPlugin.java index b289a414310..6b065ef3061 100644 --- a/buildSrc/src/main/java/org/springframework/security/convention/versions/VerifyDependenciesVersionsPlugin.java +++ b/buildSrc/src/main/java/org/springframework/security/convention/versions/VerifyDependenciesVersionsPlugin.java @@ -19,13 +19,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import org.gradle.api.DefaultTask; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; -import org.gradle.api.artifacts.ModuleVersionIdentifier; import org.gradle.api.plugins.JavaBasePlugin; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskProvider; @@ -90,13 +90,18 @@ public void verify() { } private Map> getDependencies(List configurations) { - return configurations.stream().flatMap((configuration) -> { - return configuration.getResolvedConfiguration().getLenientConfiguration().getArtifacts().stream() + return configurations.stream() + .flatMap((configuration) -> { + return configuration.getIncoming().getResolutionResult().getAllDependencies().stream() .map((dep) -> { - ModuleVersionIdentifier id = dep.getModuleVersion().getId(); - return new Artifact(id.getName(), id.getVersion(), configuration.toString()); + String[] nameParts = dep.getRequested().getDisplayName().split(":"); + if (nameParts.length > 2) { + return new Artifact(nameParts[1], nameParts[2], configuration.toString()); + } + return null; }); }) + .filter(Objects::nonNull) .distinct() .collect(Collectors.groupingBy(Artifact::name)); }