From cea9d1db8e0fb6df623bf16a4d542f47ee608f2e Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Tue, 22 Aug 2017 16:04:23 +0200
Subject: [PATCH] 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
---
 build.gradle                                    |  7 ++++++-
 .../spring-framework-bom.gradle                 | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b181a23b84..ceb29a5992 100644
--- a/build.gradle
+++ b/build.gradle
@@ -135,7 +135,6 @@ configure(allprojects) { project ->
 	}
 
 	dependencies {
-		provided("com.google.code.findbugs:jsr305:3.0.2")
 		testCompile("junit:junit:4.12") {
 			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) {
 	description = "Spring Framework"
 
diff --git a/spring-framework-bom/spring-framework-bom.gradle b/spring-framework-bom/spring-framework-bom.gradle
index f0ed03a4ee..761e9947b6 100644
--- a/spring-framework-bom/spring-framework-bom.gradle
+++ b/spring-framework-bom/spring-framework-bom.gradle
@@ -16,6 +16,23 @@ install {
 	repositories.mavenInstaller {
 		pom.whenConfigured {
 			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)
+									}
+								}
+							}
+						}
+					}
+				}
+			}
 		}
 	}
 }
\ No newline at end of file