Browse Source

Merge branch '6.0.x' into 6.1.x

pull/14062/head
Marcus Hert Da Coregio 2 years ago
parent
commit
aa6577da92
  1. 2
      buildSrc/src/main/java/org/springframework/gradle/classpath/CheckClasspathForProhibitedDependencies.java

2
buildSrc/src/main/java/org/springframework/gradle/classpath/CheckClasspathForProhibitedDependencies.java

@ -55,7 +55,7 @@ public class CheckClasspathForProhibitedDependencies extends DefaultTask {
@TaskAction @TaskAction
public void checkForProhibitedDependencies() throws IOException { public void checkForProhibitedDependencies() throws IOException {
ResolvedConfiguration resolvedConfiguration = this.classpath.getResolvedConfiguration(); ResolvedConfiguration resolvedConfiguration = this.classpath.getResolvedConfiguration();
TreeSet<String> prohibited = resolvedConfiguration.getResolvedArtifacts().stream() TreeSet<String> prohibited = resolvedConfiguration.getLenientConfiguration().getArtifacts().stream()
.map((artifact) -> artifact.getModuleVersion().getId()).filter(this::prohibited) .map((artifact) -> artifact.getModuleVersion().getId()).filter(this::prohibited)
.map((id) -> id.getGroup() + ":" + id.getName()).collect(Collectors.toCollection(TreeSet::new)); .map((id) -> id.getGroup() + ":" + id.getName()).collect(Collectors.toCollection(TreeSet::new));
if (!prohibited.isEmpty()) { if (!prohibited.isEmpty()) {

Loading…
Cancel
Save