diff --git a/pom.xml b/pom.xml index 2f463506..ba18ea10 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 1.1.2.BUILD-SNAPSHOT + 1.2.0.BUILD-SNAPSHOT spring-cloud-netflix diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java index 73c314c6..8303fb77 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java @@ -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 { diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index d37c1b51..164d6a21 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.1.2.BUILD-SNAPSHOT + 1.2.0.BUILD-SNAPSHOT spring-cloud-netflix-dependencies @@ -15,7 +15,7 @@ Spring Cloud Netflix Dependencies 1.1.2.BUILD-SNAPSHOT - 1.1.2.BUILD-SNAPSHOT + 1.2.0.BUILD-SNAPSHOT 1.0.3.BUILD-SNAPSHOT 0.7.4 1.4.8