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

upgrade feign to v8.17.0

Browse Source 
fixes gh-1081
This commit is contained in:
Spencer Gibb
2016-06-22 15:53:18 -06:00
parent 7a90c0cd88
commit 398c5aa009
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientAutoConfiguration.java
View File

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

6
spring-cloud-netflix-dependencies/pom.xml
View File

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