Commit f38ccc35 by Spencer Gibb

updated to ribbon 2.0-RC9

parent 948b176c
...@@ -129,6 +129,11 @@ ...@@ -129,6 +129,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.ribbon</groupId> <groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon</artifactId>
<version>${ribbon.version}</version>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon-core</artifactId> <artifactId>ribbon-core</artifactId>
<version>${ribbon.version}</version> <version>${ribbon.version}</version>
</dependency> </dependency>
...@@ -149,6 +154,11 @@ ...@@ -149,6 +154,11 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>
<version>${netflix.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>
...@@ -172,6 +182,12 @@ ...@@ -172,6 +182,12 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.12.6</version> <version>1.12.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
...@@ -215,10 +231,11 @@ ...@@ -215,10 +231,11 @@
<archaius.version>0.6.0</archaius.version> <archaius.version>0.6.0</archaius.version>
<eureka.version>1.1.135</eureka.version> <eureka.version>1.1.135</eureka.version>
<feign.version>6.1.2</feign.version> <feign.version>6.1.2</feign.version>
<hystrix.version>1.4.0-RC4</hystrix.version> <hystrix.version>1.4.0-RC5</hystrix.version>
<ribbon.version>0.3.13</ribbon.version> <ribbon.version>2.0-RC9</ribbon.version>
<turbine.version>0.4</turbine.version> <turbine.version>0.4</turbine.version>
<zuul.version>1.0.24</zuul.version> <zuul.version>1.0.24</zuul.version>
<netflix.rxjava.version>0.20.6</netflix.rxjava.version>
</properties> </properties>
</project> </project>
...@@ -73,6 +73,11 @@ ...@@ -73,6 +73,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.ribbon</groupId> <groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon-core</artifactId> <artifactId>ribbon-core</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
...@@ -98,6 +103,11 @@ ...@@ -98,6 +103,11 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<!-- Only needed at compile time --> <!-- Only needed at compile time -->
...@@ -109,6 +119,10 @@ ...@@ -109,6 +119,10 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.neo4j</groupId> <groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-compiler-2.1</artifactId> <artifactId>neo4j-cypher-compiler-2.1</artifactId>
<version>2.1.2</version> <version>2.1.2</version>
......
...@@ -222,7 +222,7 @@ public class SpringClientFactory { ...@@ -222,7 +222,7 @@ public class SpringClientFactory {
return config; return config;
} else { } else {
try { try {
config = (IClientConfig) clientConfigClass.newInstance(); config = clientConfigClass.newInstance();
config.loadProperties(name); config.loadProperties(name);
} catch (Throwable e) { } catch (Throwable e) {
log.error("Unable to create client config instance", e); log.error("Unable to create client config instance", e);
......
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