Skip to content

Commit cea9d1d

Browse files
committed
Fix Spring Framework BOM
This commit reinstates the Spring Framework BOM, which was previously empty because of a previous change in 41cbc46. This change also removes the JSR305 dependency from the BOM, which does not belong here since it is not an artifact produced by Spring. Issue: SPR-15885
1 parent af7673d commit cea9d1d

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ configure(allprojects) { project ->
135135
}
136136

137137
dependencies {
138-
provided("com.google.code.findbugs:jsr305:3.0.2")
139138
testCompile("junit:junit:4.12") {
140139
exclude group:'org.hamcrest', module:'hamcrest-core'
141140
}
@@ -223,6 +222,12 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
223222
}
224223
}
225224

225+
configure(moduleProjects) {
226+
dependencies {
227+
provided("com.google.code.findbugs:jsr305:3.0.2")
228+
}
229+
}
230+
226231
configure(rootProject) {
227232
description = "Spring Framework"
228233

spring-framework-bom/spring-framework-bom.gradle

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,23 @@ install {
1616
repositories.mavenInstaller {
1717
pom.whenConfigured {
1818
packaging = "pom"
19+
withXml {
20+
asNode().children().last() + {
21+
delegate.dependencyManagement {
22+
delegate.dependencies {
23+
parent.subprojects.sort { "$it.name" }.each { p ->
24+
if (p != project) {
25+
delegate.dependency {
26+
delegate.groupId(p.group)
27+
delegate.artifactId(p.name)
28+
delegate.version(p.version)
29+
}
30+
}
31+
}
32+
}
33+
}
34+
}
35+
}
1936
}
2037
}
2138
}

0 commit comments

Comments
 (0)