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

updated to ribbon 2.0-RC9

Browse Source
This commit is contained in:
Spencer Gibb
2014-10-17 17:54:47 -06:00
parent 948b176cb0
commit f38ccc352b
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pom.xml
View File

@@ -127,6 +127,11 @@
<artifactId>hystrix-javanica</artifactId>
<version>${hystrix.version}</version>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon</artifactId>
<version>${ribbon.version}</version>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon-core</artifactId>
@@ -148,6 +153,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>
<version>${netflix.rxjava.version}</version>
</dependency>
<dependency>
<groupId>com.netflix.turbine</groupId>
<artifactId>turbine-core</artifactId>
@@ -172,6 +182,12 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.12.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -215,10 +231,11 @@
<archaius.version>0.6.0</archaius.version>
<eureka.version>1.1.135</eureka.version>
<feign.version>6.1.2</feign.version>
<hystrix.version>1.4.0-RC4</hystrix.version>
<ribbon.version>0.3.13</ribbon.version>
<hystrix.version>1.4.0-RC5</hystrix.version>
<ribbon.version>2.0-RC9</ribbon.version>
<turbine.version>0.4</turbine.version>
<zuul.version>1.0.24</zuul.version>
<netflix.rxjava.version>0.20.6</netflix.rxjava.version>
</properties>
</project>

14
spring-cloud-netflix-core/pom.xml
View File

@@ -71,6 +71,11 @@
<artifactId>hystrix-javanica</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon-core</artifactId>
@@ -96,6 +101,11 @@
<groupId>org.codehaus.groovy</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
@@ -108,6 +118,10 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-compiler-2.1</artifactId>

2
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/SpringClientFactory.java
View File

@@ -222,7 +222,7 @@ public class SpringClientFactory {
return config;
} else {
try {
config = (IClientConfig) clientConfigClass.newInstance();
config = clientConfigClass.newInstance();
config.loadProperties(name);
} catch (Throwable e) {
log.error("Unable to create client config instance", e);