From f68e5b36afce90fb4300fb44bc0ef9f75359c5bf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 Jun 2025 11:07:52 +0100 Subject: [PATCH] Allow group that is prohibited by default to be permitted Closes gh-45920 --- .../CheckClasspathForProhibitedDependencies.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java b/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java index 70d39f0194..72acde870a 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java @@ -26,7 +26,9 @@ import org.gradle.api.Task; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.ModuleVersionIdentifier; import org.gradle.api.file.FileCollection; +import org.gradle.api.provider.SetProperty; import org.gradle.api.tasks.Classpath; +import org.gradle.api.tasks.Input; import org.gradle.api.tasks.TaskAction; /** @@ -47,6 +49,9 @@ public abstract class CheckClasspathForProhibitedDependencies extends DefaultTas getOutputs().upToDateWhen((task) -> true); } + @Input + public abstract SetProperty getPermittedGroups(); + public void setClasspath(Configuration classpath) { this.classpath = classpath; } @@ -75,8 +80,8 @@ public abstract class CheckClasspathForProhibitedDependencies extends DefaultTas } private boolean prohibited(ModuleVersionIdentifier id) { - return PROHIBITED_GROUPS.contains(id.getGroup()) || prohibitedJavax(id) || prohibitedSlf4j(id) - || prohibitedJbossSpec(id); + return (!getPermittedGroups().get().contains(id.getGroup())) && (PROHIBITED_GROUPS.contains(id.getGroup()) + || prohibitedJavax(id) || prohibitedSlf4j(id) || prohibitedJbossSpec(id)); } private boolean prohibitedSlf4j(ModuleVersionIdentifier id) {