Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 4.0.x

Browse Source
This commit is contained in:
Andy Wilkinson
2025-06-12 12:59:30 +01:00
parent 42a9edc0e8 f68e5b36af
commit 8d7ac1f3f0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java
View File

@@ -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<String> 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) {