From a2e8245e93290a3a28fa9711f8dbedfb5896681c Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 4 Aug 2014 09:00:23 -0700 Subject: [PATCH] Add jersey stuff to dependency management --- pom.xml | 10 ++++++++++ .../netflix/eureka/EurekaClientConfiguration.java | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml index e6962e59..f3d4832c 100644 --- a/pom.xml +++ b/pom.xml @@ -149,6 +149,16 @@ lombok 1.12.6 + + com.sun.jersey + jersey-servlet + 1.13 + + + com.sun.jersey + jersey-server + 1.13 + diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfiguration.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfiguration.java index 8cb8de11..0cad89aa 100644 --- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfiguration.java +++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfiguration.java @@ -25,12 +25,14 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationListener; import org.springframework.context.SmartLifecycle; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.core.Ordered; import com.netflix.appinfo.ApplicationInfoManager; import com.netflix.appinfo.InstanceInfo.InstanceStatus; +import com.netflix.discovery.DiscoveryClient; import com.netflix.discovery.DiscoveryManager; import com.netflix.discovery.EurekaClientConfig; @@ -105,4 +107,9 @@ public class EurekaClientConfiguration implements return order; } + @Bean + public DiscoveryClient discoveryClient() { + return DiscoveryManager.getInstance().getDiscoveryClient(); + } + }