From 1cf1f435a63ce3c42b32d7247d564afd0182a1b9 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 28 Nov 2017 12:25:02 -0500 Subject: [PATCH] Update eureka to 1.8.6 fixes gh-2456 --- spring-cloud-netflix-dependencies/pom.xml | 2 +- .../http/RestTemplateTransportClientFactories.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index e2d8e2d6..ca35be3f 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -15,7 +15,7 @@ Spring Cloud Netflix Dependencies 0.7.5 - 1.8.4 + 1.8.6 9.5.1 1.5.12 2.2.4 diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactories.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactories.java index f2877be7..d437703b 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactories.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactories.java @@ -17,6 +17,7 @@ package org.springframework.cloud.netflix.eureka.http; import java.util.Collection; +import java.util.Optional; import com.netflix.appinfo.InstanceInfo; import com.netflix.discovery.EurekaClientConfig; @@ -24,6 +25,9 @@ import com.netflix.discovery.shared.transport.TransportClientFactory; import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClient; import com.netflix.discovery.shared.transport.jersey.TransportClientFactories; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLContext; + /** * @author Daniel Lavoie */ @@ -43,4 +47,12 @@ public class RestTemplateTransportClientFactories return new RestTemplateTransportClientFactory(); } + @Override + public TransportClientFactory newTransportClientFactory(final EurekaClientConfig clientConfig, + final Collection additionalFilters, + final InstanceInfo myInstanceInfo, + final Optional sslContext, + final Optional hostnameVerifier) { + return new RestTemplateTransportClientFactory(); + } }