diff --git a/pom.xml b/pom.xml
index e95e37b68..d6e6875c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,24 @@
jackson-dataformat-smile
${jackson.version}
+
+ javax.inject
+ javax.inject
+ 1
+
+
+
+ commons-configuration
+ commons-configuration
+ 1.8
+
+
+ commons-logging
+ commons-logging
+
+
+
+
diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index d37cecad4..07819a95e 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -14,7 +14,7 @@
spring-cloud-netflix-dependencies
Spring Cloud Netflix Dependencies
- 0.7.5
+ 0.7.6
1.8.8
1.5.12
2.2.5
@@ -137,7 +137,7 @@
com.netflix.netflix-commons
netflix-commons-util
- 0.1.1
+ 0.3.0
com.netflix.archaius
@@ -154,19 +154,7 @@
-
-
- commons-configuration
- commons-configuration
- 1.8
-
-
- commons-logging
- commons-logging
-
-
-
-
+
com.sun.jersey
jersey-servlet
@@ -417,31 +405,6 @@
logging-interceptor
${okhttp3.version}
-
- com.google.guava
- guava
- 18.0
-
-
- org.webjars
- d3js
- 3.4.11
-
-
- org.webjars
- jquery
- 2.1.1
-
-
- org.webjars
- bootstrap
- 3.2.0
-
-
- javax.inject
- javax.inject
- 1
-
diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml
index c432b6d76..c6d832ea3 100644
--- a/spring-cloud-netflix-eureka-client/pom.xml
+++ b/spring-cloud-netflix-eureka-client/pom.xml
@@ -68,12 +68,6 @@
xstream
true
-
- net.java.dev.rome
- rome
- 1.0.0
- true
-
com.sun.jersey.contribs
jersey-apache-client4
@@ -84,13 +78,6 @@
archaius-core
true
-
-
- commons-configuration
- commons-configuration
- true
-
-
com.netflix.ribbon
ribbon
diff --git a/spring-cloud-netflix-hystrix-dashboard/pom.xml b/spring-cloud-netflix-hystrix-dashboard/pom.xml
index 7543eb35b..da5f03d38 100644
--- a/spring-cloud-netflix-hystrix-dashboard/pom.xml
+++ b/spring-cloud-netflix-hystrix-dashboard/pom.xml
@@ -51,10 +51,12 @@
org.webjars
jquery
+ 2.1.1
org.webjars
d3js
+ 3.4.11
org.springframework.boot
diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RetryableRibbonLoadBalancingHttpClient.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RetryableRibbonLoadBalancingHttpClient.java
index ea73014f5..bd3606913 100644
--- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RetryableRibbonLoadBalancingHttpClient.java
+++ b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RetryableRibbonLoadBalancingHttpClient.java
@@ -16,7 +16,6 @@
package org.springframework.cloud.netflix.ribbon.apache;
import java.net.URI;
-import org.apache.commons.lang.BooleanUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpUriRequest;
@@ -110,10 +109,12 @@ public class RetryableRibbonLoadBalancingHttpClient extends RibbonLoadBalancingH
public boolean isClientRetryable(ContextAwareRequest request) {
return request!= null && isRequestRetryable(request);
}
-
+
private boolean isRequestRetryable(ContextAwareRequest request) {
- return request.getContext() == null ? true :
- BooleanUtils.toBooleanDefaultIfNull(request.getContext().getRetryable(), true);
+ if (request.getContext() == null || request.getContext().getRetryable() == null) {
+ return true;
+ }
+ return request.getContext().getRetryable();
}
private RibbonApacheHttpResponse executeWithRetry(RibbonApacheHttpRequest request, LoadBalancedRetryPolicy retryPolicy,
diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/RetryableOkHttpLoadBalancingClient.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/RetryableOkHttpLoadBalancingClient.java
index 885c6a859..d62af2b7f 100644
--- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/RetryableOkHttpLoadBalancingClient.java
+++ b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/RetryableOkHttpLoadBalancingClient.java
@@ -21,7 +21,6 @@ import okhttp3.Response;
import okhttp3.ResponseBody;
import java.net.URI;
-import org.apache.commons.lang.BooleanUtils;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.loadbalancer.InterceptorRetryPolicy;
import org.springframework.cloud.client.loadbalancer.LoadBalancedRecoveryCallback;
@@ -67,8 +66,10 @@ public class RetryableOkHttpLoadBalancingClient extends OkHttpLoadBalancingClien
}
private boolean isRequestRetryable(ContextAwareRequest request) {
- return request.getContext() == null ? true :
- BooleanUtils.toBooleanDefaultIfNull(request.getContext().getRetryable(), true);
+ if (request.getContext() == null || request.getContext().getRetryable() == null) {
+ return true;
+ }
+ return request.getContext().getRetryable();
}
private OkHttpRibbonResponse executeWithRetry(OkHttpRibbonRequest request, LoadBalancedRetryPolicy retryPolicy,
diff --git a/spring-cloud-netflix-zuul/pom.xml b/spring-cloud-netflix-zuul/pom.xml
index c12dcdccc..e2e1423cc 100644
--- a/spring-cloud-netflix-zuul/pom.xml
+++ b/spring-cloud-netflix-zuul/pom.xml
@@ -107,11 +107,6 @@
spring-retry
true
-
- commons-configuration
- commons-configuration
- true
-
org.springframework.cloud
spring-cloud-test-support
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
index 9b9a4099d..3e05602e1 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
@@ -34,27 +34,5 @@
com.netflix.archaius
archaius-core
-
-
- commons-configuration
- commons-configuration
-
-
- com.fasterxml.jackson.core
- jackson-annotations
-
-
- com.fasterxml.jackson.core
- jackson-core
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
- com.google.guava
- guava
-
-