From ecac6cdfc1d809a37cee6d00437bd57bad0727bd Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Wed, 1 Apr 2020 09:21:20 -0600
Subject: [PATCH] Remove spring-framework-bom Manual Insertion

spring-io-plugin can do this now

Issue gh-8271
---
 build.gradle                   |  3 +++
 gradle/maven-deployment.gradle | 13 -------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 702b7a0b41..e1efa79be6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,6 +122,9 @@ configure(coreModuleProjects) {
 	}
 
 	dependencyManagement {
+		imports {
+			mavenBom("org.springframework:spring-framework-bom:${springVersion}")
+		}
 		springIoTestRuntime {
 			imports {
 				mavenBom("io.spring.platform:platform-bom:${springIoVersion}") {
diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle
index ef05c40ed3..1ae4db1b13 100644
--- a/gradle/maven-deployment.gradle
+++ b/gradle/maven-deployment.gradle
@@ -77,19 +77,6 @@ def customizePom(pom, gradleProject) {
 			}
 		}
 		// Exclude spring-framework-bom for sample Boot projects since spring-boot-starter-parent imports spring-framework-bom
-		if(!gradleProject.name.endsWith('-bom') && !sampleBootProjects.contains(gradleProject)) {
-			dependencyManagement {
-				dependencies {
-					dependency {
-						groupId 'org.springframework'
-						artifactId 'spring-framework-bom'
-						version project.springVersion
-						type 'pom'
-						scope 'import'
-					}
-				}
-			}
-		}
 		if(isWar) {
 			properties {
 				'm2eclipse.wtp.contextRoot' '/' + project.war.baseName