Merge remote-tracking branch 'origin/3.1.x' into 4.0.x

spring-cloud · Nov 9, 2023 · b90a47f · b90a47f
2 parents f2424e6 + 564ac7a
commit b90a47f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 14 deletions.
diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc
@@ -14,7 +14,6 @@
 |eureka.client.register-with-eureka | `+++true+++` | Indicates whether or not this instance should register its information with eureka server for discovery by others. In some cases, you do not want your instances to be discovered whereas you just want do discover other instances.
 |eureka.server.peer-eureka-nodes-update-interval-ms | `+++0+++` | 
 |eureka.server.peer-eureka-status-refresh-time-interval-ms | `+++0+++` | 
-|ribbon.eureka.enabled | `+++true+++` | Enables the use of Eureka with Ribbon.
 |spring.cloud.loadbalancer.eureka.approximate-zone-from-hostname | `+++false+++` | Used to determine whether we should try to get the `zone` value from host name.
 
 |===
diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc
@@ -307,7 +307,7 @@ The following example shows the dependencies you need to add:
 
 You need not use the raw Netflix `EurekaClient`.
 Also, it is usually more convenient to use it behind a wrapper of some sort.
-Spring Cloud has support for <<spring-cloud-feign, Feign>> (a REST client builder) and <<spring-cloud-ribbon, Spring `RestTemplate`>> through the logical Eureka service identifiers (VIPs) instead of physical URLs.
+Spring Cloud has support for <<spring-cloud-feign, Feign>> (a REST client builder) and https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#spring-cloud-loadbalancer[Spring Cloud LoadBalancer] through the logical Eureka service identifiers (VIPs) instead of physical URLs.
 
 You can also use the `org.springframework.cloud.client.discovery.DiscoveryClient`, which provides a simple API (not specific to Netflix) for discovery clients, as shown in the following example:
 

diff --git a/...x-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...x-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -12,12 +12,6 @@
       "description": "Determines whether the EurekaClient instance can be refreshed or not(If disabled none of the Eureka client properties will be refreshable).",
       "type": "java.lang.Boolean"
     },
-    {
-      "defaultValue": true,
-      "name": "ribbon.eureka.enabled",
-      "description": "Enables the use of Eureka with Ribbon.",
-      "type": "java.lang.Boolean"
-    },
     {
       "defaultValue": false,
       "name": "eureka.client.webclient.enabled",

diff --git a/spring-cloud-netflix-eureka-client/src/test/resources/application.yml b/spring-cloud-netflix-eureka-client/src/test/resources/application.yml
@@ -1,9 +1,4 @@
-# for EurekaRibbonClientPropertyOverrideIntegrationTests
-foo3:
-  ribbon:
-    NFLoadBalancerPingClassName: com.netflix.loadbalancer.DummyPing
-    NIWSServerListClassName: com.netflix.loadbalancer.ConfigurationBasedServerList
-
+
 security:
   basic:
     enabled: false