Merge remote-tracking branch 'origin/4.1.x'

docs/modules/ROOT/partials/_configprops.adoc

@@ -31,6 +31,7 @@
 |eureka.client.heartbeat-executor-thread-pool-size | `+++2+++` | The thread pool size for the heartbeatExecutor to initialise with.
 |eureka.client.initial-instance-info-replication-interval-seconds | `+++40+++` | Indicates how long initially (in seconds) to replicate instance info to the eureka server.
 |eureka.client.instance-info-replication-interval-seconds | `+++30+++` | Indicates how often(in seconds) to replicate instance changes to be replicated to the eureka server.
+|eureka.client.jersey.enabled | `+++true+++` | Enables the use of JerseyClient for Eureka HTTP Client.
 |eureka.client.log-delta-diff | `+++false+++` | Indicates whether to log differences between the eureka server and the eureka client in terms of registry information. Eureka client tries to retrieve only delta changes from eureka server to minimize network traffic. After receiving the deltas, eureka client reconciles the information from the server to verify it has not missed out some information. Reconciliation failures could happen when the client has had network issues communicating to server.If the reconciliation fails, eureka client gets the full registry information. While getting the full registry information, the eureka client can log the differences between the client and the server and this setting controls that. The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSecondsr
 |eureka.client.on-demand-update-status-change | `+++true+++` | If set to true, local status updates via ApplicationInfoManager will trigger on-demand (but rate limited) register/updates to remote eureka servers.
 |eureka.client.order | `+++0+++` | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients.

spring-cloud-netflix-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -18,6 +18,12 @@
       "description": "Enables the use of WebClient for Eureka HTTP Client.",
       "type": "java.lang.Boolean"
     },
+    {
+      "defaultValue": true,
+      "name": "eureka.client.jersey.enabled",
+      "description": "Enables the use of JerseyClient for Eureka HTTP Client.",
+      "type": "java.lang.Boolean"
+    },
     {
       "defaultValue": 1,
       "name": "eureka.instance.metadata-map.weight",