Commit 42551793 by Spencer Gibb

use io.reactivex:rxjava

fixes gh-353
parent bd5d00c0
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<hystrix.version>1.4.4</hystrix.version> <hystrix.version>1.4.4</hystrix.version>
<ribbon.version>2.0.0</ribbon.version> <ribbon.version>2.0.0</ribbon.version>
<zuul.version>1.0.28</zuul.version> <zuul.version>1.0.28</zuul.version>
<netflix.rxjava.version>0.20.7</netflix.rxjava.version> <rxjava.version>1.0.11</rxjava.version>
<java.version>1.7</java.version> <java.version>1.7</java.version>
<spring-integration-dsl.version>1.0.0.RELEASE</spring-integration-dsl.version> <spring-integration-dsl.version>1.0.0.RELEASE</spring-integration-dsl.version>
<cloud-connectors.version>1.1.1.RELEASE</cloud-connectors.version> <cloud-connectors.version>1.1.1.RELEASE</cloud-connectors.version>
...@@ -238,9 +238,9 @@ ...@@ -238,9 +238,9 @@
<version>${ribbon.version}</version> <version>${ribbon.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.rxjava</groupId> <groupId>io.reactivex</groupId>
<artifactId>rxjava-core</artifactId> <artifactId>rxjava</artifactId>
<version>${netflix.rxjava.version}</version> <version>${rxjava.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.zuul</groupId> <groupId>com.netflix.zuul</groupId>
......
...@@ -142,8 +142,8 @@ ...@@ -142,8 +142,8 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.rxjava</groupId> <groupId>io.reactivex</groupId>
<artifactId>rxjava-core</artifactId> <artifactId>rxjava</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<description>Spring Cloud Netflix Turbine AMQP</description> <description>Spring Cloud Netflix Turbine AMQP</description>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
<rxjava.version>[1.0,1.1)</rxjava.version>
<turbine.version>2.0.0-DP.2</turbine.version> <turbine.version>2.0.0-DP.2</turbine.version>
</properties> </properties>
<build> <build>
...@@ -32,11 +31,6 @@ ...@@ -32,11 +31,6 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava.version}</version>
</dependency>
<dependency>
<groupId>com.netflix.turbine</groupId> <groupId>com.netflix.turbine</groupId>
<artifactId>turbine-core</artifactId> <artifactId>turbine-core</artifactId>
<version>${turbine.version}</version> <version>${turbine.version}</version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment