Fix Spring Framework BOM

This commit reinstates the Spring Framework BOM, which was previously
empty because of a previous change in 41cbc4670f.
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
This commit is contained in:
Brian Clozel 2017-08-22 16:04:23 +02:00
parent af7673dda7
commit cea9d1db8e
2 changed files with 23 additions and 1 deletions

View File

@ -135,7 +135,6 @@ configure(allprojects) { project ->
} }
dependencies { dependencies {
provided("com.google.code.findbugs:jsr305:3.0.2")
testCompile("junit:junit:4.12") { testCompile("junit:junit:4.12") {
exclude group:'org.hamcrest', module:'hamcrest-core' exclude group:'org.hamcrest', module:'hamcrest-core'
} }
@ -223,6 +222,12 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
} }
} }
configure(moduleProjects) {
dependencies {
provided("com.google.code.findbugs:jsr305:3.0.2")
}
}
configure(rootProject) { configure(rootProject) {
description = "Spring Framework" description = "Spring Framework"

View File

@ -16,6 +16,23 @@ install {
repositories.mavenInstaller { repositories.mavenInstaller {
pom.whenConfigured { pom.whenConfigured {
packaging = "pom" packaging = "pom"
withXml {
asNode().children().last() + {
delegate.dependencyManagement {
delegate.dependencies {
parent.subprojects.sort { "$it.name" }.each { p ->
if (p != project) {
delegate.dependency {
delegate.groupId(p.group)
delegate.artifactId(p.name)
delegate.version(p.version)
}
}
}
}
}
}
}
} }
} }
} }