diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 8226f5c1e..013e7a09f 100755 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -541,6 +541,34 @@ For more information on CSRF see the https://docs.spring.io/spring-security/site A demo Eureka Server can be found in the Spring Cloud Samples https://github.com/spring-cloud-samples/eureka/tree/Eureka-With-Security[repo]. +=== Disabling Ribbon with Eureka Server and Client starters + +`spring-cloud-starter-netflix-eureka-server` and `spring-cloud-starter-netflix-eureka-client` come along with +a `spring-cloud-starter-netflix-ribbon`. Since Ribbon load-balancer is now in maintenance mode, +we suggest switching to using the Spring Cloud LoadBalancer, also included in Eureka starters, instead. + +In order to that, you can set the value of `spring.cloud.loadbalancer.ribbon.enabled` property to `false`. + +You can then also exclude ribbon-related dependencies from Eureka starters in your build files, like so: + +[source,xml,indent=0] +---- + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + org.springframework.cloud + spring-cloud-starter-ribbon + + + com.netflix.ribbon + ribbon-eureka + + + +---- + === JDK 11 Support The JAXB modules which the Eureka server depends upon were removed in JDK 11. If you intend to use JDK 11 diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml index 8b5a79872..e9f0449e4 100644 --- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -43,6 +43,10 @@ org.springframework.cloud spring-cloud-starter-netflix-ribbon + + org.springframework.cloud + spring-cloud-starter-loadbalancer + com.netflix.ribbon ribbon-eureka diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml index 49701beea..64a62b2de 100644 --- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -30,6 +30,10 @@ org.springframework.cloud spring-cloud-starter-netflix-ribbon + + org.springframework.cloud + spring-cloud-starter-loadbalancer + com.netflix.ribbon ribbon-eureka