Merge branch 'ribbon2'

pom.xml

@@ -129,6 +129,11 @@
             </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>
                 <version>${ribbon.version}</version>
             </dependency>
@@ -149,6 +154,11 @@
                 </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>
                 <version>${turbine.version}</version>
@@ -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>

spring-cloud-netflix-core/pom.xml

@@ -73,6 +73,11 @@
 		</dependency>
         <dependency>
             <groupId>com.netflix.ribbon</groupId>
+            <artifactId>ribbon</artifactId>
+            <optional>true</optional>
+        </dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon-core</artifactId>
 			<optional>true</optional>
 		</dependency>
@@ -98,6 +103,11 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>com.netflix.rxjava</groupId>
+            <artifactId>rxjava-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<!-- Only needed at compile time -->
@@ -109,6 +119,10 @@
 			<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>
 			<version>2.1.2</version>

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

@@ -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);