From dc179c0dd720e86ef0d42f936d4dd2e02645b34a Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 22 May 2018 14:17:23 +0100
Subject: [PATCH] Move reactor dependency management to parent pom

Otherwise webflux apps break when they include our BOM, even if they
don't even use spring-cloud-function.
---
 pom.xml                                    |  8 ++++++++
 spring-cloud-function-dependencies/pom.xml | 10 ----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index f92810c8f..9558f5bfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,18 @@
 		<wrapper.version>1.0.10.RELEASE</wrapper.version>
 		<spring-boot.version>1.5.12.RELEASE</spring-boot.version>
 		<docs.main>spring-cloud-function</docs.main>
+		<reactor-bom.version>Bismuth-SR9</reactor-bom.version>
 	</properties>
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>io.projectreactor</groupId>
+				<artifactId>reactor-bom</artifactId>
+				<version>${reactor-bom.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-function-dependencies</artifactId>
diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml
index f9741bcac..9bbb23707 100644
--- a/spring-cloud-function-dependencies/pom.xml
+++ b/spring-cloud-function-dependencies/pom.xml
@@ -13,18 +13,8 @@
 	<packaging>pom</packaging>
 	<name>Spring Cloud Function Dependencies</name>
 	<description>Spring Cloud Function Dependencies</description>
-	<properties>
-		<reactor-bom.version>Bismuth-SR6</reactor-bom.version>
-	</properties>
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>io.projectreactor</groupId>
-				<artifactId>reactor-bom</artifactId>
-				<version>${reactor-bom.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-function-context</artifactId>