Update to s-c-build 1.2.0

parent 3991c8c5
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId> <artifactId>spring-cloud-build</artifactId>
<version>1.1.2.BUILD-SNAPSHOT</version> <version>1.2.0.BUILD-SNAPSHOT</version>
<relativePath /> <relativePath />
</parent> </parent>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
......
...@@ -68,7 +68,7 @@ public class FeignAutoConfiguration { ...@@ -68,7 +68,7 @@ public class FeignAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnMissingClass(name = "feign.hystrix.HystrixFeign") @ConditionalOnMissingClass("feign.hystrix.HystrixFeign")
protected static class DefaultFeignTargeterConfiguration { protected static class DefaultFeignTargeterConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
...@@ -83,7 +83,7 @@ public class FeignAutoConfiguration { ...@@ -83,7 +83,7 @@ public class FeignAutoConfiguration {
// for load balanced ribbon clients. // for load balanced ribbon clients.
@Configuration @Configuration
@ConditionalOnClass(ApacheHttpClient.class) @ConditionalOnClass(ApacheHttpClient.class)
@ConditionalOnMissingClass(name = "com.netflix.loadbalancer.ILoadBalancer") @ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true) @ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
protected static class HttpClientFeignConfiguration { protected static class HttpClientFeignConfiguration {
...@@ -102,7 +102,7 @@ public class FeignAutoConfiguration { ...@@ -102,7 +102,7 @@ public class FeignAutoConfiguration {
@Configuration @Configuration
@ConditionalOnClass(OkHttpClient.class) @ConditionalOnClass(OkHttpClient.class)
@ConditionalOnMissingClass(name = "com.netflix.loadbalancer.ILoadBalancer") @ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
@ConditionalOnProperty(value = "feign.okhttp.enabled", matchIfMissing = true) @ConditionalOnProperty(value = "feign.okhttp.enabled", matchIfMissing = true)
protected static class OkHttpFeignConfiguration { protected static class OkHttpFeignConfiguration {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>spring-cloud-dependencies-parent</artifactId> <artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<version>1.1.2.BUILD-SNAPSHOT</version> <version>1.2.0.BUILD-SNAPSHOT</version>
<relativePath/> <relativePath/>
</parent> </parent>
<artifactId>spring-cloud-netflix-dependencies</artifactId> <artifactId>spring-cloud-netflix-dependencies</artifactId>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<description>Spring Cloud Netflix Dependencies</description> <description>Spring Cloud Netflix Dependencies</description>
<properties> <properties>
<spring-cloud-commons.version>1.1.2.BUILD-SNAPSHOT</spring-cloud-commons.version> <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> <spring-cloud-stream.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-stream.version>
<archaius.version>0.7.4</archaius.version> <archaius.version>0.7.4</archaius.version>
<eureka.version>1.4.8</eureka.version> <eureka.version>1.4.8</eureka.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment