Skip to content

Commit 8d7ac1f

Browse files
committed
Merge branch 'main' into 4.0.x
2 parents 42a9edc + f68e5b3 commit 8d7ac1f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
import org.gradle.api.artifacts.Configuration;
2727
import org.gradle.api.artifacts.ModuleVersionIdentifier;
2828
import org.gradle.api.file.FileCollection;
29+
import org.gradle.api.provider.SetProperty;
2930
import org.gradle.api.tasks.Classpath;
31+
import org.gradle.api.tasks.Input;
3032
import org.gradle.api.tasks.TaskAction;
3133

3234
/**
@@ -47,6 +49,9 @@ public CheckClasspathForProhibitedDependencies() {
4749
getOutputs().upToDateWhen((task) -> true);
4850
}
4951

52+
@Input
53+
public abstract SetProperty<String> getPermittedGroups();
54+
5055
public void setClasspath(Configuration classpath) {
5156
this.classpath = classpath;
5257
}
@@ -75,8 +80,8 @@ public void checkForProhibitedDependencies() {
7580
}
7681

7782
private boolean prohibited(ModuleVersionIdentifier id) {
78-
return PROHIBITED_GROUPS.contains(id.getGroup()) || prohibitedJavax(id) || prohibitedSlf4j(id)
79-
|| prohibitedJbossSpec(id);
83+
return (!getPermittedGroups().get().contains(id.getGroup())) && (PROHIBITED_GROUPS.contains(id.getGroup())
84+
|| prohibitedJavax(id) || prohibitedSlf4j(id) || prohibitedJbossSpec(id));
8085
}
8186

8287
private boolean prohibitedSlf4j(ModuleVersionIdentifier id) {

0 commit comments

Comments
 (0)