From 7857bbb956fdcf6618f3b5553513a1f7e5595b82 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sat, 25 Mar 2017 18:41:56 +0000
Subject: [PATCH] Add temporary dependency management for reactor-netty

The version of reactor-netty currently provided by reactor-bom is
incompatible with the version of reactor-core that's provided. To
work around this problem, this commit adds dependency management for
reactor-netty that overrides the bom.
---
 spring-boot-dependencies/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 43716156e6c..ac49225a8f9 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -143,6 +143,7 @@
 		<postgresql.version>9.4.1212.jre7</postgresql.version>
 		<querydsl.version>4.1.4</querydsl.version>
 		<reactor-bom.version>Aluminium-BUILD-SNAPSHOT</reactor-bom.version>
+		<reactor-netty.version>0.6.3.BUILD-SNAPSHOT</reactor-netty.version>
 		<rxjava.version>1.2.9</rxjava.version>
 		<rxjava-adapter.version>1.2.1</rxjava-adapter.version>
 		<rxjava2.version>2.0.7</rxjava2.version>
@@ -902,6 +903,11 @@
 				<artifactId>netty-resolver-dns</artifactId>
 				<version>${netty.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>io.projectreactor.ipc</groupId>
+				<artifactId>reactor-netty</artifactId>
+				<version>${reactor-netty.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>io.projectreactor</groupId>
 				<artifactId>reactor-bom</artifactId>