Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
398c5aa0
Unverified
Commit
398c5aa0
authored
Jun 22, 2016
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upgrade feign to v8.17.0
fixes gh-1081
parent
7a90c0cd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
pom.xml
spring-cloud-netflix-core/pom.xml
+1
-1
FeignRibbonClientAutoConfiguration.java
...flix/feign/ribbon/FeignRibbonClientAutoConfiguration.java
+2
-3
pom.xml
spring-cloud-netflix-dependencies/pom.xml
+3
-3
No files found.
spring-cloud-netflix-core/pom.xml
View file @
398c5aa0
...
...
@@ -162,7 +162,7 @@
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
com.squareup.okhttp
</groupId>
<groupId>
com.squareup.okhttp
3
</groupId>
<artifactId>
okhttp
</artifactId>
<optional>
true
</optional>
</dependency>
...
...
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientAutoConfiguration.java
View file @
398c5aa0
...
...
@@ -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
}
spring-cloud-netflix-dependencies/pom.xml
View file @
398c5aa0
...
...
@@ -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.1
6.2
</feign.version>
<feign.version>
8.1
7.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.okhttp
3
</groupId>
<artifactId>
okhttp
</artifactId>
<version>
2.5.0
</version>
<version>
3.3.1
</version>
</dependency>
<dependency>
<groupId>
com.google.guava
</groupId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment