From 0287a34c7dfd7a88ee8ba1034affa88ad093beb6 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 10 May 2016 09:49:50 +0100
Subject: [PATCH] Re-order BOMs so that rxjava gets the right version from
 netflix

Because stream (currently) depends on an old version of rxjava, this
was causing issues for user projects, pulling in the wrong version
onto the classpath. Putting the netflix BOM first in dependency
management is enoug hto fix it for now (until something else
has a strong opinion about one of the dependencies in netflix).
---
 spring-cloud-dependencies/pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml
index 5cd8448..bd054ff 100644
--- a/spring-cloud-dependencies/pom.xml
+++ b/spring-cloud-dependencies/pom.xml
@@ -274,6 +274,13 @@
 				<version>${spring-cloud-netflix.version}</version>
 			</dependency>
 	        <!-- bom dependencies at the bottom so they can be overridden above -->
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-dependencies</artifactId>
+				<version>${spring-cloud-netflix.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-dependencies</artifactId>
@@ -295,13 +302,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-dependencies</artifactId>
-				<version>${spring-cloud-netflix.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-sleuth-dependencies</artifactId>