From 398c5aa009f4b71ce3e27c51f68134abd68fdb8b Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 22 Jun 2016 15:53:18 -0600
Subject: [PATCH] upgrade feign to v8.17.0

fixes gh-1081
---
 spring-cloud-netflix-core/pom.xml                           | 2 +-
 .../feign/ribbon/FeignRibbonClientAutoConfiguration.java    | 4 ++--
 spring-cloud-netflix-dependencies/pom.xml                   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml
index 2cf44bde..70677e4d 100644
--- a/spring-cloud-netflix-core/pom.xml
+++ b/spring-cloud-netflix-core/pom.xml
@@ -162,7 +162,7 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>com.squareup.okhttp</groupId>
+			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientAutoConfiguration.java
index 1a98f8c2..7622a60f 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientAutoConfiguration.java
@@ -97,7 +97,7 @@ public class FeignRibbonClientAutoConfiguration {
 	protected static class OkHttpConfiguration {
 
 		@Autowired(required = false)
-		private com.squareup.okhttp.OkHttpClient okHttpClient;
+		private okhttp3.OkHttpClient okHttpClient;
 
 		@Bean
 		@ConditionalOnMissingBean(Client.class)
@@ -113,4 +113,4 @@ public class FeignRibbonClientAutoConfiguration {
 			return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 93dc9d3c..d37c1b51 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -19,7 +19,7 @@
 		<spring-cloud-stream.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-stream.version>
 		<archaius.version>0.7.4</archaius.version>
 		<eureka.version>1.4.8</eureka.version>
-		<feign.version>8.16.2</feign.version>
+		<feign.version>8.17.0</feign.version>
 		<hystrix.version>1.5.3</hystrix.version>
 		<ribbon.version>2.2.0</ribbon.version>
 		<servo.version>0.10.1</servo.version>
@@ -452,9 +452,9 @@
 				</exclusions>
 			</dependency>
 			<dependency>
-				<groupId>com.squareup.okhttp</groupId>
+				<groupId>com.squareup.okhttp3</groupId>
 				<artifactId>okhttp</artifactId>
-				<version>2.5.0</version>
+				<version>3.3.1</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.guava</groupId>