Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20472 from dreis2211

Browse Source 
* gh-20472:
  Improve unused exclusion detection and remove those that are unused

Closes gh-20472
This commit is contained in:
Andy Wilkinson 2020-03-10 20:36:10 +00:00
commit d9d6cb6f1f
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java
View File

@ -69,9 +69,14 @@ public class CheckBom extends DefaultTask {
.collect(Collectors.toSet());
Set<String> unused = new TreeSet<>();
for (String exclusion : exclusions) {
if (!resolved.contains(exclusion) && exclusion.endsWith(":*")) {
String group = exclusion.substring(0, exclusion.indexOf(':') + 1);
if (resolved.stream().noneMatch((candidate) -> candidate.startsWith(group))) {
if (!resolved.contains(exclusion)) {
if (exclusion.endsWith(":*")) {
String group = exclusion.substring(0, exclusion.indexOf(':') + 1);
if (resolved.stream().noneMatch((candidate) -> candidate.startsWith(group))) {
unused.add(exclusion);
}
}
else {
unused.add(exclusion);
}
}

30
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1526,13 +1526,9 @@ bom {
"selenium-ie-driver",
"selenium-java",
"selenium-opera-driver",
"selenium-remote-driver" {
exclude group: "commons-logging", module: "commons-logging"
},
"selenium-remote-driver",
"selenium-safari-driver",
"selenium-support" {
exclude group: "commons-logging", module: "commons-logging"
}
"selenium-support"
]
}
}
@ -1643,12 +1639,6 @@ bom {
}
library("Spring Integration", "5.3.0.M2") {
group("org.springframework.integration") {
modules = [
"spring-integration-http" {
exclude group: "commons-logging", module: "commons-logging"
exclude group: "commons-logging", module: "commons-logging-api"
}
]
imports = [
"spring-integration-bom"
]
@ -1709,18 +1699,10 @@ bom {
library("Spring WS", "3.0.8.RELEASE") {
group("org.springframework.ws") {
modules = [
"spring-ws-core" {
exclude group: "commons-logging", module: "commons-logging"
},
"spring-ws-security" {
exclude group: "commons-logging", module: "commons-logging"
},
"spring-ws-support" {
exclude group: "commons-logging", module: "commons-logging"
},
"spring-ws-test" {
exclude group: "commons-logging", module: "commons-logging"
},
"spring-ws-core",
"spring-ws-security",
"spring-ws-support",
"spring-ws-test",
"spring-xml"
]
}