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
ab0af455
Unverified
Commit
ab0af455
authored
Jul 01, 2016
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to s-c-build 1.2.0
parent
3991c8c5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
pom.xml
pom.xml
+1
-1
FeignAutoConfiguration.java
...framework/cloud/netflix/feign/FeignAutoConfiguration.java
+3
-3
pom.xml
spring-cloud-netflix-dependencies/pom.xml
+2
-2
No files found.
pom.xml
View file @
ab0af455
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-build
</artifactId>
<version>
1.
1.2
.BUILD-SNAPSHOT
</version>
<version>
1.
2.0
.BUILD-SNAPSHOT
</version>
<relativePath
/>
</parent>
<artifactId>
spring-cloud-netflix
</artifactId>
...
...
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
View file @
ab0af455
...
...
@@ -68,7 +68,7 @@ public class FeignAutoConfiguration {
}
@Configuration
@ConditionalOnMissingClass
(
name
=
"feign.hystrix.HystrixFeign"
)
@ConditionalOnMissingClass
(
"feign.hystrix.HystrixFeign"
)
protected
static
class
DefaultFeignTargeterConfiguration
{
@Bean
@ConditionalOnMissingBean
...
...
@@ -83,7 +83,7 @@ public class FeignAutoConfiguration {
// for load balanced ribbon clients.
@Configuration
@ConditionalOnClass
(
ApacheHttpClient
.
class
)
@ConditionalOnMissingClass
(
name
=
"com.netflix.loadbalancer.ILoadBalancer"
)
@ConditionalOnMissingClass
(
"com.netflix.loadbalancer.ILoadBalancer"
)
@ConditionalOnProperty
(
value
=
"feign.httpclient.enabled"
,
matchIfMissing
=
true
)
protected
static
class
HttpClientFeignConfiguration
{
...
...
@@ -102,7 +102,7 @@ public class FeignAutoConfiguration {
@Configuration
@ConditionalOnClass
(
OkHttpClient
.
class
)
@ConditionalOnMissingClass
(
name
=
"com.netflix.loadbalancer.ILoadBalancer"
)
@ConditionalOnMissingClass
(
"com.netflix.loadbalancer.ILoadBalancer"
)
@ConditionalOnProperty
(
value
=
"feign.okhttp.enabled"
,
matchIfMissing
=
true
)
protected
static
class
OkHttpFeignConfiguration
{
...
...
spring-cloud-netflix-dependencies/pom.xml
View file @
ab0af455
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
spring-cloud-dependencies-parent
</artifactId>
<groupId>
org.springframework.cloud
</groupId>
<version>
1.
1.2
.BUILD-SNAPSHOT
</version>
<version>
1.
2.0
.BUILD-SNAPSHOT
</version>
<relativePath/>
</parent>
<artifactId>
spring-cloud-netflix-dependencies
</artifactId>
...
...
@@ -15,7 +15,7 @@
<description>
Spring Cloud Netflix Dependencies
</description>
<properties>
<spring-cloud-commons.version>
1.1.2.BUILD-SNAPSHOT
</spring-cloud-commons.version>
<spring-cloud-config.version>
1.
1.2
.BUILD-SNAPSHOT
</spring-cloud-config.version>
<spring-cloud-config.version>
1.
2.0
.BUILD-SNAPSHOT
</spring-cloud-config.version>
<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>
...
...
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