Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x' into 6.1.x

This commit is contained in:
Marcus Hert Da Coregio 2023-10-30 14:47:24 -03:00
parent aa6577da92 3826a5e986
commit bbf687c0ac
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
buildSrc/src/main/java/org/springframework/security/convention/versions/VerifyDependenciesVersionsPlugin.java
View File

@ -19,13 +19,13 @@ package org.springframework.security.convention.versions;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.gradle.api.DefaultTask; import org.gradle.api.DefaultTask;
import org.gradle.api.Plugin; import org.gradle.api.Plugin;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.ModuleVersionIdentifier;
import org.gradle.api.plugins.JavaBasePlugin; import org.gradle.api.plugins.JavaBasePlugin;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;
import org.gradle.api.tasks.TaskProvider; import org.gradle.api.tasks.TaskProvider;
@ -90,13 +90,18 @@ public class VerifyDependenciesVersionsPlugin implements Plugin<Project> {
} }
private Map<String, List<Artifact>> getDependencies(List<Configuration> configurations) { private Map<String, List<Artifact>> getDependencies(List<Configuration> configurations) {
return configurations.stream().flatMap((configuration) -> { return configurations.stream()
return configuration.getResolvedConfiguration().getLenientConfiguration().getArtifacts().stream() .flatMap((configuration) -> {
return configuration.getIncoming().getResolutionResult().getAllDependencies().stream()
.map((dep) -> { .map((dep) -> {
ModuleVersionIdentifier id = dep.getModuleVersion().getId(); String[] nameParts = dep.getRequested().getDisplayName().split(":");
return new Artifact(id.getName(), id.getVersion(), configuration.toString()); if (nameParts.length > 2) {
return new Artifact(nameParts[1], nameParts[2], configuration.toString());
}
return null;
}); });
}) })
.filter(Objects::nonNull)
.distinct() .distinct()
.collect(Collectors.groupingBy(Artifact::name)); .collect(Collectors.groupingBy(Artifact::name));
} }