SpringCloud/spring-cloud-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update ribbon to add ribbon-loadbalancer which is optional in 2.0.0

Browse Source
This commit is contained in:
Spencer Gibb
2015-03-06 12:55:40 -07:00
parent 538c6cc543
commit 968f1735a9
4 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-starter-eureka-server/pom.xml
View File

@@ -28,14 +28,10 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-eureka-server</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>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon-eureka</artifactId>

12
spring-cloud-starter-eureka/pom.xml
View File

@@ -31,14 +31,10 @@
<groupId>com.netflix.eureka</groupId>
<artifactId>eureka-client</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>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon-eureka</artifactId>

24
spring-cloud-starter-feign/pom.xml
View File

@@ -48,28 +48,10 @@
<artifactId>feign-slf4j</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon</artifactId>
<exclusions>
<exclusion>
<artifactId>rx-netty</artifactId>
<groupId>com.netflix.rxnetty</groupId>
</exclusion>
<exclusion>
<artifactId>rx-netty-contexts</artifactId>
<groupId>com.netflix.rxnetty</groupId>
</exclusion>
<exclusion>
<artifactId>rx-netty-servo</artifactId>
<groupId>com.netflix.rxnetty</groupId>
</exclusion>
</exclusions>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon-httpclient</artifactId>
</dependency>
<!-- TODO: remove when dagger 8.0.0 is released -->
<!-- TODO: remove dagger when feign 8.0.0 is released -->
<dependency>
<groupId>com.squareup.dagger</groupId>
<artifactId>dagger</artifactId>

4
spring-cloud-starter-ribbon/pom.xml
View File

@@ -39,6 +39,10 @@
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon-httpclient</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon-loadbalancer</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>