From 6e73cfa9da549fa3c565583b80dd7c643894aa2d Mon Sep 17 00:00:00 2001
From: lowzj <zj3142063@gmail.com>
Date: Wed, 25 May 2016 11:49:43 +0800
Subject: [PATCH] Use 'spring-cloud-starter-ribbon' directly.

Use dependency 'spring-cloud-starter-ribbon' instead of using
netflix.ribbon directly. This brings in the correct version of
'io.reactivex:rxjava' even in 'spring-cloud-dependencies' pom
is not used.

Removed spring-cloud-starter-archaius because it is brought in
by the ribbon starter.
---
 spring-cloud-starter-consul-discovery/pom.xml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml
index 8ca670ea..34e21fc1 100644
--- a/spring-cloud-starter-consul-discovery/pom.xml
+++ b/spring-cloud-starter-consul-discovery/pom.xml
@@ -35,23 +35,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-archaius</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-httpclient</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-loadbalancer</artifactId>
+			<artifactId>spring-cloud-starter-ribbon</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>