From 87bfd03d9e420355d6ac4f66e86006f097105745 Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Wed, 9 Dec 2020 15:27:16 -0500
Subject: [PATCH] Remove Spring Integration BOM override

The correct SI versions now come from Boot directly
---
 applications/stream-applications-core/pom.xml |  7 -------
 stream-applications-build/pom.xml             | 11 +----------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml
index ea7e09ff..b5520c10 100644
--- a/applications/stream-applications-core/pom.xml
+++ b/applications/stream-applications-core/pom.xml
@@ -146,13 +146,6 @@
                                 </metadata>
                                 <maven>
                                     <dependencyManagement>
-                                        <dependency>
-                                            <groupId>org.springframework.integration</groupId>
-                                            <artifactId>spring-integration-bom</artifactId>
-                                            <version>${spring-integration-dependencies.version}</version>
-                                            <scope>import</scope>
-                                            <type>pom</type>
-                                        </dependency>
                                         <dependency>
                                             <groupId>org.springframework.cloud.fn</groupId>
                                             <artifactId>function-dependencies</artifactId>
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index e4daed92..480e058c 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -40,11 +40,10 @@
 		<nohttp-checkstyle.version>0.0.2.RELEASE</nohttp-checkstyle.version>
 		<disable.nohttp.checks>true</disable.nohttp.checks>
 		<spring-javaformat-checkstyle.version>0.0.7</spring-javaformat-checkstyle.version>
-		<spring-boot.version>2.3.6.RELEASE</spring-boot.version>
+		<spring-boot.version>2.3.7.BUILD-SNAPSHOT</spring-boot.version>
 		<spring-kafka.version>2.5.8.RELEASE</spring-kafka.version>
 		<spring-rabbit.version>2.2.12.RELEASE</spring-rabbit.version>
 		<spring-cloud-function.version>3.0.12.RELEASE</spring-cloud-function.version>
-		<spring-integration-dependencies.version>5.3.4.RELEASE</spring-integration-dependencies.version>
 		<test-containers.version>1.15.0</test-containers.version>
 		<maven-flatten-plugin.version>1.2.5</maven-flatten-plugin.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
@@ -52,14 +51,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<!-- Adding SI bom here is temporary to address some issues. It should come from Boot dependencies -->
-			<dependency>
-				<groupId>org.springframework.integration</groupId>
-				<artifactId>spring-integration-bom</artifactId>
-				<version>${spring-integration-dependencies.version}</version>
-				<scope>import</scope>
-				<type>pom</type>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-function-dependencies</artifactId>