From f4321dd3d67a44e08492909dfab5cbeae73c7043 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 10 Oct 2017 12:25:39 -0400
Subject: [PATCH] Add dependency management for rxjava-reactive-streams

Allows for bridging webflux when using hystrix commands.

fixes gh-2355
---
 spring-cloud-netflix-dependencies/pom.xml                   | 6 ++++++
 .../spring-cloud-starter-netflix-hystrix/pom.xml            | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 8e9d3ebd..eb25883c 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -22,6 +22,7 @@
 		<servo.version>0.10.1</servo.version>
 		<zuul.version>1.3.0</zuul.version>
 		<rxjava.version>1.2.0</rxjava.version>
+		<rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
 		<java.version>1.7</java.version>
 		<turbine.version>1.0.0</turbine.version>
 		<eureka-jersey.version>1.19.1</eureka-jersey.version>
@@ -401,6 +402,11 @@
 				<artifactId>rxjava</artifactId>
 				<version>${rxjava.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>io.reactivex</groupId>
+				<artifactId>rxjava-reactive-streams</artifactId>
+				<version>${rxjava-reactive-streams.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.netflix.zuul</groupId>
 				<artifactId>zuul-core</artifactId>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
index 5608528e..9c6b6b6f 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
@@ -42,5 +42,9 @@
 			<groupId>com.netflix.hystrix</groupId>
 			<artifactId>hystrix-javanica</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.reactivex</groupId>
+			<artifactId>rxjava-reactive-streams</artifactId>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file