Update SNAPSHOT to 4.1.4

Bumping dependency versions after release
Bumping versions to 4.1.5-SNAPSHOT after release
2026-09-17 23:59:04 +00:00 · 2024-11-27 01:44:00 +00:00 · 2024-11-26 16:43:23 +00:00 · 2024-11-26 16:42:34 +00:00 · 2024-11-26 16:42:33 +00:00 · 2024-11-26 16:41:50 +00:00
212 changed files with 8125 additions and 5796 deletions
@@ -1,41 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: springcloud/pipeline-base
-        user: appuser
-    environment:
-      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
-      TERM: dumb
-    branches:
-      ignore:
-        - gh-pages # list of branches to ignore
-    steps:
-      - checkout
-      - restore_cache:
-          key: sc-netflix-{{ .Branch }}
-      - run:
-          name: "Download dependencies"
-          command: |
-            cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install && \
-            ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
-      - save_cache:
-          key: sc-netflix-{{ .Branch }}
-          paths:
-            - ~/.m2
-      - run:
-          name: "Running build"
-          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-      - run:
-          name: "Aggregate test results"
-          when: always
-          command: |
-            mkdir -p ~/junit/
-            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
-            bash <(curl -s https://codecov.io/bash)
-      - store_artifacts:
-          path: ~/junit/
-          destination: artifacts
-      - store_test_results:
-          path: ~/junit/
-          destination: testartifacts
@@ -3,7 +3,7 @@

 Spring Cloud is released under the non-restrictive Apache 2.0 license,
 and follows a very standard Github development process, using Github
-tracker for issues and merging pull requests into master. If you want
+tracker for issues and merging pull requests into main. If you want
 to contribute even something trivial please do not hesitate, but
 follow the guidelines below.

@@ -17,7 +17,7 @@ given the ability to merge pull requests.

 ## Code of Conduct
 This project adheres to the Contributor Covenant [code of
-conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
+conduct](https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
 unacceptable behavior to spring-code-of-conduct@pivotal.io.

 ## Code Conventions and Housekeeping
@@ -27,7 +27,7 @@ added after the original pull request but before a merge.
 * Use the Spring Framework code format conventions. If you use Eclipse
  you can import formatter settings using the
  `eclipse-code-formatter.xml` file from the
-  [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
+  [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
  [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) to import the same file.
 * Make sure all new `.java` files to have a simple Javadoc class comment with at least an
  `@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -38,7 +38,7 @@ added after the original pull request but before a merge.
  than cosmetic changes).
 * Add some Javadocs and, if you change the namespace, some XSD doc elements.
 * A few unit tests would help a lot as well -- someone has to do it.
-* If no-one else is using your branch, please rebase it against the current master (or
+* If no-one else is using your branch, please rebase it against the current main (or
  other target branch in the main project).
 * When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
@@ -0,0 +1,49 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "3.1.x" # oldest OSS supported branch
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "4.0.x" # oldest OSS supported branch
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "main"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+    target-branch: 3.1.x
+    ignore:
+      # only upgrade patch versions for maintenance branch
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-major
+          - version-update:semver-minor
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+    target-branch: 4.0.x
+    ignore:
+      # only upgrade patch versions for maintenance branch
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-major
+          - version-update:semver-minor
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+    target-branch: main
+    ignore:
+      # only upgrade by minor or patch
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-major
@@ -0,0 +1,32 @@
+name: Deploy Docs
+on:
+  push:
+    branches-ignore: [ gh-pages ]
+    tags: '**'
+  repository_dispatch:
+    types: request-build-reference # legacy
+  #schedule:
+  #- cron: '0 10 * * *' # Once per day at 10am UTC
+  workflow_dispatch:
+permissions:
+  actions: write
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    # if: github.repository_owner == 'spring-cloud'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: docs-build
+          fetch-depth: 1
+      - name: Dispatch (partial build)
+        if: github.ref_type == 'branch'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
+      - name: Dispatch (full build)
+        if: github.ref_type == 'tag'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD)
@@ -0,0 +1,33 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build
+
+on:
+  push:
+    branches: [ main, 4.1.x ]
+  pull_request:
+    branches: [ main, 4.1.x ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: ["17"]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+          cache: 'maven'
+      - name: Build with Maven
+        run: ./mvnw clean install -B -U -P sonar
+      - uses: codecov/codecov-action@v5
+        with:
+          fail_ci_if_error: false
@@ -1,3 +1,6 @@
+/application.yml
+/application.properties
+asciidoctor.css
 *~
 #*
 *#
@@ -5,6 +8,7 @@
 .classpath
 .project
 .settings/
+.settings
 .springBeans
 target/
 bin/
@@ -18,6 +22,16 @@ _site/
 .shelf
 *.swp
 *.swo
+/spring-cloud-release-tools*.jar
+antrun
 .vscode/
 .flattened-pom.xml
-.sdkmanrc
+node
+node_modules
+build
+_configprops.adoc
+_spans.adoc
+_metrics.adoc
+_conventions.adoc
+/package.json
+package-lock.json
@@ -0,0 +1 @@
+17
@@ -1 +1,2 @@
-DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local -P spring
+-DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local
+-P spring
@@ -1,107 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL =
-            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: : " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}
@@ -1 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=17.0.1-tem
@@ -1,11 +0,0 @@
-require 'asciidoctor'
-require 'erb'
-
-options = {:mkdirs => true, :safe => :unsafe, :attributes => ['linkcss', 'allow-uri-read']}
-
-guard 'shell' do
-  watch(/^docs\/[A-Z-a-z][^#]*\.adoc$/) {|m|
-    Asciidoctor.load_file('docs/src/main/asciidoc/README.adoc', :to_file => './README.adoc', safe: :safe, parse: false, attributes: 'allow-uri-read')
-    Asciidoctor.render_file('docs/src/main/asciidoc/spring-cloud-netflix.adoc', options.merge(:to_dir => 'target/generated-docs'))
-  }
-end
@@ -4,106 +4,27 @@ Manual changes to this file will be lost when it is generated again.
 Edit the files in the src/main/asciidoc/ directory instead.
 ////

-:doctype: book
-:idprefix:
-:idseparator: -
-:toc: left
-:toclevels: 4
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
-
-:sc-ext: java
-:project-full-name: Spring Cloud Netflix
-
-image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master"]
-image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master"]
-image::https://api.codacy.com/project/badge/Grade/a6885a06921e4f72a0df0b7aabd6d118["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-netflix?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-netflix&utm_campaign=Badge_Grade"]


-:doctype: book
-:idprefix:
-:idseparator: -
-:toc: left
-:toclevels: 4
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
+image::https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml"]

-:sc-ext: java
-:project-full-name: Spring Cloud Netflix
-
-This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
-and binding to the Spring Environment and other Spring programming model idioms. With a few
-simple annotations you can quickly enable and configure the common patterns inside your
-application and build large distributed systems with battle-tested Netflix components. The
-patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix),
-Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
+image:https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-netflix/tree/main"]


+[[features]]
 == Features

 * Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
 * Service Discovery: an embedded Eureka server can be created with declarative Java configuration
-* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
-* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
-* Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
-
-:doctype: book
-:idprefix:
-:idseparator: -
-:toc: left
-:toclevels: 4
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
-
-:sc-ext: java
-:project-full-name: Spring Cloud Netflix
-
-== Modules In Maintenance Mode
-
-Placing a module in maintenance mode means that the Spring Cloud team will no longer be adding new features to the module.
-We will fix blocker bugs and security issues, and we will also consider and review small pull requests from the community.
-
-We intend to continue to support these modules for a period of at least a year from the general availability
-of the Greenwich release train.
-
-The following Spring Cloud Netflix modules and corresponding starters will be placed into maintenance mode:
-
-* spring-cloud-netflix-archaius
-* spring-cloud-netflix-concurrency-limits
-* spring-cloud-netflix-hystrix-contract
-* spring-cloud-netflix-hystrix-dashboard
-* spring-cloud-netflix-hystrix-stream
-* spring-cloud-netflix-hystrix
-* spring-cloud-netflix-ribbon
-* spring-cloud-netflix-turbine-stream
-* spring-cloud-netflix-turbine
-* spring-cloud-netflix-zuul
-
-NOTE: This does not include the Eureka modules.


+[[building]]
 == Building

-:jdkversion: 1.8
+:jdkversion: 17

-=== Basic Compile and Test
+[[basic-compile-and-test]]
+== Basic Compile and Test

 To build the source you will need to install JDK {jdkversion}.

@@ -127,43 +48,39 @@ the `.mvn` configuration, so if you find you have to do it to make a
 build succeed, please raise a ticket to get the settings added to
 source control.

-For hints on how to build the project look in `.travis.yml` if there
-is one. There should be a "script" and maybe "install" command. Also
-look at the "services" section to see if any services need to be
-running locally (e.g. mongo or rabbit).  Ignore the git-related bits
-that you might find in "before_install" since they're related to setting git
-credentials and you already have those.
+The projects that require middleware (i.e. Redis) for testing generally
+require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.

-The projects that require middleware generally include a
-`docker-compose.yml`, so consider using
-https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
-in Docker containers. See the README in the
-https://github.com/spring-cloud-samples/scripts[scripts demo
-repository] for specific instructions about the common cases of mongo,
-rabbit and redis.
-
-NOTE: If all else fails, build with the command from `.travis.yml` (usually
-`./mvnw install`).
-
-=== Documentation
+[[documentation]]
+== Documentation

 The spring-cloud-build module has a "docs" profile, and if you switch
-that on it will try to build asciidoc sources from
-`src/main/asciidoc`. As part of that process it will look for a
-`README.adoc` and process it by loading all the includes, but not
+that on it will try to build asciidoc sources using https://docs.antora.org/antora/latest/[Antora] from
+`modules/ROOT/`.
+
+As part of that process it will look for a
+`docs/src/main/asciidoc/README.adoc` and process it by loading all the includes, but not
 parsing or rendering it, just copying it to `${main.basedir}`
-(defaults to `${basedir}`, i.e. the root of the project). If there are
+(defaults to `$\{basedir}`, i.e. the root of the project). If there are
 any changes in the README it will then show up after a Maven build as
 a modified file in the correct place. Just commit it and push the change.

-=== Working with the code
+[[working-with-the-code]]
+== Working with the code
 If you don't have an IDE preference we would recommend that you use
 https://www.springsource.com/developer/sts[Spring Tools Suite] or
 https://eclipse.org[Eclipse] when working with the code. We use the
 https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.

-==== Importing into eclipse with m2eclipse
+[[activate-the-spring-maven-profile]]
+=== Activate the Spring Maven profile
+Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
+the spring milestone and snapshot repositories. Use your preferred IDE to set this
+profile to be active, or you may experience build errors.
+
+[[importing-into-eclipse-with-m2eclipse]]
+=== Importing into eclipse with m2eclipse
 We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
 marketplace".
@@ -177,7 +94,8 @@ add the "spring" profile to your `settings.xml`. Alternatively you can
 copy the repository settings from the "spring" profile of the parent
 pom into your `settings.xml`.

-==== Importing into eclipse without m2eclipse
+[[importing-into-eclipse-without-m2eclipse]]
+=== Importing into eclipse without m2eclipse
 If you prefer not to use m2eclipse you can generate eclipse project metadata using the
 following command:

@@ -190,188 +108,15 @@ The generated eclipse projects can be imported by selecting `import existing pro
 from the `file` menu.


-
 NOTE:  To build the module `spring-cloud-netflix-hystrix-contract` along with the entire Netflix project run the
 `build.sh` script in the `scripts` directory.

+[[contributing]]
 == Contributing

-:spring-cloud-build-branch: master
+NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {github-project}[github].

-Spring Cloud is released under the non-restrictive Apache 2.0 license,
-and follows a very standard Github development process, using Github
-tracker for issues and merging pull requests into master. If you want
-to contribute even something trivial please do not hesitate, but
-follow the guidelines below.
+[[license]]
+== License

-=== Sign the Contributor License Agreement
-Before we accept a non-trivial patch or pull request we will need you to sign the
-https://cla.pivotal.io/sign/spring[Contributor License Agreement].
-Signing the contributor's agreement does not grant anyone commit rights to the main
-repository, but it does mean that we can accept your contributions, and you will get an
-author credit if we do.  Active contributors might be asked to join the core team, and
-given the ability to merge pull requests.
-
-=== Code of Conduct
-This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
-conduct]. By participating, you  are expected to uphold this code. Please report
-unacceptable behavior to spring-code-of-conduct@pivotal.io.
-
-=== Code Conventions and Housekeeping
-None of these is essential for a pull request, but they will all help.  They can also be
-added after the original pull request but before a merge.
-
-* Use the Spring Framework code format conventions. If you use Eclipse
-  you can import formatter settings using the
-  `eclipse-code-formatter.xml` file from the
-  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
-  Cloud Build] project. If using IntelliJ, you can use the
-  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
-  Plugin] to import the same file.
-* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
-  `@author` tag identifying you, and preferably at least a paragraph on what the class is
-  for.
-* Add the ASF license header comment to all new `.java` files (copy from existing files
-  in the project)
-* Add yourself as an `@author` to the .java files that you modify substantially (more
-  than cosmetic changes).
-* Add some Javadocs and, if you change the namespace, some XSD doc elements.
-* A few unit tests would help a lot as well -- someone has to do it.
-* If no-one else is using your branch, please rebase it against the current master (or
-  other target branch in the main project).
-* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
-  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
-  message (where XXXX is the issue number).
-
-=== Checkstyle
-
-Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
-
-.spring-cloud-build-tools/
----
-└── src
-    ├── checkstyle
-    │   └── checkstyle-suppressions.xml <3>
-    └── main
-        └── resources
-            ├── checkstyle-header.txt <2>
-            └── checkstyle.xml <1>
----
-<1> Default Checkstyle rules
-<2> File header setup
-<3> Default suppression rules
-
-==== Checkstyle configuration
-
-Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
-
-.pom.xml
----
-<properties>
-<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
-        <maven-checkstyle-plugin.failsOnViolation>true
-        </maven-checkstyle-plugin.failsOnViolation> <2>
-        <maven-checkstyle-plugin.includeTestSourceDirectory>true
-        </maven-checkstyle-plugin.includeTestSourceDirectory> <3>
-</properties>
-
-<build>
-        <plugins>
-            <plugin> <4>
-                <groupId>io.spring.javaformat</groupId>
-                <artifactId>spring-javaformat-maven-plugin</artifactId>
-            </plugin>
-            <plugin> <5>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-    <reporting>
-        <plugins>
-            <plugin> <5>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </reporting>
-</build>
----
-<1> Fails the build upon Checkstyle errors
-<2> Fails the build upon Checkstyle violations
-<3> Checkstyle analyzes also the test sources
-<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
-<5> Add checkstyle plugin to your build and reporting phases
-
-If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
-
-.projectRoot/src/checkstyle/checkstyle-suppresions.xml
----
-<?xml version="1.0"?>
-<!DOCTYPE suppressions PUBLIC
-		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
-		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-<suppressions>
-	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
-	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
-</suppressions>
----
-
-It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
-
-```bash
-$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
-$ touch .springformat
-```
-
-=== IDE setup
-
-==== Intellij IDEA
-
-In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
-The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
-
-.spring-cloud-build-tools/
----
-└── src
-    ├── checkstyle
-    │   └── checkstyle-suppressions.xml <3>
-    └── main
-        └── resources
-            ├── checkstyle-header.txt <2>
-            ├── checkstyle.xml <1>
-            └── intellij
-                ├── Intellij_Project_Defaults.xml <4>
-                └── Intellij_Spring_Boot_Java_Conventions.xml <5>
----
-<1> Default Checkstyle rules
-<2> File header setup
-<3> Default suppression rules
-<4> Project defaults for Intellij that apply most of Checkstyle rules
-<5> Project style conventions for Intellij that apply most of Checkstyle rules
-
-.Code style
-
-image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
-
-Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
-
-.Inspection profiles
-
-image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
-
-Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
-
-.Checkstyle
-
-To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
-
-image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
-
-Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
-
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
-
-IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
+The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-netflix/main/LICENSE.txt[here].
@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -1,3 +0,0 @@
-releaser:
-  maven:
-    buildCommand: ./scripts/build.sh  {{systemProps}}
@@ -1,383 +0,0 @@
-////
-DO NOT EDIT THIS FILE. IT WAS GENERATED.
-Manual changes to this file will be lost when it is generated again.
-Edit the files in the src/main/asciidoc/ directory instead.
-////
-
-
-:doctype: book
-:idprefix:
-:idseparator: -
-:toc: left
-:toclevels: 4
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
-
-:sc-ext: java
-:project-full-name: Spring Cloud Netflix
-
-image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master"]
-image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master"]
-image::https://api.codacy.com/project/badge/Grade/a6885a06921e4f72a0df0b7aabd6d118["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-netflix?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-netflix&utm_campaign=Badge_Grade"]
-
-
-:doctype: book
-:idprefix:
-:idseparator: -
-:toc: left
-:toclevels: 4
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
-
-:sc-ext: java
-:project-full-name: Spring Cloud Netflix
-
-This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
-and binding to the Spring Environment and other Spring programming model idioms. With a few
-simple annotations you can quickly enable and configure the common patterns inside your
-application and build large distributed systems with battle-tested Netflix components. The
-patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix),
-Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
-
-
-== Features
-
-* Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
-* Service Discovery: an embedded Eureka server can be created with declarative Java configuration
-* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
-* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
-* Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
-
-:doctype: book
-:idprefix:
-:idseparator: -
-:toc: left
-:toclevels: 4
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
-
-:sc-ext: java
-:project-full-name: Spring Cloud Netflix
-
-== Modules In Maintenance Mode
-
-Placing a module in maintenance mode means that the Spring Cloud team will no longer be adding new features to the module.
-We will fix blocker bugs and security issues, and we will also consider and review small pull requests from the community.
-
-We intend to continue to support these modules for a period of at least a year from the general availability
-of the Greenwich release train.
-
-The following Spring Cloud Netflix modules and corresponding starters will be placed into maintenance mode:
-
-* spring-cloud-netflix-archaius
-* spring-cloud-netflix-concurrency-limits
-* spring-cloud-netflix-hystrix-contract
-* spring-cloud-netflix-hystrix-dashboard
-* spring-cloud-netflix-hystrix-stream
-* spring-cloud-netflix-hystrix
-* spring-cloud-netflix-ribbon
-* spring-cloud-netflix-turbine-stream
-* spring-cloud-netflix-turbine
-* spring-cloud-netflix-zuul
-
-NOTE: This does not include the Eureka modules.
-
-
-== Building
-
-:jdkversion: 1.8
-
-=== Basic Compile and Test
-
-To build the source you will need to install JDK {jdkversion}.
-
-Spring Cloud uses Maven for most build-related activities, and you
-should be able to get off the ground quite quickly by cloning the
-project you are interested in and typing
-
----
-$ ./mvnw install
----
-
-NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command
-in place of `./mvnw` in the examples below. If you do that you also
-might need to add `-P spring` if your local Maven settings do not
-contain repository declarations for spring pre-release artifacts.
-
-NOTE: Be aware that you might need to increase the amount of memory
-available to Maven by setting a `MAVEN_OPTS` environment variable with
-a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in
-the `.mvn` configuration, so if you find you have to do it to make a
-build succeed, please raise a ticket to get the settings added to
-source control.
-
-For hints on how to build the project look in `.travis.yml` if there
-is one. There should be a "script" and maybe "install" command. Also
-look at the "services" section to see if any services need to be
-running locally (e.g. mongo or rabbit).  Ignore the git-related bits
-that you might find in "before_install" since they're related to setting git
-credentials and you already have those.
-
-The projects that require middleware generally include a
-`docker-compose.yml`, so consider using
-https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
-in Docker containers. See the README in the
-https://github.com/spring-cloud-samples/scripts[scripts demo
-repository] for specific instructions about the common cases of mongo,
-rabbit and redis.
-
-NOTE: If all else fails, build with the command from `.travis.yml` (usually
-`./mvnw install`).
-
-=== Documentation
-
-The spring-cloud-build module has a "docs" profile, and if you switch
-that on it will try to build asciidoc sources from
-`src/main/asciidoc`. As part of that process it will look for a
-`README.adoc` and process it by loading all the includes, but not
-parsing or rendering it, just copying it to `${main.basedir}`
-(defaults to `${basedir}`, i.e. the root of the project). If there are
-any changes in the README it will then show up after a Maven build as
-a modified file in the correct place. Just commit it and push the change.
-
-=== Working with the code
-If you don't have an IDE preference we would recommend that you use
-https://www.springsource.com/developer/sts[Spring Tools Suite] or
-https://eclipse.org[Eclipse] when working with the code. We use the
-https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
-should also work without issue as long as they use Maven 3.3.3 or better.
-
-==== Activate the Spring Maven profile
-Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
-the spring milestone and snapshot repositories. Use your preferred IDE to set this
-profile to be active, or you may experience build errors.
-
-==== Importing into eclipse with m2eclipse
-We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
-eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
-marketplace".
-
-NOTE: Older versions of m2e do not support Maven 3.3, so once the
-projects are imported into Eclipse you will also need to tell
-m2eclipse to use the right profile for the projects.  If you
-see many different errors related to the POMs in the projects, check
-that you have an up to date installation.  If you can't upgrade m2e,
-add the "spring" profile to your `settings.xml`. Alternatively you can
-copy the repository settings from the "spring" profile of the parent
-pom into your `settings.xml`.
-
-==== Importing into eclipse without m2eclipse
-If you prefer not to use m2eclipse you can generate eclipse project metadata using the
-following command:
-
-[indent=0]
----
-	$ ./mvnw eclipse:eclipse
----
-
-The generated eclipse projects can be imported by selecting `import existing projects`
-from the `file` menu.
-
-
-
-NOTE:  To build the module `spring-cloud-netflix-hystrix-contract` along with the entire Netflix project run the
-`build.sh` script in the `scripts` directory.
-
-== Contributing
-
-:spring-cloud-build-branch: master
-
-Spring Cloud is released under the non-restrictive Apache 2.0 license,
-and follows a very standard Github development process, using Github
-tracker for issues and merging pull requests into master. If you want
-to contribute even something trivial please do not hesitate, but
-follow the guidelines below.
-
-=== Sign the Contributor License Agreement
-Before we accept a non-trivial patch or pull request we will need you to sign the
-https://cla.pivotal.io/sign/spring[Contributor License Agreement].
-Signing the contributor's agreement does not grant anyone commit rights to the main
-repository, but it does mean that we can accept your contributions, and you will get an
-author credit if we do.  Active contributors might be asked to join the core team, and
-given the ability to merge pull requests.
-
-=== Code of Conduct
-This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
-conduct]. By participating, you  are expected to uphold this code. Please report
-unacceptable behavior to spring-code-of-conduct@pivotal.io.
-
-=== Code Conventions and Housekeeping
-None of these is essential for a pull request, but they will all help.  They can also be
-added after the original pull request but before a merge.
-
-* Use the Spring Framework code format conventions. If you use Eclipse
-  you can import formatter settings using the
-  `eclipse-code-formatter.xml` file from the
-  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
-  Cloud Build] project. If using IntelliJ, you can use the
-  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
-  Plugin] to import the same file.
-* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
-  `@author` tag identifying you, and preferably at least a paragraph on what the class is
-  for.
-* Add the ASF license header comment to all new `.java` files (copy from existing files
-  in the project)
-* Add yourself as an `@author` to the .java files that you modify substantially (more
-  than cosmetic changes).
-* Add some Javadocs and, if you change the namespace, some XSD doc elements.
-* A few unit tests would help a lot as well -- someone has to do it.
-* If no-one else is using your branch, please rebase it against the current master (or
-  other target branch in the main project).
-* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
-  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
-  message (where XXXX is the issue number).
-
-=== Checkstyle
-
-Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
-
-.spring-cloud-build-tools/
----
-└── src
-    ├── checkstyle
-    │   └── checkstyle-suppressions.xml <3>
-    └── main
-        └── resources
-            ├── checkstyle-header.txt <2>
-            └── checkstyle.xml <1>
----
-<1> Default Checkstyle rules
-<2> File header setup
-<3> Default suppression rules
-
-==== Checkstyle configuration
-
-Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
-
-.pom.xml
----
-<properties>
-<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
-        <maven-checkstyle-plugin.failsOnViolation>true
-        </maven-checkstyle-plugin.failsOnViolation> <2>
-        <maven-checkstyle-plugin.includeTestSourceDirectory>true
-        </maven-checkstyle-plugin.includeTestSourceDirectory> <3>
-</properties>
-
-<build>
-        <plugins>
-            <plugin> <4>
-                <groupId>io.spring.javaformat</groupId>
-                <artifactId>spring-javaformat-maven-plugin</artifactId>
-            </plugin>
-            <plugin> <5>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-    <reporting>
-        <plugins>
-            <plugin> <5>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </reporting>
-</build>
----
-<1> Fails the build upon Checkstyle errors
-<2> Fails the build upon Checkstyle violations
-<3> Checkstyle analyzes also the test sources
-<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
-<5> Add checkstyle plugin to your build and reporting phases
-
-If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
-
-.projectRoot/src/checkstyle/checkstyle-suppresions.xml
----
-<?xml version="1.0"?>
-<!DOCTYPE suppressions PUBLIC
-		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
-		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-<suppressions>
-	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
-	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
-</suppressions>
----
-
-It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
-
-```bash
-$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
-$ touch .springformat
-```
-
-=== IDE setup
-
-==== Intellij IDEA
-
-In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
-The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
-
-.spring-cloud-build-tools/
----
-└── src
-    ├── checkstyle
-    │   └── checkstyle-suppressions.xml <3>
-    └── main
-        └── resources
-            ├── checkstyle-header.txt <2>
-            ├── checkstyle.xml <1>
-            └── intellij
-                ├── Intellij_Project_Defaults.xml <4>
-                └── Intellij_Spring_Boot_Java_Conventions.xml <5>
----
-<1> Default Checkstyle rules
-<2> File header setup
-<3> Default suppression rules
-<4> Project defaults for Intellij that apply most of Checkstyle rules
-<5> Project style conventions for Intellij that apply most of Checkstyle rules
-
-.Code style
-
-image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
-
-Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
-
-.Inspection profiles
-
-image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
-
-Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
-
-.Checkstyle
-
-To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
-
-image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
-
-Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
-
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
-
-IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
@@ -0,0 +1,33 @@
+antora:
+  extensions:
+    - require: '@springio/antora-extensions'
+      root_component_name: 'cloud-netflix'
+site:
+  title: Spring Cloud Netflix
+  url: https://docs.spring.io/spring-cloud-netflix/reference/
+content:
+  sources:
+    - url: ./..
+      branches: HEAD
+      start_path: docs
+      worktrees: true
+asciidoc:
+  attributes:
+    page-stackoverflow-url: https://stackoverflow.com/tags/spring-cloud
+    page-pagination: ''
+    hide-uri-scheme: '@'
+    tabs-sync-option: '@'
+    chomp: 'all'
+  extensions:
+    - '@asciidoctor/tabs'
+    - '@springio/asciidoctor-extensions'
+  sourcemap: true
+urls:
+  latest_version_segment: ''
+runtime:
+  log:
+    failure_level: warn
+    format: pretty
+ui:
+  bundle:
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.15/ui-bundle.zip
@@ -0,0 +1,12 @@
+name: cloud-netflix
+version: true
+title: Spring Cloud Netflix
+nav:
+  - modules/ROOT/nav.adoc
+ext:
+  collector:
+    run:
+      command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests
+      local: true
+    scan:
+      dir: ./target/classes/antora-resources/
@@ -0,0 +1,5 @@
+* xref:index.adoc[Introduction]
+* xref:spring-cloud-netflix.adoc[]
+* xref:appendix.adoc[]
+** xref:configprops.adoc[]
+
@@ -1,8 +1,6 @@
 :doctype: book
 :idprefix:
 :idseparator: -
-:toc: left
-:toclevels: 4
 :tabsize: 4
 :numbered:
 :sectanchors:
@@ -12,4 +10,4 @@
 :docinfo: shared,private

 :sc-ext: java
-:project-full-name: Spring Cloud Netflix
+:project-full-name: Spring Cloud Netflix
@@ -1,14 +1,13 @@
 :numbered!:
 [appendix]
 [[common-application-properties]]
-== Common application properties
+= Common application properties
+:page-section-summary-toc: 1

-include::_attributes.adoc[]

 Various properties can be specified inside your `application.properties` file, inside your `application.yml` file, or as command line switches.
-This appendix provides a list of common {project-full-name} properties and references to the underlying classes that consume them.
+This appendix provides a list of common Spring Cloud Netflix properties and references to the underlying classes that consume them.

 NOTE: Property contributions can come from additional jar files on your classpath, so you should not consider this an exhaustive list.
 Also, you can define your own properties.

-include::_configprops.adoc[]
@@ -0,0 +1,6 @@
+[[configuration-properties]]
+= Configuration Properties
+
+Below you can find a list of configuration properties.
+
+include::partial$_configprops.adoc[]
@@ -0,0 +1 @@
+include::intro.adoc[]
@@ -1,9 +1,9 @@
-include::_attributes.adoc[]
+[[introduction]]
+= Spring Cloud Netflix

 This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
 and binding to the Spring Environment and other Spring programming model idioms. With a few
 simple annotations you can quickly enable and configure the common patterns inside your
 application and build large distributed systems with battle-tested Netflix components. The 
-patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix), 
-Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
+patterns provided include Service Discovery (Eureka).

@@ -1,20 +1,5 @@
-include::_attributes.adoc[]
-
-
-:github-tag: master
-:github-repo: spring-cloud/spring-cloud-netflix
-:github-raw: https://raw.github.com/{github-repo}/{github-tag}
-:github-code: https://github.com/{github-repo}/tree/{github-tag}
-:all: {asterisk}{asterisk}
-:nofooter:
-:branch: master
-
-= Spring Cloud Netflix
-
-*{spring-cloud-version}*
-
-include::intro.adoc[]
-
+[[features]]
+= Spring Cloud Netflix Features

 == Service Discovery: Eureka Clients

@@ -50,8 +35,9 @@ public class Application {
    }

    public static void main(String[] args) {
-        new SpringApplicationBuilder(Application.class).web(true).run(args);
-    }
+		SpringApplication.run(CustomerServiceTestApplication.class, args);
+	}
+

 }
 ----
@@ -80,13 +66,51 @@ See {github-code}/spring-cloud-netflix-eureka-client/src/main/java/org/springfra

 To disable the Eureka Discovery Client, you can set `eureka.client.enabled` to `false`. Eureka Discovery Client will also be disabled when `spring.cloud.discovery.enabled` is set to `false`.

+
+NOTE: Specifying the version of the Spring Cloud Netflix Eureka server as a path parameter is not currently supported. This means you cannot set the version in the context path (`eurekaServerURLContext`). Instead, you can include the version in the server URL (for example, you can set `defaultZone: http://localhost:8761/eureka/v2`).
+
 === Authenticating with the Eureka Server

 HTTP basic authentication is automatically added to your eureka client if one of the `eureka.client.serviceUrl.defaultZone` URLs has credentials embedded in it (curl style, as follows: `https://user:password@localhost:8761/eureka`).
 For more complex needs, you can create a `@Bean` of type `DiscoveryClientOptionalArgs` and inject `ClientFilter` instances into it, all of which is applied to the calls from the client to the server.

+When Eureka server requires client side certificate for authentication, the client side certificate and trust store can be configured via properties, as shown in following example:
+
+.application.yml
+[source,yaml]
+----
+eureka:
+  client:
+    tls:
+      enabled: true
+      key-store: <path-of-key-store>
+      key-store-type: PKCS12
+      key-store-password: <key-store-password>
+      key-password: <key-password>
+      trust-store: <path-of-trust-store>
+      trust-store-type: PKCS12
+      trust-store-password: <trust-store-password>
+----
+
+The `eureka.client.tls.enabled` needs to be true to enable Eureka client side TLS. When `eureka.client.tls.trust-store` is omitted, a JVM default trust store is used. The default value for `eureka.client.tls.key-store-type` and `eureka.client.tls.trust-store-type` is PKCS12. When password properties are omitted, empty password is assumed.
+
 NOTE: Because of a limitation in Eureka, it is not possible to support per-server basic auth credentials, so only the first set that are found is used.

+If you want to customize the RestTemplate used by the Eureka HTTP Client you may want to create a bean of `EurekaClientHttpRequestFactorySupplier` and provide your own logic for generating a `ClientHttpRequestFactory` instance.
+
+All default timeout-related properties for RestTemplate used by the Eureka HTTP Client are set to 3 minutes (in keeping with Apache HC5 default `RequestConfig` and `SocketConfig`). Therefore, to specify the timeout values, you must specify the value directly with the properties in `eureka.client.rest-template-timeout`. (All timeout properties are in milliseconds.)
+
+.application.yml
+[source,yaml]
+----
+eureka:
+  client:
+    rest-template-timeout:
+      connect-timeout: 5000
+      connect-request-timeout: 8000
+      socket-timeout: 10000
+----
+
 === Status Page and Health Indicator

 The status page and health indicators for a Eureka instance default to `/info` and `/health` respectively, which are the default locations of useful endpoints in a Spring Boot Actuator application.
@@ -107,7 +131,7 @@ that management context path.  This requirement was removed beginning in Edgware

 === Registering a Secure Application

-If your app wants to be contacted over HTTPS, you can set two flags in the `EurekaInstanceConfig`:
+If your app wants to be contacted over HTTPS, you can set two flags in the `EurekaInstanceConfigBean`:

 * `eureka.instance.[nonSecurePortEnabled]=[false]`
 * `eureka.instance.[securePortEnabled]=[true]`
@@ -194,10 +218,10 @@ If the application is planned to be deployed to an AWS cloud, the Eureka instanc
@Bean
@Profile("!default")
 public EurekaInstanceConfigBean eurekaInstanceConfig(InetUtils inetUtils) {
-  EurekaInstanceConfigBean b = new EurekaInstanceConfigBean(inetUtils);
+  EurekaInstanceConfigBean bean = new EurekaInstanceConfigBean(inetUtils);
  AmazonInfo info = AmazonInfo.Builder.newBuilder().autoBuild("eureka");
-  b.setDataCenterInfo(info);
-  return b;
+  bean.setDataCenterInfo(info);
+  return bean;
 }
 ----

@@ -206,7 +230,7 @@ public EurekaInstanceConfigBean eurekaInstanceConfig(InetUtils inetUtils) {
 A vanilla Netflix Eureka instance is registered with an ID that is equal to its host name (that is, there is only one service per host).
 Spring Cloud Eureka provides a sensible default, which is defined as follows:

-`${spring.cloud.client.hostname}:${spring.application.name}:${spring.application.instance_id:${server.port}}}`
+`${spring.cloud.client.hostname}:${spring.application.name}:${spring.application.instance_id:${server.port}}`

 An example is `myhost:myappname:8080`.

@@ -244,40 +268,40 @@ Do not use the `EurekaClient` in a `@PostConstruct` method or in a `@Scheduled`
 It is initialized in a `SmartLifecycle` (with `phase=0`), so the earliest you can rely on it being available is in another `SmartLifecycle` with a higher phase.
 ====

-==== EurekaClient without Jersey
+==== Underlying HTTP clients

-By default, EurekaClient uses Jersey for HTTP communication.
-If you wish to avoid dependencies from Jersey, you can exclude it from your dependencies.
-Spring Cloud auto-configures a transport client based on Spring `RestTemplate`.
-The following example shows Jersey being excluded:
+`EurekaClient` uses either `RestTemplate`, `WebClient` or `JerseyClient` under the hood. In order to use the `EurekaClient`, you need to have one of the supported HTTP clients on your classpath.

+To use `RestTemplate`, add `spring-boot-starter-web` to your dependencies. To use `WebClient`, add `spring-boot-starter-webflux` to your dependencies. If both `RestTemplate` and `WebClient` are on the classpath when `eureka.client.webclient.enabled` is set to `true`, `WebClient` is used. Otherwise, `RestTemplate` is used.
+
+If you wish to use Jersey instead, you need to add the Jersey dependencies to your classpath.
+The following example shows the dependencies you need to add:
+
+[source,xml]
 ----
-<dependency>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-    <exclusions>
-        <exclusion>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-        </exclusion>
-        <exclusion>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-        </exclusion>
-        <exclusion>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-apache-client4</artifactId>
-        </exclusion>
-    </exclusions>
-</dependency>
+<dependencies>
+    <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-client</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-core</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.jersey.contribs</groupId>
+        <artifactId>jersey-apache-client4</artifactId>
+    </dependency>
+</dependencies>
 ----

+If you have `JerseyClient` on the classpath but do not wish to use it in your `EuerekaClient`, make sure to set `eureka.client.jersey.enabled` to `false`.
+
 === Alternatives to the Native Netflix EurekaClient

 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.
-To configure Ribbon with a fixed list of physical servers, you can set `<client>.ribbon.listOfServers` to a comma-separated list of physical addresses (or hostnames), where `<client>` is the ID of the client.
+Spring Cloud has support for <<spring-cloud-feign, Feign>> (a REST client builder) and https://docs.spring.io/spring-cloud-commons/reference/4.1/spring-cloud-commons/loadbalancer.html[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:

@@ -341,7 +365,7 @@ the ability to refresh Eureka clients.  To do this set `eureka.client.refresh.en

 We offer support for the Spring Cloud LoadBalancer `ZonePreferenceServiceInstanceListSupplier`.
 The `zone` value from the Eureka instance metadata (`eureka.instance.metadataMap.zone`) is used for setting the
-value of `spring-clod-loadbalancer-zone` property that is used to filter service instances by zone.
+value of `spring-cloud-loadbalancer-zone` property that is used to filter service instances by zone.

 If that is missing and if the `spring.cloud.loadbalancer.eureka.approximateZoneFromHostname` flag is set to `true`,
 it can use the domain name from the server hostname as a proxy for the zone.
@@ -349,6 +373,14 @@ it can use the domain name from the server hostname as a proxy for the zone.
 If there is no other source of zone data, then a guess is made, based on the client configuration (as opposed to the instance configuration).
 We take `eureka.client.availabilityZones`, which is a map from region name to a list of zones, and pull out the first zone for the instance's own region (that is, the `eureka.client.region`, which defaults to "us-east-1", for compatibility with native Netflix).

+=== AOT and Native Image Support
+
+Spring Cloud Netflix Eureka Client integration supports Spring AOT transformations and native images, however, only with refresh mode disabled.
+
+WARNING: If you want to run Eureka Client in AOT or native image modes, make sure to set `spring.cloud.refresh.enabled` to `false`.
+
+NOTE:  Given the AOT and native image closed-world assumption, using random port with Eureka clients is not supported for ahead of time compilation or native images.
+
 [[spring-cloud-eureka-server]]
 == Service Discovery: Eureka Server

@@ -382,8 +414,9 @@ The following example shows a minimal Eureka server:
 public class Application {

    public static void main(String[] args) {
-        new SpringApplicationBuilder(Application.class).web(true).run(args);
-    }
+		SpringApplication.run(CustomerServiceTestApplication.class, args);
+	}
+

 }
 ----
@@ -416,6 +449,10 @@ dependencyManagement {
 ----
 ====

+=== `defaultOpenForTrafficCount` and its effect on EurekaServer warmup time
+
+Netflix Eureka's `waitTimeInMsWhenSyncEmpty` setting is not taken into account in Spring Cloud Eureka server at the beginning. In order to enable the warmup time, set `eureka.server.defaultOpenForTrafficCount=0`.
+
 [[spring-cloud-eureka-server-zones-and-regions]]
 === High Availability, Zones and Regions

@@ -425,8 +462,6 @@ Clients also have an in-memory cache of Eureka registrations (so they do not hav
 By default, every Eureka server is also a Eureka client and requires (at least one) service URL to locate a peer.
 If you do not provide it, the service runs and works, but it fills your logs with a lot of noise about not being able to register with the peer.

-See also <<spring-cloud-ribbon,below for details of Ribbon support>> on the client side for Zones and Regions.
-
 [[spring-cloud-eureka-server-standalone-mode]]
 === Standalone Mode

@@ -490,7 +525,7 @@ the registrations amongst themselves.
 If the peers are physically separated (inside a data center or between multiple data centers), then the system can, in principle, survive "`split-brain`" type failures.
 You can add multiple peers to a system, and as long as they are all
 directly connected to each other, they will synchronize
-the registrations amongst themselves. 
+the registrations amongst themselves.

 .application.yml (Three Peer Aware Eureka Servers)
 ----
@@ -498,7 +533,7 @@ eureka:
  client:
    serviceUrl:
      defaultZone: https://peer1/eureka/,http://peer2/eureka/,http://peer3/eureka/
-      
+
 ---
 spring:
  profiles: peer1
@@ -531,33 +566,32 @@ Set `eureka.instance.preferIpAddress` to `true` and, when the application regist
 ====
 If the hostname cannot be determined by Java, then the IP address is sent to Eureka.
 Only explict way of setting the hostname is by setting `eureka.instance.hostname` property.
-You can set your hostname at the run-time by using an environment variable -- for example, `eureka.instance.hostname=${HOST_NAME}`.
+You can set your hostname at the run-time by using an environment variable -- for example, `eureka.instance.hostname=$\{HOST_NAME}`.
 ====

 === Securing The Eureka Server

 You can secure your Eureka server simply by adding Spring Security to your
-server's classpath via `spring-boot-starter-security`.  By default when Spring Security is on the classpath it will require that
+server's classpath via `spring-boot-starter-security`.  By default, when Spring Security is on the classpath it will require that
 a valid CSRF token be sent with every request to the app.  Eureka clients will not generally possess a valid
 cross site request forgery (CSRF) token you will need to disable this requirement for the `/eureka/**` endpoints.
-For example: 
+For example:

 [source,java,indent=0]
 ----
-@EnableWebSecurity
-class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().ignoringAntMatchers("/eureka/**");
-        super.configure(http);
-    }
+@Bean
+public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+	http.authorizeHttpRequests((authz) -> authz
+        .anyRequest().authenticated())
+	    .httpBasic(withDefaults());
+    http.csrf().ignoringRequestMatchers("/eureka/**");
+    return http.build();
 }
 ----

 For more information on CSRF see the https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#csrf[Spring Security documentation].

-A demo Eureka Server can be found in the Spring Cloud Samples https://github.com/spring-cloud-samples/eureka/tree/Eureka-With-Security[repo].
+A demo Eureka Server can be found in the Spring Cloud Samples https://github.com/spring-cloud-samples/eureka/tree/Eureka-With-Security-4.x[repo].

 === JDK 11 Support

@@ -572,6 +606,21 @@ when running a Eureka server you must include these dependencies in your POM or
 </dependency>
 ----

+=== AOT and Native Image Support
+
+Spring Cloud Netflix Eureka Server does not support Spring AOT transformations or native images.
+
+=== Metrics
+
+`EurekaInstanceMonitor` listens to events related to Eureka instance registration and creates/updates `Gauge`s for Eureka instance information in Micrometer's `MeterRegistry`. By default, this behavior is disabled. If you want to enable it, you need to set `eureka.server.metrics.enabled` to `true`.
+
+By default, the `Gauge`s are named `eureka.server.instances` and have the following tags:
+
+- `application`: application name
+- `status`: instance status (`UP`, `DOWN`, `STARTING`, `OUT_OF_SERVICE`, `UNKNOWN`, see: `com.netflix.appinfo.InstanceInfo.InstanceStatus`)
+
+You can add additional tags by injecting your own implementation of `EurekaInstanceTagsProvider`.
+
 == Configuration properties

 To see the list of all Spring Cloud Netflix related configuration properties please check link:appendix.html[the Appendix page].
@@ -0,0 +1,262 @@
+|===
+|Name | Default | Description
+
+|eureka.client.allow-redirects | `+++false+++` | Indicates whether server can redirect a client request to a backup server/cluster. If set to false, the server will handle the request directly, If set to true, it may send HTTP redirect to the client, with a new server location.
+|eureka.client.availability-zones |  | Gets the list of availability zones (used in AWS data centers) for the region in which this instance resides. The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSeconds.
+|eureka.client.backup-registry-impl |  | Gets the name of the implementation which implements BackupRegistry to fetch the registry information as a fallback option for only the first time when the eureka client starts. This may be needed for applications which needs additional resiliency for registry information without which it cannot operate.
+|eureka.client.cache-refresh-executor-exponential-back-off-bound | `+++10+++` | Cache refresh executor exponential back off related property. It is a maximum multiplier value for retry delay, in case where a sequence of timeouts occurred.
+|eureka.client.cache-refresh-executor-thread-pool-size | `+++2+++` | The thread pool size for the cacheRefreshExecutor to initialise with.
+|eureka.client.client-data-accept |  | EurekaAccept name for client data accept.
+|eureka.client.decoder-name |  | This is a transient config and once the latest codecs are stable, can be removed (as there will only be one).
+|eureka.client.disable-delta | `+++false+++` | Indicates whether the eureka client should disable fetching of delta and should rather resort to getting the full registry information. Note that the delta fetches can reduce the traffic tremendously, because the rate of change with the eureka server is normally much lower than the rate of fetches. The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSeconds
+|eureka.client.dollar-replacement | `+++_-+++` | Get a replacement string for Dollar sign <code>$</code> during serializing/deserializing information in eureka server.
+|eureka.client.enabled | `+++true+++` | Flag to indicate that the Eureka client is enabled.
+|eureka.client.encoder-name |  | This is a transient config and once the latest codecs are stable, can be removed (as there will only be one).
+|eureka.client.escape-char-replacement | `+++__+++` | Get a replacement string for underscore sign <code>_</code> during serializing/ deserializing information in eureka server.
+|eureka.client.eureka-connection-idle-timeout-seconds | `+++30+++` | Indicates how much time (in seconds) that the HTTP connections to eureka server can stay idle before it can be closed. In the AWS environment, it is recommended that the values is 30 seconds or less, since the firewall cleans up the connection information after a few mins leaving the connection hanging in limbo.
+|eureka.client.eureka-server-connect-timeout-seconds | `+++5+++` | Indicates how long to wait (in seconds) before a connection to eureka server needs to timeout. Note that the connections in the client are pooled by {@link HttpClient} and this setting affects the actual connection creation and also the wait time to get the connection from the pool.
+|eureka.client.eureka-server-d-n-s-name |  | Gets the DNS name to be queried to get the list of eureka servers.This information is not required if the contract returns the service urls by implementing serviceUrls. The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
+|eureka.client.eureka-server-port |  | Gets the port to be used to construct the service url to contact eureka server when the list of eureka servers come from the DNS.This information is not required if the contract returns the service urls eurekaServerServiceUrls(String). The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
+|eureka.client.eureka-server-read-timeout-seconds | `+++8+++` | Indicates how long to wait (in seconds) before a read from eureka server needs to timeout.
+|eureka.client.eureka-server-total-connections | `+++200+++` | Gets the total number of connections that is allowed from eureka client to all eureka servers.
+|eureka.client.eureka-server-total-connections-per-host | `+++50+++` | Gets the total number of connections that is allowed from eureka client to a eureka server host.
+|eureka.client.eureka-server-u-r-l-context |  | Gets the URL context to be used to construct the service url to contact eureka server when the list of eureka servers come from the DNS. This information is not required if the contract returns the service urls from eurekaServerServiceUrls. The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
+|eureka.client.eureka-service-url-poll-interval-seconds | `+++300+++` | Indicates how often(in seconds) to poll for changes to eureka server information. Eureka servers could be added or removed and this setting controls how soon the eureka clients should know about it.
+|eureka.client.fetch-registry | `+++true+++` | Indicates whether this client should fetch eureka registry information from eureka server.
+|eureka.client.fetch-remote-regions-registry |  | Comma separated list of regions for which the eureka registry information will be fetched. It is mandatory to define the availability zones for each of these regions as returned by availabilityZones. Failing to do so, will result in failure of discovery client startup.
+|eureka.client.filter-only-up-instances | `+++true+++` | Indicates whether to get the applications after filtering the applications for instances with only InstanceStatus UP states.
+|eureka.client.g-zip-content | `+++true+++` | Indicates whether the content fetched from eureka server has to be compressed whenever it is supported by the server. The registry information from the eureka server is compressed for optimum network traffic.
+|eureka.client.healthcheck.enabled | `+++true+++` | Enables the Eureka health check handler.
+|eureka.client.heartbeat-executor-exponential-back-off-bound | `+++10+++` | Heartbeat executor exponential back off related property. It is a maximum multiplier value for retry delay, in case where a sequence of timeouts occurred.
+|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.
+|eureka.client.prefer-same-zone-eureka | `+++true+++` | Indicates whether or not this instance should try to use the eureka server in the same zone for latency and/or other reason. Ideally eureka clients are configured to talk to servers in the same zone The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSeconds
+|eureka.client.property-resolver |  | 
+|eureka.client.proxy-host |  | Gets the proxy host to eureka server if any.
+|eureka.client.proxy-password |  | Gets the proxy password if any.
+|eureka.client.proxy-port |  | Gets the proxy port to eureka server if any.
+|eureka.client.proxy-user-name |  | Gets the proxy user name if any.
+|eureka.client.refresh.enable | `+++true+++` | Determines whether the EurekaClient instance can be refreshed or not(If disabled none of the Eureka client properties will be refreshable).
+|eureka.client.region | `+++us-east-1+++` | Gets the region (used in AWS datacenters) where this instance resides.
+|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.client.registry-fetch-interval-seconds | `+++30+++` | Indicates how often(in seconds) to fetch the registry information from the eureka server.
+|eureka.client.registry-refresh-single-vip-address |  | Indicates whether the client is only interested in the registry information for a single VIP.
+|eureka.client.rest-template-timeout.connect-request-timeout | `+++180000+++` | 
+|eureka.client.rest-template-timeout.connect-timeout | `+++180000+++` | Default values are set to 180000, in keeping with {@link RequestConfig} and {@link SocketConfig} defaults.
+|eureka.client.rest-template-timeout.socket-timeout | `+++180000+++` | 
+|eureka.client.service-url |  | Map of availability zone to list of fully qualified URLs to communicate with eureka server. Each value can be a single URL or a comma separated list of alternative locations. Typically the eureka server URLs carry protocol,host,port,context and version information if any. Example: https://ec2-256-156-243-129.compute-1.amazonaws.com:7001/eureka/ The changes are effective at runtime at the next service url refresh cycle as specified by eurekaServiceUrlPollIntervalSeconds.
+|eureka.client.should-enforce-registration-at-init | `+++false+++` | Indicates whether the client should enforce registration during initialization. Defaults to false.
+|eureka.client.should-unregister-on-shutdown | `+++true+++` | Indicates whether the client should explicitly unregister itself from the remote server on client shutdown.
+|eureka.client.tls.enabled |  | 
+|eureka.client.tls.key-password |  | 
+|eureka.client.tls.key-store |  | 
+|eureka.client.tls.key-store-password |  | 
+|eureka.client.tls.key-store-type |  | 
+|eureka.client.tls.trust-store |  | 
+|eureka.client.tls.trust-store-password |  | 
+|eureka.client.tls.trust-store-type |  | 
+|eureka.client.use-dns-for-fetching-service-urls | `+++false+++` | Indicates whether the eureka client should use the DNS mechanism to fetch a list of eureka servers to talk to. When the DNS name is updated to have additional servers, that information is used immediately after the eureka client polls for that information as specified in eurekaServiceUrlPollIntervalSeconds. Alternatively, the service urls can be returned serviceUrls, but the users should implement their own mechanism to return the updated list in case of changes. The changes are effective at runtime.
+|eureka.client.webclient.enabled | `+++false+++` | Enables the use of WebClient for Eureka HTTP Client.
+|eureka.dashboard.enabled | `+++true+++` | Flag to enable the Eureka dashboard. Default true.
+|eureka.dashboard.path | `+++/+++` | The path to the Eureka dashboard (relative to the servlet path). Defaults to "/".
+|eureka.datacenter | `+++default+++` | Eureka datacenter. Defaults to "default".
+|eureka.environment | `+++test+++` | Eureka environment. Defaults to "test".
+|eureka.instance.a-s-g-name |  | Gets the AWS autoscaling group name associated with this instance. This information is specifically used in an AWS environment to automatically put an instance out of service after the instance is launched and it has been disabled for traffic..
+|eureka.instance.app-group-name |  | Get the name of the application group to be registered with eureka.
+|eureka.instance.appname | `+++unknown+++` | Get the name of the application to be registered with eureka.
+|eureka.instance.async-client-initialization | `+++false+++` | If true the EurekaClient will be initialized asynchronously when the InstanceRegistry bean is created.
+|eureka.instance.data-center-info |  | Returns the data center this instance is deployed. This information is used to get some AWS specific instance information if the instance is deployed in AWS.
+|eureka.instance.default-address-resolution-order | `+++[]+++` | 
+|eureka.instance.environment |  | 
+|eureka.instance.health-check-url |  | Gets the absolute health check page URL for this instance. The users can provide the healthCheckUrlPath if the health check page resides in the same instance talking to eureka, else in the cases where the instance is a proxy for some other server, users can provide the full URL. If the full URL is provided it takes precedence. <p> It is normally used for making educated decisions based on the health of the instance - for example, it can be used to determine whether to proceed deployments to an entire farm or stop the deployments without causing further damage. The full URL should follow the format http://${eureka.hostname}:7001/ where the value ${eureka.hostname} is replaced at runtime.
+|eureka.instance.health-check-url-path |  | Gets the relative health check URL path for this instance. The health check page URL is then constructed out of the hostname and the type of communication - secure or unsecure as specified in securePort and nonSecurePort. It is normally used for making educated decisions based on the health of the instance - for example, it can be used to determine whether to proceed deployments to an entire farm or stop the deployments without causing further damage.
+|eureka.instance.home-page-url |  | Gets the absolute home page URL for this instance. The users can provide the homePageUrlPath if the home page resides in the same instance talking to eureka, else in the cases where the instance is a proxy for some other server, users can provide the full URL. If the full URL is provided it takes precedence. It is normally used for informational purposes for other services to use it as a landing page. The full URL should follow the format http://${eureka.hostname}:7001/ where the value ${eureka.hostname} is replaced at runtime.
+|eureka.instance.home-page-url-path | `+++/+++` | Gets the relative home page URL Path for this instance. The home page URL is then constructed out of the hostName and the type of communication - secure or unsecure. It is normally used for informational purposes for other services to use it as a landing page.
+|eureka.instance.hostname |  | The hostname if it can be determined at configuration time (otherwise it will be guessed from OS primitives).
+|eureka.instance.initial-status |  | Initial status to register with remote Eureka server.
+|eureka.instance.instance-enabled-onit | `+++false+++` | Indicates whether the instance should be enabled for taking traffic as soon as it is registered with eureka. Sometimes the application might need to do some pre-processing before it is ready to take traffic.
+|eureka.instance.instance-id |  | Get the unique Id (within the scope of the appName) of this instance to be registered with eureka.
+|eureka.instance.ip-address |  | Get the IPAdress of the instance. This information is for academic purposes only as the communication from other instances primarily happen using the information supplied in {@link #getHostName(boolean)}.
+|eureka.instance.lease-expiration-duration-in-seconds | `+++90+++` | Indicates the time in seconds that the eureka server waits since it received the last heartbeat before it can remove this instance from its view and there by disallowing traffic to this instance. Setting this value too long could mean that the traffic could be routed to the instance even though the instance is not alive. Setting this value too small could mean, the instance may be taken out of traffic because of temporary network glitches.This value to be set to atleast higher than the value specified in leaseRenewalIntervalInSeconds.
+|eureka.instance.lease-renewal-interval-in-seconds | `+++30+++` | Indicates how often (in seconds) the eureka client needs to send heartbeats to eureka server to indicate that it is still alive. If the heartbeats are not received for the period specified in leaseExpirationDurationInSeconds, eureka server will remove the instance from its view, there by disallowing traffic to this instance. Note that the instance could still not take traffic if it implements HealthCheckCallback and then decides to make itself unavailable.
+|eureka.instance.metadata-map |  | Gets the metadata name/value pairs associated with this instance. This information is sent to eureka server and can be used by other instances.
+|eureka.instance.metadata-map.weight | `+++1+++` | The weight of service instance for weighted load balancing.
+|eureka.instance.namespace | `+++eureka+++` | Get the namespace used to find properties. Ignored in Spring Cloud.
+|eureka.instance.non-secure-port | `+++80+++` | Get the non-secure port on which the instance should receive traffic.
+|eureka.instance.non-secure-port-enabled | `+++true+++` | Indicates whether the non-secure port should be enabled for traffic or not.
+|eureka.instance.prefer-ip-address | `+++false+++` | Flag to say that, when guessing a hostname, the IP address of the server should be used in preference to the hostname reported by the OS.
+|eureka.instance.registry.default-open-for-traffic-count | `+++1+++` | Value used in determining when leases are cancelled, default to 1 for standalone. Should be set to 0 for peer replicated eurekas
+|eureka.instance.registry.expected-number-of-clients-sending-renews | `+++1+++` | 
+|eureka.instance.secure-health-check-url |  | Gets the absolute secure health check page URL for this instance. The users can provide the secureHealthCheckUrl if the health check page resides in the same instance talking to eureka, else in the cases where the instance is a proxy for some other server, users can provide the full URL. If the full URL is provided it takes precedence. <p> It is normally used for making educated decisions based on the health of the instance - for example, it can be used to determine whether to proceed deployments to an entire farm or stop the deployments without causing further damage. The full URL should follow the format http://${eureka.hostname}:7001/ where the value ${eureka.hostname} is replaced at runtime.
+|eureka.instance.secure-port | `+++443+++` | Get the Secure port on which the instance should receive traffic.
+|eureka.instance.secure-port-enabled | `+++false+++` | Indicates whether the secure port should be enabled for traffic or not.
+|eureka.instance.secure-virtual-host-name | `+++unknown+++` | Gets the secure virtual host name defined for this instance. This is typically the way other instance would find this instance by using the secure virtual host name.Think of this as similar to the fully qualified domain name, that the users of your services will need to find this instance.
+|eureka.instance.status-page-url |  | Gets the absolute status page URL path for this instance. The users can provide the statusPageUrlPath if the status page resides in the same instance talking to eureka, else in the cases where the instance is a proxy for some other server, users can provide the full URL. If the full URL is provided it takes precedence. It is normally used for informational purposes for other services to find about the status of this instance. Users can provide a simple HTML indicating what is the current status of the instance.
+|eureka.instance.status-page-url-path |  | Gets the relative status page URL path for this instance. The status page URL is then constructed out of the hostName and the type of communication - secure or unsecure as specified in securePort and nonSecurePort. It is normally used for informational purposes for other services to find about the status of this instance. Users can provide a simple HTML indicating what is the current status of the instance.
+|eureka.instance.virtual-host-name | `+++unknown+++` | Gets the virtual host name defined for this instance. This is typically the way other instance would find this instance by using the virtual host name.Think of this as similar to the fully qualified domain name, that the users of your services will need to find this instance.
+|eureka.server.a-s-g-cache-expiry-timeout-ms | `+++600000+++` | 
+|eureka.server.a-s-g-query-timeout-ms | `+++300+++` | 
+|eureka.server.a-s-g-update-interval-ms | `+++300000+++` | 
+|eureka.server.a-w-s-access-id |  | 
+|eureka.server.a-w-s-secret-key |  | 
+|eureka.server.batch-replication | `+++false+++` | 
+|eureka.server.binding-strategy |  | 
+|eureka.server.delta-retention-timer-interval-in-ms | `+++30000+++` | 
+|eureka.server.disable-delta | `+++false+++` | 
+|eureka.server.disable-delta-for-remote-regions | `+++false+++` | 
+|eureka.server.disable-transparent-fallback-to-other-region | `+++false+++` | 
+|eureka.server.e-i-p-bind-rebind-retries | `+++3+++` | 
+|eureka.server.e-i-p-binding-retry-interval-ms | `+++300000+++` | 
+|eureka.server.e-i-p-binding-retry-interval-ms-when-unbound | `+++60000+++` | 
+|eureka.server.enable-replicated-request-compression | `+++false+++` | 
+|eureka.server.enable-self-preservation | `+++true+++` | 
+|eureka.server.eviction-interval-timer-in-ms | `+++0+++` | 
+|eureka.server.expected-client-renewal-interval-seconds | `+++30+++` | 
+|eureka.server.g-zip-content-from-remote-region | `+++true+++` | 
+|eureka.server.initial-capacity-of-response-cache | `+++1000+++` | 
+|eureka.server.json-codec-name |  | 
+|eureka.server.list-auto-scaling-groups-role-name | `+++ListAutoScalingGroups+++` | 
+|eureka.server.log-identity-headers | `+++true+++` | 
+|eureka.server.max-elements-in-peer-replication-pool | `+++10000+++` | 
+|eureka.server.max-elements-in-status-replication-pool | `+++10000+++` | 
+|eureka.server.max-idle-thread-age-in-minutes-for-peer-replication | `+++15+++` | 
+|eureka.server.max-idle-thread-in-minutes-age-for-status-replication | `+++10+++` | 
+|eureka.server.max-threads-for-peer-replication | `+++20+++` | 
+|eureka.server.max-threads-for-status-replication | `+++1+++` | 
+|eureka.server.max-time-for-replication | `+++30000+++` | 
+|eureka.server.metrics.enabled | `+++false+++` | Indicates whether the metrics should be enabled for eureka instances.
+|eureka.server.min-available-instances-for-peer-replication | `+++-1+++` | 
+|eureka.server.min-threads-for-peer-replication | `+++5+++` | 
+|eureka.server.min-threads-for-status-replication | `+++1+++` | 
+|eureka.server.my-url |  | 
+|eureka.server.number-of-replication-retries | `+++5+++` | 
+|eureka.server.peer-eureka-nodes-update-interval-ms | `+++600000+++` | 
+|eureka.server.peer-eureka-status-refresh-time-interval-ms | `+++0+++` | 
+|eureka.server.peer-node-connect-timeout-ms | `+++200+++` | 
+|eureka.server.peer-node-connection-idle-timeout-seconds | `+++30+++` | 
+|eureka.server.peer-node-read-timeout-ms | `+++200+++` | 
+|eureka.server.peer-node-total-connections | `+++1000+++` | 
+|eureka.server.peer-node-total-connections-per-host | `+++500+++` | 
+|eureka.server.prime-aws-replica-connections | `+++true+++` | 
+|eureka.server.property-resolver |  | 
+|eureka.server.rate-limiter-burst-size | `+++10+++` | 
+|eureka.server.rate-limiter-enabled | `+++false+++` | 
+|eureka.server.rate-limiter-full-fetch-average-rate | `+++100+++` | 
+|eureka.server.rate-limiter-privileged-clients |  | 
+|eureka.server.rate-limiter-registry-fetch-average-rate | `+++500+++` | 
+|eureka.server.rate-limiter-throttle-standard-clients | `+++false+++` | 
+|eureka.server.registry-sync-retries | `+++0+++` | 
+|eureka.server.registry-sync-retry-wait-ms | `+++0+++` | 
+|eureka.server.remote-region-app-whitelist |  | 
+|eureka.server.remote-region-connect-timeout-ms | `+++1000+++` | 
+|eureka.server.remote-region-connection-idle-timeout-seconds | `+++30+++` | 
+|eureka.server.remote-region-fetch-thread-pool-size | `+++20+++` | 
+|eureka.server.remote-region-read-timeout-ms | `+++1000+++` | 
+|eureka.server.remote-region-registry-fetch-interval | `+++30+++` | 
+|eureka.server.remote-region-total-connections | `+++1000+++` | 
+|eureka.server.remote-region-total-connections-per-host | `+++500+++` | 
+|eureka.server.remote-region-trust-store |  | 
+|eureka.server.remote-region-trust-store-password | `+++changeit+++` | 
+|eureka.server.remote-region-urls |  | 
+|eureka.server.remote-region-urls-with-name |  | 
+|eureka.server.renewal-percent-threshold | `+++0.85+++` | 
+|eureka.server.renewal-threshold-update-interval-ms | `+++900000+++` | 
+|eureka.server.response-cache-auto-expiration-in-seconds | `+++180+++` | 
+|eureka.server.response-cache-update-interval-ms | `+++30000+++` | 
+|eureka.server.retention-time-in-m-s-in-delta-queue | `+++180000+++` | 
+|eureka.server.route53-bind-rebind-retries | `+++3+++` | 
+|eureka.server.route53-binding-retry-interval-ms | `+++300000+++` | 
+|eureka.server.route53-domain-t-t-l | `+++30+++` | 
+|eureka.server.sync-when-timestamp-differs | `+++true+++` | 
+|eureka.server.use-read-only-response-cache | `+++true+++` | 
+|eureka.server.wait-time-in-ms-when-sync-empty | `+++300000+++` | 
+|eureka.server.xml-codec-name |  | 
+|spring.cloud.compatibility-verifier.compatible-boot-versions |  | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x}
+|spring.cloud.compatibility-verifier.enabled | `+++false+++` | Enables creation of Spring Cloud compatibility verification.
+|spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true.
+|spring.cloud.config.initialize-on-context-refresh | `+++false+++` | Flag to initialize bootstrap configuration on context refresh event. Default false.
+|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. This will only have an effect when using config first bootstrap.
+|spring.cloud.config.override-system-properties | `+++true+++` | Flag to indicate that the external properties should override system properties. Default true.
+|spring.cloud.decrypt-environment-post-processor.enabled | `+++true+++` | Enable the DecryptEnvironmentPostProcessor.
+|spring.cloud.discovery.client.composite-indicator.enabled | `+++true+++` | Enables discovery client composite health indicator.
+|spring.cloud.discovery.client.health-indicator.enabled | `+++true+++` | 
+|spring.cloud.discovery.client.health-indicator.include-description | `+++false+++` | 
+|spring.cloud.discovery.client.health-indicator.use-services-query | `+++true+++` | Whether or not the indicator should use {@link DiscoveryClient#getServices} to check its health. When set to {@code false} the indicator instead uses the lighter {@link DiscoveryClient#probe()}. This can be helpful in large deployments where the number of services returned makes the operation unnecessarily heavy.
+|spring.cloud.discovery.client.simple.instances |  | 
+|spring.cloud.discovery.client.simple.local.host |  | 
+|spring.cloud.discovery.client.simple.local.instance-id |  | 
+|spring.cloud.discovery.client.simple.local.metadata |  | 
+|spring.cloud.discovery.client.simple.local.port | `+++0+++` | 
+|spring.cloud.discovery.client.simple.local.secure | `+++false+++` | 
+|spring.cloud.discovery.client.simple.local.service-id |  | 
+|spring.cloud.discovery.client.simple.local.uri |  | 
+|spring.cloud.discovery.client.simple.order |  | 
+|spring.cloud.discovery.enabled | `+++true+++` | Enables discovery client health indicators.
+|spring.cloud.features.enabled | `+++true+++` | Enables the features endpoint.
+|spring.cloud.httpclientfactories.apache.enabled | `+++true+++` | Enables creation of Apache Http Client factory beans.
+|spring.cloud.httpclientfactories.ok.enabled | `+++true+++` | Enables creation of OK Http Client factory beans.
+|spring.cloud.hypermedia.refresh.fixed-delay | `+++5000+++` | 
+|spring.cloud.hypermedia.refresh.initial-delay | `+++10000+++` | 
+|spring.cloud.inetutils.default-hostname | `+++localhost+++` | The default hostname. Used in case of errors.
+|spring.cloud.inetutils.default-ip-address | `+++127.0.0.1+++` | The default IP address. Used in case of errors.
+|spring.cloud.inetutils.ignored-interfaces |  | List of Java regular expressions for network interfaces that will be ignored.
+|spring.cloud.inetutils.preferred-networks |  | List of Java regular expressions for network addresses that will be preferred.
+|spring.cloud.inetutils.timeout-seconds | `+++1+++` | Timeout, in seconds, for calculating hostname.
+|spring.cloud.inetutils.use-only-site-local-interfaces | `+++false+++` | Whether to use only interfaces with site local addresses. See {@link InetAddress#isSiteLocalAddress()} for more details.
+|spring.cloud.loadbalancer.cache.caffeine.spec |  | The spec to use to create caches. See CaffeineSpec for more details on the spec format.
+|spring.cloud.loadbalancer.cache.capacity | `+++256+++` | Initial cache capacity expressed as int.
+|spring.cloud.loadbalancer.cache.enabled | `+++true+++` | Enables Spring Cloud LoadBalancer caching mechanism.
+|spring.cloud.loadbalancer.cache.ttl | `+++35s+++` | Time To Live - time counted from writing of the record, after which cache entries are expired, expressed as a {@link Duration}. The property {@link String} has to be in keeping with the appropriate syntax as specified in Spring Boot <code>StringToDurationConverter</code>. @see <a href= "https://github.com/spring-projects/spring-boot/blob/master/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/StringToDurationConverter.java">StringToDurationConverter.java</a>
+|spring.cloud.loadbalancer.call-get-with-request-on-delegates | `+++true+++` | If this flag is set to {@code true}, {@code ServiceInstanceListSupplier#get(Request request)} method will be implemented to call {@code delegate.get(request)} in classes assignable from {@code DelegatingServiceInstanceListSupplier} that don't already implement that method, with the exclusion of {@code CachingServiceInstanceListSupplier} and {@code HealthCheckServiceInstanceListSupplier}, which should be placed in the instance supplier hierarchy directly after the supplier performing instance retrieval over the network, before any request-based filtering is done, {@code true} by default.
+|spring.cloud.loadbalancer.clients |  | 
+|spring.cloud.loadbalancer.configurations | `+++default+++` | Enables a predefined LoadBalancer configuration.
+|spring.cloud.loadbalancer.eager-load.clients |  | Names of the clients.
+|spring.cloud.loadbalancer.enabled | `+++true+++` | Enables Spring Cloud LoadBalancer.
+|spring.cloud.loadbalancer.eureka.approximate-zone-from-hostname | `+++false+++` | Used to determine whether we should try to get the `zone` value from host name.
+|spring.cloud.loadbalancer.health-check.initial-delay | `+++0+++` | Initial delay value for the HealthCheck scheduler.
+|spring.cloud.loadbalancer.health-check.interval | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
+|spring.cloud.loadbalancer.health-check.interval  | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
+|spring.cloud.loadbalancer.health-check.path |  | Path at which the health-check request should be made. Can be set up per `serviceId`. A `default` value can be set up as well. If none is set up, `/actuator/health` will be used.
+|spring.cloud.loadbalancer.health-check.port |  | Path at which the health-check request should be made. If none is set, the port under which the requested service is available at the service instance.
+|spring.cloud.loadbalancer.health-check.refetch-instances | `+++false+++` | Indicates whether the instances should be refetched by the `HealthCheckServiceInstanceListSupplier`. This can be used if the instances can be updated and the underlying delegate does not provide an ongoing flux.
+|spring.cloud.loadbalancer.health-check.refetch-instances-interval | `+++25s+++` | Interval for refetching available service instances.
+|spring.cloud.loadbalancer.health-check.repeat-health-check | `+++true+++` | Indicates whether health checks should keep repeating. It might be useful to set it to `false` if periodically refetching the instances, as every refetch will also trigger a healthcheck.
+|spring.cloud.loadbalancer.health-check.update-results-list | `+++true+++` | Indicates whether the {@code healthCheckFlux} should emit on each alive {@link ServiceInstance} that has been retrieved. If set to {@code false}, the entire alive instances sequence is first collected into a list and only then emitted.
+|spring.cloud.loadbalancer.hint |  | Allows setting the value of <code>hint</code> that is passed on to the LoadBalancer request and can subsequently be used in {@link ReactiveLoadBalancer} implementations.
+|spring.cloud.loadbalancer.hint-header-name | `+++X-SC-LB-Hint+++` | Allows setting the name of the header used for passing the hint for hint-based service instance filtering.
+|spring.cloud.loadbalancer.retry.avoid-previous-instance | `+++true+++` | Enables wrapping ServiceInstanceListSupplier beans with `RetryAwareServiceInstanceListSupplier` if Spring-Retry is in the classpath.
+|spring.cloud.loadbalancer.retry.backoff.enabled | `+++false+++` | Indicates whether Reactor Retry backoffs should be applied.
+|spring.cloud.loadbalancer.retry.backoff.jitter | `+++0.5+++` | Used to set `RetryBackoffSpec.jitter`.
+|spring.cloud.loadbalancer.retry.backoff.max-backoff | `+++Long.MAX ms+++` | Used to set `RetryBackoffSpec.maxBackoff`.
+|spring.cloud.loadbalancer.retry.backoff.min-backoff | `+++5 ms+++` | Used to set `RetryBackoffSpec#minBackoff`.
+|spring.cloud.loadbalancer.retry.enabled | `+++true+++` | Enables LoadBalancer retries.
+|spring.cloud.loadbalancer.retry.max-retries-on-next-service-instance | `+++1+++` | Number of retries to be executed on the next `ServiceInstance`. A `ServiceInstance` is chosen before each retry call.
+|spring.cloud.loadbalancer.retry.max-retries-on-same-service-instance | `+++0+++` | Number of retries to be executed on the same `ServiceInstance`.
+|spring.cloud.loadbalancer.retry.retry-on-all-exceptions | `+++false+++` | Indicates retries should be attempted for all exceptions, not only those specified in `retryableExceptions`.
+|spring.cloud.loadbalancer.retry.retry-on-all-operations | `+++false+++` | Indicates retries should be attempted on operations other than `HttpMethod.GET`.
+|spring.cloud.loadbalancer.retry.retryable-exceptions | `+++{}+++` | A `Set` of `Throwable` classes that should trigger a retry.
+|spring.cloud.loadbalancer.retry.retryable-status-codes | `+++{}+++` | A `Set` of status codes that should trigger a retry.
+|spring.cloud.loadbalancer.service-discovery.timeout |  | String representation of Duration of the timeout for calls to service discovery.
+|spring.cloud.loadbalancer.stats.micrometer.enabled | `+++false+++` | Enables Spring Cloud LoadBalancer Micrometer stats.
+|spring.cloud.loadbalancer.sticky-session.add-service-instance-cookie | `+++false+++` | Indicates whether a cookie with the newly selected instance should be added by LoadBalancer.
+|spring.cloud.loadbalancer.sticky-session.instance-id-cookie-name | `+++sc-lb-instance-id+++` | The name of the cookie holding the preferred instance id.
+|spring.cloud.loadbalancer.subset.instance-id |  | Instance id of deterministic subsetting. If not set, {@link IdUtils#getDefaultInstanceId(PropertyResolver)} will be used.
+|spring.cloud.loadbalancer.subset.size | `+++100+++` | Max subset size of deterministic subsetting.
+|spring.cloud.loadbalancer.x-forwarded.enabled | `+++false+++` | To Enable X-Forwarded Headers.
+|spring.cloud.loadbalancer.zone |  | Spring Cloud LoadBalancer zone.
+|spring.cloud.refresh.additional-property-sources-to-retain |  | Additional property sources to retain during a refresh. Typically only system property sources are retained. This property allows property sources, such as property sources created by EnvironmentPostProcessors to be retained as well.
+|spring.cloud.refresh.enabled | `+++true+++` | Enables autoconfiguration for the refresh scope and associated features.
+|spring.cloud.refresh.extra-refreshable | `+++true+++` | Additional class names for beans to post process into refresh scope.
+|spring.cloud.refresh.never-refreshable | `+++true+++` | Comma separated list of class names for beans to never be refreshed or rebound.
+|spring.cloud.refresh.on-restart.enabled | `+++true+++` | Enable refreshing context on start.
+|spring.cloud.service-registry.auto-registration.enabled | `+++true+++` | Whether service auto-registration is enabled. Defaults to true.
+|spring.cloud.service-registry.auto-registration.fail-fast | `+++false+++` | Whether startup fails if there is no AutoServiceRegistration. Defaults to false.
+|spring.cloud.service-registry.auto-registration.register-management | `+++true+++` | Whether to register the management as a service. Defaults to true.
+|spring.cloud.util.enabled | `+++true+++` | Enables creation of Spring Cloud utility beans.
+
+|===
@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+    "antora": "3.2.0-alpha.6",
+    "@antora/atlas-extension": "1.0.0-alpha.2",
+    "@antora/collector-extension": "1.0.0-beta.5",
+    "@asciidoctor/tabs": "1.0.0-beta.6",
+    "@springio/antora-extensions": "1.14.2",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.14"
+  }
+}
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>spring-cloud-netflix-docs</artifactId>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>3.0.0-M3</version>
+		<version>4.1.4</version>
+		<relativePath>..</relativePath>
 	</parent>
-	<artifactId>spring-cloud-netflix-docs</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Netflix Docs</name>
-	<description>Spring Cloud Docs</description>
+	<description>Spring Cloud Netflix Docs</description>
 	<properties>
 		<docs.main>spring-cloud-netflix</docs.main>
-		<configprops.inclusionPattern>
-			.*.eureka.*
-		</configprops.inclusionPattern>
-		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
+		<main.basedir>${basedir}/..</main.basedir>
+		<configprops.inclusionPattern>eureka.*|spring.cloud.*</configprops.inclusionPattern>
+		<!-- Don't upload docs jar to central / repo.spring.io -->
+		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 	</properties>
+	<!--
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -28,6 +32,7 @@
 			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
 	</dependencies>
+	-->
 	<build>
 		<sourceDirectory>src/main/asciidoc</sourceDirectory>
 	</build>
@@ -35,29 +40,39 @@
 		<profile>
 			<id>docs</id>
 			<build>
+				<resources>
+					<resource>
+						<directory>src/main/antora/resources/antora-resources</directory>
+						<filtering>true</filtering>
+					</resource>
+				</resources>
 				<plugins>
 					<plugin>
 						<groupId>pl.project13.maven</groupId>
 						<artifactId>git-commit-id-plugin</artifactId>
 					</plugin>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
 					</plugin>
-					<plugin>
-						<artifactId>maven-resources-plugin</artifactId>
-					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId>
+						<groupId>io.spring.maven.antora</groupId>
+						<artifactId>antora-component-version-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
+						<groupId>org.antora</groupId>
+						<artifactId>antora-maven-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
 					</plugin>
 				</plugins>
@@ -0,0 +1,20 @@
+version: @antora-component.version@
+prerelease: @antora-component.prerelease@
+
+asciidoc:
+  attributes:
+    attribute-missing: 'warn'
+    chomp: 'all'
+    project-root: @maven.multiModuleProjectDirectory@
+    github-repo: @docs.main@
+    github-raw: https://raw.githubusercontent.com/spring-cloud/@docs.main@/@github-tag@
+    github-code: https://github.com/spring-cloud/@docs.main@/tree/@github-tag@
+    github-issues: https://github.com/spring-cloud/@docs.main@/issues/
+    github-wiki: https://github.com/spring-cloud/@docs.main@/wiki
+    spring-cloud-version: @project.version@
+    github-tag: @github-tag@
+    version-type: @version-type@
+    docs-url: https://docs.spring.io/@docs.main@/docs/@project.version@
+    raw-docs-url: https://raw.githubusercontent.com/spring-cloud/@docs.main@/@github-tag@
+    project-version: @project.version@
+    project-name: @docs.main@
@@ -1,31 +1,30 @@
-include::_attributes.adoc[]

-image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master"]
-image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master"]
-image::https://api.codacy.com/project/badge/Grade/a6885a06921e4f72a0df0b7aabd6d118["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-netflix?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-netflix&utm_campaign=Badge_Grade"]
+image::https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml"]
+
+image:https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-netflix/tree/main"]


-include::intro.adoc[]
-
+[[features]]
 == Features

 * Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
 * Service Discovery: an embedded Eureka server can be created with declarative Java configuration
-* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
-* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
-* Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation

-include::maintenance-mode.adoc[]

+[[building]]
 == Building

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-jdk8.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/partials/building.adoc[]

 NOTE:  To build the module `spring-cloud-netflix-hystrix-contract` along with the entire Netflix project run the
 `build.sh` script in the `scripts` directory.

+[[contributing]]
 == Contributing

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/partials/contributing-docs.adoc[]
+
+[[license]]
+== License
+
+The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-netflix/main/LICENSE.txt[here].
@@ -1,20 +0,0 @@
-|===
-|Name | Default | Description
-
-|eureka.client.eureka-connection-idle-timeout-seconds | 30 | Indicates how much time (in seconds) that the HTTP connections to eureka server can stay idle before it can be closed. In the AWS environment, it is recommended that the values is 30 seconds or less, since the firewall cleans up the connection information after a few mins leaving the connection hanging in limbo.
-|eureka.client.eureka-server-connect-timeout-seconds | 5 | Indicates how long to wait (in seconds) before a connection to eureka server needs to timeout. Note that the connections in the client are pooled by org.apache.http.client.HttpClient and this setting affects the actual connection creation and also the wait time to get the connection from the pool.
-|eureka.client.eureka-server-d-n-s-name |  | Gets the DNS name to be queried to get the list of eureka servers.This information is not required if the contract returns the service urls by implementing serviceUrls. The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
-|eureka.client.eureka-server-port |  | Gets the port to be used to construct the service url to contact eureka server when the list of eureka servers come from the DNS.This information is not required if the contract returns the service urls eurekaServerServiceUrls(String). The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
-|eureka.client.eureka-server-read-timeout-seconds | 8 | Indicates how long to wait (in seconds) before a read from eureka server needs to timeout.
-|eureka.client.eureka-server-total-connections | 200 | Gets the total number of connections that is allowed from eureka client to all eureka servers.
-|eureka.client.eureka-server-total-connections-per-host | 50 | Gets the total number of connections that is allowed from eureka client to a eureka server host.
-|eureka.client.eureka-server-u-r-l-context |  | Gets the URL context to be used to construct the service url to contact eureka server when the list of eureka servers come from the DNS. This information is not required if the contract returns the service urls from eurekaServerServiceUrls. The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
-|eureka.client.eureka-service-url-poll-interval-seconds | 0 | Indicates how often(in seconds) to poll for changes to eureka server information. Eureka servers could be added or removed and this setting controls how soon the eureka clients should know about it.
-|eureka.client.prefer-same-zone-eureka | true | Indicates whether or not this instance should try to use the eureka server in the same zone for latency and/or other reason. Ideally eureka clients are configured to talk to servers in the same zone The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSeconds
-|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.
-
-|===
@@ -1,10 +1,10 @@
-#!/bin/bash -x
+ALLOW#!/bin/bash -x

 set -e

 # Set default props like MAVEN_PATH, ROOT_FOLDER etc.
 function set_default_props() {
-    # The script should be executed from the root folder
+    # The script should be run from the root folder
    ROOT_FOLDER=`pwd`
    echo "Current folder is ${ROOT_FOLDER}"

@@ -39,7 +39,7 @@ function check_if_anything_to_sync() {
 }

 function retrieve_current_branch() {
-    # Code getting the name of the current branch. For master we want to publish as we did until now
+    # Code getting the name of the current branch. For main we want to publish as we did until now
    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
    # If there is a branch already passed will reuse it - otherwise will try to find it
    CURRENT_BRANCH=${BRANCH}
@@ -65,7 +65,7 @@ function build_docs_if_applicable() {
 }

 # Get the name of the `docs.main` property
-# Get whitelisted branches - assumes that a `docs` module is available under `docs` profile
+# Get allow branches - assumes that a `docs` module is available under `docs` profile
 function retrieve_doc_properties() {
    MAIN_ADOC_VALUE=$("${MAVEN_PATH}"mvn -q \
        -Dexec.executable="echo" \
@@ -75,14 +75,14 @@ function retrieve_doc_properties() {
    echo "Extracted 'main.adoc' from Maven build [${MAIN_ADOC_VALUE}]"


-    WHITELIST_PROPERTY=${WHITELIST_PROPERTY:-"docs.whitelisted.branches"}
-    WHITELISTED_BRANCHES_VALUE=$("${MAVEN_PATH}"mvn -q \
+    ALLOW_PROPERTY=${ALLOW_PROPERTY:-"docs.allowed.branches"}
+    ALLOWED_BRANCHES_VALUE=$("${MAVEN_PATH}"mvn -q \
        -Dexec.executable="echo" \
-        -Dexec.args="\${${WHITELIST_PROPERTY}}" \
+        -Dexec.args="\${${ALLOW_PROPERTY}}" \
        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
        -P docs \
        -pl docs)
-    echo "Extracted '${WHITELIST_PROPERTY}' from Maven build [${WHITELISTED_BRANCHES_VALUE}]"
+    echo "Extracted '${ALLOW_PROPERTY}' from Maven build [${ALLOWED_BRANCHES_VALUE}]"
 }

 # Stash any outstanding changes
@@ -134,8 +134,8 @@ function add_docs_from_target() {

 # Copies the docs by using the retrieved properties from Maven build
 function copy_docs_for_current_version() {
-    if [[ "${CURRENT_BRANCH}" == "master" ]] ; then
-        echo -e "Current branch is master - will copy the current docs only to the root folder"
+    if [[ "${CURRENT_BRANCH}" == "main" ]] ; then
+        echo -e "Current branch is main - will copy the current docs only to the root folder"
        for f in docs/target/generated-docs/*; do
            file=${f#docs/target/generated-docs/*}
            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
@@ -148,9 +148,9 @@ function copy_docs_for_current_version() {
    else
        echo -e "Current branch is [${CURRENT_BRANCH}]"
        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
-        if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
+        if [[ ",${ALLOWED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
-            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
+            echo -e "Branch [${CURRENT_BRANCH}] is allowed! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
            for f in docs/target/generated-docs/*; do
                file=${f#docs/target/generated-docs/*}
                if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
@@ -169,7 +169,7 @@ function copy_docs_for_current_version() {
            done
            COMMIT_CHANGES="yes"
        else
-            echo -e "Branch [${CURRENT_BRANCH}] is not on the white list! Check out the Maven [${WHITELIST_PROPERTY}] property in
+            echo -e "Branch [${CURRENT_BRANCH}] is not on the allow list! Check out the Maven [${ALLOW_PROPERTY}] property in
             [docs] module available under [docs] profile. Won't commit any changes to gh-pages for this branch."
        fi
    fi
@@ -216,7 +216,7 @@ function commit_changes_if_applicable() {
        git commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"

        # Uncomment the following push if you want to auto push to
-        # the gh-pages branch whenever you commit to master locally.
+        # the gh-pages branch whenever you commit to main locally.
        # This is a little extreme. Use with care!
        ###################################################################
        if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
@@ -249,11 +249,11 @@ The idea of this script is to update gh-pages branch with the generated docs. Wi
 the script will work in the following manner:

 - if there's no gh-pages / target for docs module then the script ends
- for master branch the generated docs are copied to the root of gh-pages branch
- for any other branch (if that branch is whitelisted) a subfolder with branch name is created
+- for main branch the generated docs are copied to the root of gh-pages branch
+- for any other branch (if that branch is allowed) a subfolder with branch name is created
    and docs are copied there
 - if the version switch is passed (-v) then a tag with (v) prefix will be retrieved and a folder
-    with that version number will be created in the gh-pages branch. WARNING! No whitelist verification will take place
+    with that version number will be created in the gh-pages branch. WARNING! No allow verification will take place
 - if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
 - if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
@@ -327,4 +327,4 @@ build_docs_if_applicable
 retrieve_doc_properties
 stash_changes
 add_docs_from_target
-checkout_previous_branch
+checkout_previous_branch
@@ -1 +0,0 @@
-spring-cloud-netflix.adoc
@@ -1,25 +0,0 @@
-include::_attributes.adoc[]
-
-== Modules In Maintenance Mode
-
-Placing a module in maintenance mode means that the Spring Cloud team will no longer be adding new features to the module.
-We will fix blocker bugs and security issues, and we will also consider and review small pull requests from the community.
-
-We intend to continue to support these modules for a period of at least a year from the general availability
-of the Greenwich release train.
-
-The following Spring Cloud Netflix modules and corresponding starters will be placed into maintenance mode:
-
-* spring-cloud-netflix-archaius
-* spring-cloud-netflix-concurrency-limits
-* spring-cloud-netflix-hystrix-contract
-* spring-cloud-netflix-hystrix-dashboard
-* spring-cloud-netflix-hystrix-stream
-* spring-cloud-netflix-hystrix
-* spring-cloud-netflix-ribbon
-* spring-cloud-netflix-turbine-stream
-* spring-cloud-netflix-turbine
-* spring-cloud-netflix-zuul
-
-NOTE: This does not include the Eureka modules.
-
@@ -1 +0,0 @@
-include::_attributes.adoc[]
@@ -1,4 +1,4 @@
-Spring Cloud Netflix provides Netflix OSS integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms. With a few simple annotations you can quickly enable and configure the common patterns inside your application and build large distributed systems with battle-tested Netflix components. The patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix), Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon)..
+Spring Cloud Netflix provides Netflix OSS integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms. With a few simple annotations you can quickly enable and configure the common patterns inside your application and build large distributed systems with battle-tested Netflix components. The patterns provided include Service Discovery (Eureka).

 ## Features

@@ -6,23 +6,16 @@ Spring Cloud Netflix features:

 * Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
 * Service Discovery: an embedded Eureka server can be created with declarative Java configuration
-* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
-* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
-* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
-* Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation

 ## Getting Started

 As long as Spring Cloud Netflix and Eureka Core are on the
-classpath any Spring Boot application with `@EnableEurekaClient` will try to contact a Eureka
+classpath any Spring Boot application with `spring-cloud-starter-netflix-eureka-client` in dependencies will try to contact a Eureka
 server on `http://localhost:8761` (the default value of
 `eureka.client.serviceUrl.defaultZone`):

 ```java
@SpringBootApplication
-@EnableEurekaClient
@RestController
 public class Application {

@@ -39,3 +32,17 @@ public class Application {
 ```

 To run your own server use the `spring-cloud-starter-netflix-eureka-server` dependency and `@EnableEurekaServer`.
+
+## Contributing
+
+We welcome contributions. You can read more on how to contribute to the project https://github.com/spring-cloud/spring-cloud-netflix#contributing[here].
+
+## Community Support
+
+* You can report issues through https://github.com/spring-cloud/spring-cloud-netflix/issues[Github].
+* We monitor https://stackoverflow.com/[StackOverflow] for questions with the `spring-cloud-netflix` tag.
+* You can contact our team at https://gitter.im/spring-cloud/spring-cloud[Gitter].
+
+## Commercial Support
+
+Commercial Support is provided as part of the https://spring.io/support[VMware Spring Runtime] offering.
@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------

 # ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
+# Apache Maven Wrapper startup batch script, version 3.2.0
 #
 # Required ENV vars:
 # ------------------
@@ -27,7 +27,6 @@
 #
 # Optional ENV vars
 # -----------------
-#   M2_HOME - location of maven2's installed home dir
 #   MAVEN_OPTS - parameters passed to the Java VM when running Maven
 #     e.g. to debug Maven itself, use
 #       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -36,6 +35,10 @@

 if [ -z "$MAVEN_SKIP_RC" ] ; then

+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
  if [ -f /etc/mavenrc ] ; then
    . /etc/mavenrc
  fi
@@ -50,7 +53,7 @@ fi
 cygwin=false;
 darwin=false;
 mingw=false
-case "`uname`" in
+case "$(uname)" in
  CYGWIN*) cygwin=true ;;
  MINGW*) mingw=true;;
  Darwin*) darwin=true
@@ -58,9 +61,9 @@ case "`uname`" in
    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
    if [ -z "$JAVA_HOME" ]; then
      if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
+        JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
      else
-        export JAVA_HOME="/Library/Java/Home"
+        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
      fi
    fi
    ;;
@@ -68,69 +71,38 @@ esac

 if [ -z "$JAVA_HOME" ] ; then
  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
+    JAVA_HOME=$(java-config --jre-home)
  fi
 fi

-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
 fi

 # For Mingw, ensure paths are in UNIX format before anything is touched
 if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-  # TODO classpath?
+  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
+    JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
 fi

 if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+  javaExecutable="$(which javac)"
+  if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
    # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+    readLink=$(which readlink)
+    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
      if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+        javaHome="$(dirname "\"$javaExecutable\"")"
+        javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
      else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
+        javaExecutable="$(readlink -f "\"$javaExecutable\"")"
      fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      javaHome="$(dirname "\"$javaExecutable\"")"
+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
      JAVA_HOME="$javaHome"
      export JAVA_HOME
    fi
@@ -146,7 +118,7 @@ if [ -z "$JAVACMD" ] ; then
      JAVACMD="$JAVA_HOME/bin/java"
    fi
  else
-    JAVACMD="`which java`"
+    JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
  fi
 fi

@@ -160,12 +132,9 @@ if [ -z "$JAVA_HOME" ] ; then
  echo "Warning: JAVA_HOME environment variable is not set."
 fi

-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
-
  if [ -z "$1" ]
  then
    echo "Path not specified to find_maven_basedir"
@@ -181,76 +150,99 @@ find_maven_basedir() {
    fi
    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
+      wdir=$(cd "$wdir/.." || exit 1; pwd)
    fi
    # end of workaround
  done
-  echo "${basedir}"
+  printf '%s' "$(cd "$basedir" || exit 1; pwd)"
 }

 # concatenates all lines of a file
 concat_lines() {
  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
+    # Remove \r in case we run on Windows within Git Bash
+    # and check out the repository with auto CRLF management
+    # enabled. Otherwise, we may read lines that are delimited with
+    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
+    # splitting rules.
+    tr -s '\r\n' ' ' < "$1"
  fi
 }

-BASE_DIR=`find_maven_basedir "$(pwd)"`
+log() {
+  if [ "$MVNW_VERBOSE" = true ]; then
+    printf '%s\n' "$1"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
 if [ -z "$BASE_DIR" ]; then
  exit 1;
 fi

+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+log "$MAVEN_PROJECTBASEDIR"
+
 ##########################################################################################
 # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
 # This allows using the maven wrapper in projects that prohibit checking in binary data.
 ##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
+wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
+if [ -r "$wrapperJarPath" ]; then
+    log "Found $wrapperJarPath"
 else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    log "Couldn't find $wrapperJarPath, downloading it ..."
+
+    if [ -n "$MVNW_REPOURL" ]; then
+      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    else
+      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
    fi
-    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar"
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+    while IFS="=" read -r key value; do
+      # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
+      safeValue=$(echo "$value" | tr -d '\r')
+      case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
+    done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+    log "Downloading from: $wrapperUrl"
+
+    if $cygwin; then
+      wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"

    if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
+        log "Found wget ... using wget"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
        fi
-        wget "$jarUrl" -O "$wrapperJarPath"
    elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
+        log "Found curl ... using curl"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+        else
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
        fi
-        curl -o "$wrapperJarPath" "$jarUrl"
    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
+        log "Falling back to using Java to download"
+        javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaSource=$(cygpath --path --windows "$javaSource")
+          javaClass=$(cygpath --path --windows "$javaClass")
        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
+        if [ -e "$javaSource" ]; then
+            if [ ! -e "$javaClass" ]; then
+                log " - Compiling MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/javac" "$javaSource")
            fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            if [ -e "$javaClass" ]; then
+                log " - Running MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
            fi
        fi
    fi
@@ -259,48 +251,58 @@ fi
 # End of extension
 ##########################################################################################

-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
+# If specified, validate the SHA-256 sum of the Maven wrapper jar file
+wrapperSha256Sum=""
+while IFS="=" read -r key value; do
+  case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
+  esac
+done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+if [ -n "$wrapperSha256Sum" ]; then
+  wrapperSha256Result=false
+  if command -v sha256sum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  elif command -v shasum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
+    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
+    exit 1
+  fi
+  if [ $wrapperSha256Result = false ]; then
+    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
+    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
+    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
+    exit 1
+  fi
 fi
+
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"

 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
 fi

+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
+export MAVEN_CMD_LINE_ARGS
+
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

-echo "Running version check"
-VERSION=$( sed '\!<parent!,\!</parent!d' `dirname $0`/pom.xml | grep '<version' | head -1 | sed -e 's/.*<version>//' -e 's!</version>.*$!!' )
-echo "The found version is [${VERSION}]"
-
-if echo $VERSION | egrep -q 'M|RC'; then
-    echo Activating \"milestone\" profile for version=\"$VERSION\"
-    echo $MAVEN_CONFIG | grep -q milestone || MAVEN_CONFIG="$MAVEN_CONFIG -Pmilestone"
-else
-    echo Deactivating \"milestone\" profile for version=\"$VERSION\"
-    echo $MAVEN_CONFIG | grep -q milestone && MAVEN_CONFIG=$(echo $MAVEN_CONFIG | sed -e 's/-Pmilestone//')
-fi
-
-if echo $VERSION | egrep -q 'RELEASE'; then
-    echo Activating \"central\" profile for version=\"$VERSION\"
-    echo $MAVEN_CONFIG | grep -q milestone || MAVEN_CONFIG="$MAVEN_CONFIG -Pcentral"
-else
-    echo Deactivating \"central\" profile for version=\"$VERSION\"
-    echo $MAVEN_CONFIG | grep -q central && MAVEN_CONFIG=$(echo $MAVEN_CONFIG | sed -e 's/-Pcentral//')
-fi
-
+# shellcheck disable=SC2086 # safe args
 exec "$JAVACMD" \
  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
@@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License.  You may obtain a copy of the License at
@REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM    http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@@ -18,15 +18,14 @@
@REM ----------------------------------------------------------------------------

@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
+@REM Apache Maven Wrapper startup batch script, version 3.2.0
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@REM
@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM     e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -37,7 +36,7 @@
@echo off
@REM set title of command window
 title %0
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%

@REM set %HOME% to equivalent of $HOME
@@ -46,8 +45,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
 :skipRcPre

@setlocal
@@ -120,24 +119,69 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar"
-FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
-	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
 )

@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
 if exist %WRAPPER_JAR% (
-    echo Found %WRAPPER_JAR%
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
 ) else (
-    echo Couldn't find %WRAPPER_JAR%, downloading it ...
-	echo Downloading from: %DOWNLOAD_URL%
-    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
-    echo Finished downloading %WRAPPER_JAR%
+    if not "%MVNW_REPOURL%" == "" (
+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %WRAPPER_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
 )
@REM End of extension

-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
+SET WRAPPER_SHA_256_SUM=""
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
+)
+IF NOT %WRAPPER_SHA_256_SUM%=="" (
+    powershell -Command "&{"^
+       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
+       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
+       "  Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
+       "  Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
+       "  Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
+       "  exit 1;"^
+       "}"^
+       "}"
+    if ERRORLEVEL 1 goto error
+)
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end

@@ -147,15 +191,15 @@ set ERROR_CODE=1
 :end
@endlocal & set ERROR_CODE=%ERROR_CODE%

-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
 :skipRcPost

@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
+if "%MAVEN_BATCH_PAUSE%"=="on" pause

-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%

-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-netflix</artifactId>
-	<version>3.0.0-M3</version>
+	<version>4.1.4</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Netflix</name>
 	<description>Spring Cloud Netflix</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.0-M3</version>
+		<version>4.1.4</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -21,16 +21,19 @@
 	</scm>
 	<properties>
 		<bintray.package>netflix</bintray.package>
-		<spring-cloud-commons.version>3.0.0-M3</spring-cloud-commons.version>
-		<spring-cloud-config.version>3.0.0-M3</spring-cloud-config.version>
+		<spring-cloud-commons.version>4.1.5</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.1.4</spring-cloud-config.version>
+		<testcontainers.version>1.20.4</testcontainers.version>
+		<mockserverclient.version>5.15.0</mockserverclient.version>

 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
-		<eureka-jersey.version>1.19.1</eureka-jersey.version>
-		<xstream.version>1.4.11.1</xstream.version>
+		<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
+		<!-- FIXME: 4.0.0 -->
+		<duplicate-finder-maven-plugin.skip>true</duplicate-finder-maven-plugin.skip>
 	</properties>
 	<build>
 		<plugins>
@@ -56,14 +59,6 @@
 					</additionalConfig>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>io.spring.javaformat</groupId>
 				<artifactId>spring-javaformat-maven-plugin</artifactId>
@@ -72,6 +67,18 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.basepom.maven</groupId>
+				<artifactId>duplicate-finder-maven-plugin</artifactId>
+				<configuration>
+					<ignoredResourcePatterns>
+						<ignoredResourcePattern>about.html</ignoredResourcePattern>
+						<ignoredResourcePattern>plugin.properties</ignoredResourcePattern>
+						<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
+					</ignoredResourcePatterns>
+					<checkTestClasspath>false</checkTestClasspath>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencyManagement>
@@ -109,37 +116,23 @@
 				<version>1</version>
 			</dependency>
 			<!-- Eureka core dep that is now optional -->
-			<dependency>
-				<groupId>com.sun.jersey</groupId>
-				<artifactId>jersey-servlet</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.jersey</groupId>
-				<artifactId>jersey-core</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.jersey</groupId>
-				<artifactId>jersey-client</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.jersey</groupId>
-				<artifactId>jersey-server</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.jersey.contribs</groupId>
-				<artifactId>jersey-apache-client4</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.thoughtworks.xstream</groupId>
-				<artifactId>xstream</artifactId>
-				<version>${xstream.version}</version>
-			</dependency>
 			<!-- end eureka deps -->
+
+			<dependency>
+				<groupId>org.testcontainers</groupId>
+				<artifactId>mockserver</artifactId>
+				<version>${testcontainers.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.testcontainers</groupId>
+				<artifactId>junit-jupiter</artifactId>
+				<version>${testcontainers.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.mock-server</groupId>
+				<artifactId>mockserver-client-java</artifactId>
+				<version>${mockserverclient.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<reporting>
@@ -156,6 +149,7 @@
 		<module>spring-cloud-netflix-eureka-server</module>
 		<module>spring-cloud-starter-netflix-eureka-client</module>
 		<module>spring-cloud-starter-netflix-eureka-server</module>
+		<module>spring-cloud-netflix-eureka-client-tls-tests</module>
 		<module>docs</module>
    </modules>
 	<profiles>
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-(cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install -B -Pdocs ${@})
-./mvnw clean install -B -Pdocs ${@}
@@ -1,4 +1,6 @@
 #!/bin/bash

+set -o errexit
+
 (cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install -B -Pdocs -DskipTests)
 ./mvnw clean install -B -Pdocs -DskipTests -fae
@@ -4,7 +4,7 @@ set -o errexit

 mkdir -p target

-SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/master/runAcceptanceTests.sh"
+SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/3.1.x/runAcceptanceTests.sh"
 AT_WHAT_TO_TEST="EUREKA"

 cd target
@@ -18,7 +18,7 @@ echo "Killing all running apps"

 ./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" --killattheend

-SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/tests/master/scripts/runTests.sh"
+SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/tests/main/scripts/runTests.sh"

 curl "${SCRIPT_URL}" --output runIntegrationTests.sh

@@ -5,16 +5,16 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.0.0-M3</version>
+		<version>4.1.4</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-netflix-dependencies</artifactId>
-	<version>3.0.0-M3</version>
+	<version>4.1.4</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-netflix-dependencies</name>
 	<description>Spring Cloud Netflix Dependencies</description>
 	<properties>
-		<eureka.version>1.9.21</eureka.version>
+		<eureka.version>2.0.4</eureka.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -51,6 +51,10 @@
 						<groupId>com.github.vlsi.compactmap</groupId>
 						<artifactId>compactmap</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>jakarta.servlet</groupId>
+						<artifactId>jakarta.servlet-api</artifactId>
+					</exclusion>
 					<exclusion>
 						<groupId>javax.servlet</groupId>
 						<artifactId>servlet-api</artifactId>
@@ -67,6 +71,10 @@
 						<groupId>com.google.code.findbugs</groupId>
 						<artifactId>annotations</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>org.glassfish.jersey.core</groupId>
+						<artifactId>jersey-client</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -78,6 +86,10 @@
 						<groupId>com.netflix.archaius</groupId>
 						<artifactId>archaius-core</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>jakarta.servlet</groupId>
+						<artifactId>jakarta.servlet-api</artifactId>
+					</exclusion>
 					<exclusion>
 						<groupId>javax.servlet</groupId>
 						<artifactId>servlet-api</artifactId>
@@ -112,6 +124,23 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>com.netflix.eureka</groupId>
+				<artifactId>eureka-core-jersey3</artifactId>
+				<version>${eureka.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.eureka</groupId>
+				<artifactId>eureka-client-jersey3</artifactId>
+				<version>${eureka.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>aopalliance</groupId>
+						<artifactId>aopalliance</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<!--			TODO: Move back to Eureka dependency when 1.10.17 released -->
 		</dependencies>
 	</dependencyManagement>
 	<profiles>
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-netflix</artifactId>
+		<version>4.1.4</version>
+		<relativePath>..</relativePath> <!-- lookup parent from repository -->
+	</parent>
+	<artifactId>spring-cloud-netflix-eureka-client-tls-tests</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Cloud Netflix Eureka Client TLS Tests</name>
+	<description>Spring Cloud Netflix Eureka Client TLS Tests</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-eureka-client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-eureka-server</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-context</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.retry</groupId>
+			<artifactId>spring-retry</artifactId>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.annotation</groupId>
+					<artifactId>javax.annotation-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-test-support</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-suite-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-suite-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcpkix-jdk15on</artifactId>
+			<version>1.70</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<includes>
+						<include>**/*Suite.java</include>
+					</includes>
+					<excludes>
+						<exclude>**/*Test.java</exclude>
+						<exclude>**/*Tests.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2018-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.test.TestSocketUtils;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+
+public class AppRunner implements AutoCloseable {
+
+	private final Class<?> appClass;
+
+	private final Map<String, String> props;
+
+	private ConfigurableApplicationContext app;
+
+	public AppRunner(Class<?> appClass) {
+		this.appClass = appClass;
+		props = new LinkedHashMap<>();
+	}
+
+	public void property(String key, String value) {
+		props.put(key, value);
+	}
+
+	public void start() {
+		if (app == null) {
+			SpringApplicationBuilder builder = new SpringApplicationBuilder(appClass);
+			builder.properties("spring.application.name=" + appClass.getName());
+			builder.properties("spring.jmx.enabled=false");
+			builder.properties(String.format("server.port=%d", availableTcpPort()));
+			builder.properties(props());
+
+			app = builder.build().run();
+		}
+	}
+
+	private int availableTcpPort() {
+		return TestSocketUtils.findAvailableTcpPort();
+	}
+
+	private String[] props() {
+		List<String> result = new ArrayList<>();
+
+		for (String key : props.keySet()) {
+			String value = props.get(key);
+			result.add(String.format("%s=%s", key, value));
+		}
+
+		return result.toArray(new String[0]);
+	}
+
+	public void stop() {
+		if (app != null) {
+			app.stop();
+			int attempts = 5;
+			while (app.isRunning() && attempts > 0) {
+				attempts = attempts - 1;
+				try {
+					Thread.sleep(1000);
+				}
+				catch (InterruptedException e) {
+					throw new IllegalStateException(e);
+				}
+			}
+			app = null;
+		}
+	}
+
+	public ConfigurableApplicationContext app() {
+		return app;
+	}
+
+	public String getProperty(String key) {
+		return app.getEnvironment().getProperty(key);
+	}
+
+	public <T> T getBean(Class<T> type) {
+		return app.getBean(type);
+	}
+
+	public ApplicationContext parent() {
+		return app.getParent();
+	}
+
+	public <T> Map<String, T> getParentBeans(Class<T> type) {
+		return parent().getBeansOfType(type);
+	}
+
+	public int port() {
+		if (app == null) {
+			throw new RuntimeException("App is not running.");
+		}
+		return app.getEnvironment().getProperty("server.port", Integer.class, -1);
+	}
+
+	public String root() {
+		if (app == null) {
+			throw new RuntimeException("App is not running.");
+		}
+
+		String protocol = tlsEnabled() ? "https" : "http";
+		return String.format("%s://localhost:%d/", protocol, port());
+	}
+
+	private boolean tlsEnabled() {
+		return app.getEnvironment().getProperty("server.ssl.enabled", Boolean.class, false);
+	}
+
+	@Override
+	public void close() {
+		stop();
+	}
+
+}
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2018-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.security.KeyStore;
+import java.util.function.Supplier;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.BeanCreationException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+abstract class BaseCertTests {
+
+	private static final Log log = LogFactory.getLog(BaseCertTests.class);
+
+	protected static final String KEY_STORE_PASSWORD = "test-key-store-password";
+
+	protected static final String KEY_PASSWORD = "test-key-password";
+
+	protected static final String WRONG_PASSWORD = "test-wrong-password";
+
+	protected static File caCert;
+
+	protected static File wrongCaCert;
+
+	protected static File serverCert;
+
+	protected static File clientCert;
+
+	protected static File wrongClientCert;
+
+	protected BaseCertTests() {
+	}
+
+	@SuppressWarnings("rawtypes")
+	static EurekaServerRunner startEurekaServer(Class config) {
+		EurekaServerRunner server = new EurekaServerRunner(config);
+		server.enableTls();
+		server.setKeyStore(serverCert, KEY_STORE_PASSWORD, "server", KEY_PASSWORD);
+		server.setTrustStore(caCert, KEY_STORE_PASSWORD);
+
+		server.start();
+		return server;
+	}
+
+	static void stopEurekaServer(EurekaServerRunner server) {
+		server.stop();
+	}
+
+	@SuppressWarnings("rawtypes")
+	static EurekaClientRunner startService(EurekaServerRunner server, Class config) {
+		EurekaClientRunner service = new EurekaClientRunner(config, server, "testservice");
+		enableTlsClient(service);
+		service.start();
+		return service;
+	}
+
+	static void stopService(EurekaClientRunner service) {
+		service.stop();
+	}
+
+	static void enableTlsClient(EurekaClientRunner runner) {
+		runner.enableTls();
+		runner.setKeyStore(clientCert, KEY_STORE_PASSWORD, KEY_PASSWORD);
+		runner.setTrustStore(caCert, KEY_STORE_PASSWORD);
+	}
+
+	static void waitForRegistration(Supplier<EurekaClientRunner> clientSupplier) {
+		try (EurekaClientRunner client = clientSupplier.get()) {
+			enableTlsClient(client);
+			client.start();
+			client.waitServiceViaEureka(60);
+		}
+	}
+
+	@BeforeAll
+	static void createCertificates() throws Exception {
+		KeyTool tool = new KeyTool();
+
+		KeyAndCert ca = tool.createCA("MyCA");
+		KeyAndCert server = ca.sign("server");
+		KeyAndCert client = ca.sign("client");
+
+		caCert = saveCert(ca);
+		serverCert = saveKeyAndCert(server);
+		clientCert = saveKeyAndCert(client);
+
+		KeyAndCert wrongCa = tool.createCA("WrongCA");
+		KeyAndCert wrongClient = wrongCa.sign("client");
+
+		wrongCaCert = saveCert(wrongCa);
+		wrongClientCert = saveKeyAndCert(wrongClient);
+	}
+
+	@AfterAll
+	static void afterClass() {
+		log.info("Tests finished!");
+	}
+
+	abstract EurekaClientRunner createEurekaClient();
+
+	/**
+	 * Already proved this in waitForRegistration(). Keep this Test to express test
+	 * purpose explicitly.
+	 */
+	@Test
+	void clientCertCanWork() {
+	}
+
+	@Test
+	void noCertCannotWork() {
+		try (EurekaClientRunner client = createEurekaClient()) {
+			client.disableTls();
+			client.start();
+			assertThat(client.foundServiceViaEureka()).isFalse();
+		}
+	}
+
+	@Test
+	void wrongCertCannotWork() {
+		try (EurekaClientRunner client = createEurekaClient()) {
+			enableTlsClient(client);
+			client.setKeyStore(wrongClientCert);
+			client.start();
+			assertThat(client.foundServiceViaEureka()).isFalse();
+		}
+	}
+
+	@Test
+	void wrongPasswordCauseFailure() {
+		EurekaClientRunner client = createEurekaClient();
+		enableTlsClient(client);
+		client.setKeyStore(clientCert, WRONG_PASSWORD, WRONG_PASSWORD);
+		Assertions.assertThrows(BeanCreationException.class, client::start);
+	}
+
+	@Test
+	void wrongTrustStoreCannotWork() {
+		try (EurekaClientRunner client = createEurekaClient()) {
+			enableTlsClient(client);
+			client.setTrustStore(wrongCaCert);
+			client.start();
+			assertThat(client.foundServiceViaEureka()).isFalse();
+		}
+	}
+
+	private static File saveKeyAndCert(KeyAndCert keyCert) throws Exception {
+		return saveKeyStore(keyCert.subject(), () -> keyCert.storeKeyAndCert(KEY_PASSWORD));
+	}
+
+	private static File saveCert(KeyAndCert keyCert) throws Exception {
+		return saveKeyStore(keyCert.subject(), keyCert::storeCert);
+	}
+
+	private static File saveKeyStore(String prefix, KeyStoreSupplier func) throws Exception {
+		File result = File.createTempFile(prefix, ".p12");
+		result.deleteOnExit();
+
+		try (OutputStream output = new FileOutputStream(result)) {
+			KeyStore store = func.createKeyStore();
+			store.store(output, KEY_STORE_PASSWORD.toCharArray());
+		}
+		return result;
+	}
+
+	interface KeyStoreSupplier {
+
+		KeyStore createKeyStore() throws Exception;
+
+	}
+
+}
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2018-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.io.File;
+import java.util.function.BooleanSupplier;
+
+import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
+
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+
+public class EurekaClientRunner extends AppRunner {
+
+	public EurekaClientRunner(Class<?> appClass, AppRunner server) {
+		super(appClass);
+
+		property("eureka.client.registerWithEureka", "false");
+		property("eureka.client.fetchRegistry", "true");
+		property("eureka.client.serviceUrl.defaultZone", server.root() + "eureka/");
+		property("eureka.client.refresh.enable", "true");
+	}
+
+	public EurekaClientRunner(Class<?> appClass, AppRunner server, String service) {
+		this(appClass, server);
+		property("eureka.client.registerWithEureka", "true");
+		property("spring.application.name", service);
+	}
+
+	public void enableTls() {
+		property("eureka.client.tls.enabled", "true");
+	}
+
+	public void disableTls() {
+		property("eureka.client.tls.enabled", "false");
+	}
+
+	public void setKeyStore(File keyStore, String keyStorePassword, String keyPassword) {
+		property("eureka.client.tls.key-store", pathOf(keyStore));
+		property("eureka.client.tls.key-store-password", keyStorePassword);
+		property("eureka.client.tls.key-password", keyPassword);
+	}
+
+	public void setKeyStore(File keyStore) {
+		property("eureka.client.tls.key-store", pathOf(keyStore));
+	}
+
+	public void setTrustStore(File trustStore, String password) {
+		property("eureka.client.tls.trust-store", pathOf(trustStore));
+		property("eureka.client.tls.trust-store-password", password);
+	}
+
+	public void setTrustStore(File trustStore) {
+		property("eureka.client.tls.trust-store", pathOf(trustStore));
+	}
+
+	private String pathOf(File file) {
+		return String.format("file:%s", file.getAbsolutePath());
+	}
+
+	public void waitServiceViaEureka(int seconds) {
+		assertInSeconds(this::foundServiceViaEureka, seconds);
+	}
+
+	private void assertInSeconds(BooleanSupplier assertion, int seconds) {
+		long start = System.currentTimeMillis();
+		long limit = 1000L * seconds;
+		long duration;
+
+		do {
+			if (assertion.getAsBoolean()) {
+				return;
+			}
+			duration = System.currentTimeMillis() - start;
+			Thread.yield();
+
+		}
+		while (duration < limit);
+
+		throw new RuntimeException();
+	}
+
+	public boolean foundServiceViaEureka() {
+		DiscoveryClient discovery = getBean(DiscoveryClient.class);
+		return !discovery.getServices().isEmpty();
+	}
+
+	@SuppressWarnings("unchecked")
+	public AbstractDiscoveryClientOptionalArgs<Void> discoveryClientOptionalArgs() {
+		return getBean(AbstractDiscoveryClientOptionalArgs.class);
+	}
+
+}
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2018-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+/**
+ * We need to use a suite cause we need to first run all the Eureka Servers, then close
+ * all of them. We can't run one EurekaServer, close it and then run another one, cause
+ * Eureka is using static executor services that are shutdown when we close a context.
+ * That means that when the new context starts we will fail cause the executor service is
+ * already shutdown.
+ */
+@SelectClasses({ EurekaClientTests.class, RestTemplateEurekaClientTests.class })
+@Suite
+public class EurekaClientSuite {
+
+}
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2018-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.BeforeAll;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration;
+import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories;
+import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+import org.springframework.context.annotation.Bean;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class EurekaClientTests extends BaseCertTests {
+
+	private static final Log log = LogFactory.getLog(EurekaClientTests.class);
+
+	static EurekaServerRunner server;
+
+	static EurekaClientRunner service;
+
+	@BeforeAll
+	public static void setupAll() {
+		server = startEurekaServer(EurekaClientTests.TestEurekaServer.class);
+		service = startService(server, EurekaClientTests.TestApp.class);
+		assertThat(service.discoveryClientOptionalArgs()).isInstanceOf(RestTemplateDiscoveryClientOptionalArgs.class);
+		log.info("Successfully asserted that Jersey will be used");
+		waitForRegistration(() -> new EurekaClientTests().createEurekaClient());
+	}
+
+	@Override
+	EurekaClientRunner createEurekaClient() {
+		return new EurekaClientRunner(TestApp.class, server);
+	}
+
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	public static class TestApp {
+
+		@Bean
+		public RestTemplateTransportClientFactories forceRestTemplateTransportClientFactories(
+				DiscoveryClientOptionalArgsConfiguration configuration,
+				RestTemplateDiscoveryClientOptionalArgs discoveryClientOptionalArgs) {
+			return configuration.restTemplateTransportClientFactories(discoveryClientOptionalArgs);
+		}
+
+		@Bean
+		public RestTemplateDiscoveryClientOptionalArgs discoveryClientOptionalArgs() {
+			return new RestTemplateDiscoveryClientOptionalArgs(
+					new DefaultEurekaClientHttpRequestFactorySupplier(new RestTemplateTimeoutProperties()), null);
+		}
+
+	}
+
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	@EnableEurekaServer
+	public static class TestEurekaServer {
+
+	}
+
+}
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.io.File;
+
+public class EurekaServerRunner extends AppRunner {
+
+	public EurekaServerRunner(Class<?> appClass) {
+		super(appClass);
+
+		property("eureka.client.registerWithEureka", "false");
+		property("eureka.client.fetchRegistry", "false");
+		property("eureka.server.waitTimeInMsWhenSyncEmpty", "0");
+		property("eureka.client.refresh.enable", "true");
+	}
+
+	public void enableTls() {
+		property("server.ssl.enabled", "true");
+		property("server.ssl.client-auth", "need");
+	}
+
+	public void setKeyStore(File keyStore, String keyStorePassword, String key, String keyPassword) {
+		property("server.ssl.key-store", pathOf(keyStore));
+		property("server.ssl.key-store-type", "PKCS12");
+		property("server.ssl.key-store-password", keyStorePassword);
+		property("server.ssl.key-alias", key);
+		property("server.ssl.key-password", keyPassword);
+	}
+
+	public void setTrustStore(File trustStore, String password) {
+		property("server.ssl.trust-store", pathOf(trustStore));
+		property("server.ssl.trust-store-type", "PKCS12");
+		property("server.ssl.trust-store-password", password);
+	}
+
+	private String pathOf(File file) {
+		return String.format("file:%s", file.getAbsolutePath());
+	}
+
+}
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2018-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.security.KeyPair;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+
+public class KeyAndCert {
+
+	private final KeyPair keyPair;
+
+	private final X509Certificate certificate;
+
+	public KeyAndCert(KeyPair keyPair, X509Certificate certificate) {
+		this.keyPair = keyPair;
+		this.certificate = certificate;
+	}
+
+	public KeyPair keyPair() {
+		return keyPair;
+	}
+
+	public PublicKey publicKey() {
+		return keyPair.getPublic();
+	}
+
+	public PrivateKey privateKey() {
+		return keyPair.getPrivate();
+	}
+
+	public X509Certificate certificate() {
+		return certificate;
+	}
+
+	public String subject() {
+		String dn = certificate.getSubjectX500Principal().getName();
+		int index = dn.indexOf('=');
+		return dn.substring(index + 1);
+	}
+
+	public KeyAndCert sign(String subject) throws Exception {
+		KeyTool tool = new KeyTool();
+		return tool.signCertificate(subject, this);
+	}
+
+	public KeyAndCert sign(KeyPair keyPair, String subject) throws Exception {
+		KeyTool tool = new KeyTool();
+		return tool.signCertificate(keyPair, subject, this);
+	}
+
+	public KeyStore storeKeyAndCert(String keyPassword) throws Exception {
+		KeyStore result = KeyStore.getInstance("PKCS12");
+		result.load(null);
+
+		result.setKeyEntry(subject(), keyPair.getPrivate(), keyPassword.toCharArray(), certChain());
+		return result;
+	}
+
+	private Certificate[] certChain() {
+		return new Certificate[] { certificate() };
+	}
+
+	public KeyStore storeCert() throws Exception {
+		return storeCert("PKCS12");
+	}
+
+	public KeyStore storeCert(String storeType) throws Exception {
+		KeyStore result = KeyStore.getInstance(storeType);
+		result.load(null);
+
+		result.setCertificateEntry(subject(), certificate());
+		return result;
+	}
+
+}
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2018-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.Date;
+
+import org.bouncycastle.asn1.DERSequence;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.Extension;
+import org.bouncycastle.asn1.x509.GeneralName;
+import org.bouncycastle.asn1.x509.GeneralNames;
+import org.bouncycastle.asn1.x509.KeyUsage;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+
+public class KeyTool {
+
+	private static final long ONE_DAY = 1000L * 60L * 60L * 24L;
+
+	private static final long TEN_YEARS = ONE_DAY * 365L * 10L;
+
+	public KeyAndCert createCA(String ca) throws Exception {
+		KeyPair keyPair = createKeyPair();
+		X509Certificate certificate = createCert(keyPair, ca);
+		return new KeyAndCert(keyPair, certificate);
+	}
+
+	public KeyAndCert signCertificate(String subject, KeyAndCert signer) throws Exception {
+		return signCertificate(createKeyPair(), subject, signer);
+	}
+
+	public KeyAndCert signCertificate(KeyPair keyPair, String subject, KeyAndCert signer) throws Exception {
+		X509Certificate certificate = createCert(keyPair.getPublic(), signer.privateKey(), signer.subject(), subject);
+		return new KeyAndCert(keyPair, certificate);
+	}
+
+	public KeyPair createKeyPair() throws Exception {
+		return createKeyPair(1024);
+	}
+
+	public KeyPair createKeyPair(int keySize) throws Exception {
+		KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA");
+		gen.initialize(keySize, new SecureRandom());
+		return gen.generateKeyPair();
+	}
+
+	public X509Certificate createCert(KeyPair keyPair, String ca) throws Exception {
+		JcaX509v3CertificateBuilder builder = certBuilder(keyPair.getPublic(), ca, ca);
+		builder.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.keyCertSign));
+		builder.addExtension(Extension.basicConstraints, false, new BasicConstraints(true));
+
+		return signCert(builder, keyPair.getPrivate());
+	}
+
+	public X509Certificate createCert(PublicKey publicKey, PrivateKey privateKey, String issuer, String subject)
+			throws Exception {
+		JcaX509v3CertificateBuilder builder = certBuilder(publicKey, issuer, subject);
+		builder.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.digitalSignature));
+		builder.addExtension(Extension.basicConstraints, false, new BasicConstraints(false));
+
+		GeneralName[] names = new GeneralName[] { new GeneralName(GeneralName.dNSName, "localhost") };
+		builder.addExtension(Extension.subjectAlternativeName, false, GeneralNames.getInstance(new DERSequence(names)));
+
+		return signCert(builder, privateKey);
+	}
+
+	private JcaX509v3CertificateBuilder certBuilder(PublicKey publicKey, String issuer, String subject) {
+		X500Name issuerName = new X500Name(String.format("dc=%s", issuer));
+		X500Name subjectName = new X500Name(String.format("dc=%s", subject));
+
+		long now = System.currentTimeMillis();
+		BigInteger serialNum = BigInteger.valueOf(now);
+		Date notBefore = new Date(now - ONE_DAY);
+		Date notAfter = new Date(now + TEN_YEARS);
+
+		return new JcaX509v3CertificateBuilder(issuerName, serialNum, notBefore, notAfter, subjectName, publicKey);
+	}
+
+	private X509Certificate signCert(JcaX509v3CertificateBuilder builder, PrivateKey privateKey) throws Exception {
+		ContentSigner signer = new JcaContentSignerBuilder("SHA256WithRSA").build(privateKey);
+		X509CertificateHolder holder = builder.build(signer);
+
+		return new JcaX509CertificateConverter().getCertificate(holder);
+	}
+
+}
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2018-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.configuration.TlsProperties;
+import org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration;
+import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories;
+import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+import org.springframework.context.annotation.Bean;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class RestTemplateEurekaClientTests extends BaseCertTests {
+
+	private static final Log log = LogFactory.getLog(RestTemplateEurekaClientTests.class);
+
+	private static EurekaServerRunner server;
+
+	private static EurekaClientRunner service;
+
+	@BeforeAll
+	public static void setupAll() {
+		server = startEurekaServer(RestTemplateEurekaClientTests.RestTemplateTestEurekaServer.class);
+		service = startService(server, RestTemplateEurekaClientTests.RestTemplateTestApp.class);
+		// Will use RestTemplate
+		assertThat(service.discoveryClientOptionalArgs()).isInstanceOf(RestTemplateDiscoveryClientOptionalArgs.class);
+		log.info("Successfully asserted that RestTemplate will be used");
+		waitForRegistration(() -> new RestTemplateEurekaClientTests().createEurekaClient());
+	}
+
+	@AfterAll
+	public static void tearDownAll() {
+		stopService(service);
+		stopEurekaServer(server);
+	}
+
+	@Override
+	EurekaClientRunner createEurekaClient() {
+		return new EurekaClientRunner(RestTemplateTestApp.class, server);
+	}
+
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	public static class RestTemplateTestApp {
+
+		// Want to force reusing exactly the same bean as on production without excluding
+		// jersey from the classpath
+		@Bean
+		public RestTemplateDiscoveryClientOptionalArgs forceRestTemplateDiscoveryClientOptionalArgs(
+				TlsProperties tlsProperties, DiscoveryClientOptionalArgsConfiguration configuration,
+				EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier)
+				throws GeneralSecurityException, IOException {
+			return configuration.restTemplateDiscoveryClientOptionalArgs(tlsProperties,
+					eurekaClientHttpRequestFactorySupplier, new RestTemplateBuilderObjectProvider());
+		}
+
+		// Want to force reusing exactly the same bean as on production without excluding
+		// jersey from the classpath
+		@Bean
+		public RestTemplateTransportClientFactories forceRestTemplateTransportClientFactories(
+				DiscoveryClientOptionalArgsConfiguration configuration,
+				RestTemplateDiscoveryClientOptionalArgs discoveryClientOptionalArgs) {
+			return configuration.restTemplateTransportClientFactories(discoveryClientOptionalArgs);
+		}
+
+	}
+
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	@EnableEurekaServer
+	public static class RestTemplateTestEurekaServer {
+
+	}
+
+	private static class RestTemplateBuilderObjectProvider implements ObjectProvider<RestTemplateBuilder> {
+
+		private final RestTemplateBuilder builder = new RestTemplateBuilder();
+
+		@Override
+		public RestTemplateBuilder getObject(Object... args) throws BeansException {
+			return builder;
+		}
+
+		@Override
+		public RestTemplateBuilder getIfAvailable() throws BeansException {
+			return builder;
+		}
+
+		@Override
+		public RestTemplateBuilder getIfUnique() throws BeansException {
+			return builder;
+		}
+
+		@Override
+		public RestTemplateBuilder getObject() throws BeansException {
+			return builder;
+		}
+
+	}
+
+}
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>3.0.0-M3</version>
+		<version>4.1.4</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-client</artifactId>
@@ -14,7 +15,7 @@
 	<description>Spring Cloud Netflix Eureka Client</description>
 	<properties>
 		<!-- Why do I need this now? -->
-		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>		
+		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -40,7 +41,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-server</artifactId>
-			<optional>true</optional>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -50,39 +51,6 @@
 		<dependency>
 			<groupId>com.netflix.eureka</groupId>
 			<artifactId>eureka-client</artifactId>
-			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-client</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey.contribs</groupId>
-					<artifactId>jersey-apache-client4</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-core</artifactId>
-			<version>1.19.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>1.19.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey.contribs</groupId>
-			<artifactId>jersey-apache-client4</artifactId>
-			<version>1.19.1</version>
-			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.inject</groupId>
@@ -95,26 +63,15 @@
 			<optional>true</optional>
 		</dependency>
 		<!-- Eureka core deps that are now optional -->
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey.contribs</groupId>
-			<artifactId>jersey-apache-client4</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<!--<dependency>
-			<groupId>com.netflix.netflix-commons</groupId>
-			<artifactId>netflix-eventbus</artifactId>
-			<optional>true</optional>
-		</dependency>-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents.client5</groupId>
+			<artifactId>httpclient5</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
@@ -139,11 +96,32 @@
 			<groupId>org.springframework.retry</groupId>
 			<artifactId>spring-retry</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.annotation</groupId>
+					<artifactId>javax.annotation-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>mockserver</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mock-server</groupId>
+			<artifactId>mockserver-client-java</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import com.netflix.discovery.DiscoveryClient;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.EurekaHttpResponse;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -48,27 +49,26 @@ public class CloudEurekaClient extends DiscoveryClient {

 	private final AtomicLong cacheRefreshedCount = new AtomicLong(0);

-	private ApplicationEventPublisher publisher;
+	private final ApplicationEventPublisher publisher;

-	private Field eurekaTransportField;
+	private final Field eurekaTransportField;

-	private ApplicationInfoManager applicationInfoManager;
+	private final ApplicationInfoManager applicationInfoManager;

-	private AtomicReference<EurekaHttpClient> eurekaHttpClient = new AtomicReference<>();
+	private final AtomicReference<EurekaHttpClient> eurekaHttpClient = new AtomicReference<>();

-	public CloudEurekaClient(ApplicationInfoManager applicationInfoManager,
-			EurekaClientConfig config, ApplicationEventPublisher publisher) {
-		this(applicationInfoManager, config, null, publisher);
+	public CloudEurekaClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config,
+			TransportClientFactories transportClientFactories, ApplicationEventPublisher publisher) {
+		this(applicationInfoManager, config, transportClientFactories, null, publisher);
 	}

-	public CloudEurekaClient(ApplicationInfoManager applicationInfoManager,
-			EurekaClientConfig config, AbstractDiscoveryClientOptionalArgs<?> args,
+	public CloudEurekaClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config,
+			TransportClientFactories transportClientFactories, AbstractDiscoveryClientOptionalArgs<?> args,
 			ApplicationEventPublisher publisher) {
-		super(applicationInfoManager, config, args);
+		super(applicationInfoManager, config, transportClientFactories, args);
 		this.applicationInfoManager = applicationInfoManager;
 		this.publisher = publisher;
-		this.eurekaTransportField = ReflectionUtils.findField(DiscoveryClient.class,
-				"eurekaTransport");
+		this.eurekaTransportField = ReflectionUtils.findField(DiscoveryClient.class, "eurekaTransport");
 		ReflectionUtils.makeAccessible(this.eurekaTransportField);
 	}

@@ -81,8 +81,7 @@ public class CloudEurekaClient extends DiscoveryClient {
 	}

 	public InstanceInfo getInstanceInfo(String appname, String instanceId) {
-		EurekaHttpResponse<InstanceInfo> response = getEurekaHttpClient()
-				.getInstance(appname, instanceId);
+		EurekaHttpResponse<InstanceInfo> response = getEurekaHttpClient().getInstance(appname, instanceId);
 		HttpStatus httpStatus = HttpStatus.valueOf(response.getStatusCode());
 		if (httpStatus.is2xxSuccessful() && response.getEntity() != null) {
 			return response.getEntity();
@@ -94,8 +93,8 @@ public class CloudEurekaClient extends DiscoveryClient {
 		if (this.eurekaHttpClient.get() == null) {
 			try {
 				Object eurekaTransport = this.eurekaTransportField.get(this);
-				Field registrationClientField = ReflectionUtils
-						.findField(eurekaTransport.getClass(), "registrationClient");
+				Field registrationClientField = ReflectionUtils.findField(eurekaTransport.getClass(),
+						"registrationClient");
 				ReflectionUtils.makeAccessible(registrationClientField);
 				this.eurekaHttpClient.compareAndSet(null,
 						(EurekaHttpClient) registrationClientField.get(eurekaTransport));
@@ -108,8 +107,7 @@ public class CloudEurekaClient extends DiscoveryClient {
 	}

 	public void setStatus(InstanceStatus newStatus, InstanceInfo info) {
-		getEurekaHttpClient().statusUpdate(info.getAppName(), info.getId(), newStatus,
-				info);
+		getEurekaHttpClient().statusUpdate(info.getAppName(), info.getId(), newStatus, info);
 	}

 	@Override
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -64,8 +64,7 @@ public class CloudEurekaTransportConfig implements EurekaTransportConfig {
 		return sessionedClientReconnectIntervalSeconds;
 	}

-	public void setSessionedClientReconnectIntervalSeconds(
-			int sessionedClientReconnectIntervalSeconds) {
+	public void setSessionedClientReconnectIntervalSeconds(int sessionedClientReconnectIntervalSeconds) {
 		this.sessionedClientReconnectIntervalSeconds = sessionedClientReconnectIntervalSeconds;
 	}

@@ -73,8 +72,7 @@ public class CloudEurekaTransportConfig implements EurekaTransportConfig {
 		return retryableClientQuarantineRefreshPercentage;
 	}

-	public void setRetryableClientQuarantineRefreshPercentage(
-			double retryableClientQuarantineRefreshPercentage) {
+	public void setRetryableClientQuarantineRefreshPercentage(double retryableClientQuarantineRefreshPercentage) {
 		this.retryableClientQuarantineRefreshPercentage = retryableClientQuarantineRefreshPercentage;
 	}

@@ -82,8 +80,7 @@ public class CloudEurekaTransportConfig implements EurekaTransportConfig {
 		return bootstrapResolverRefreshIntervalSeconds;
 	}

-	public void setBootstrapResolverRefreshIntervalSeconds(
-			int bootstrapResolverRefreshIntervalSeconds) {
+	public void setBootstrapResolverRefreshIntervalSeconds(int bootstrapResolverRefreshIntervalSeconds) {
 		this.bootstrapResolverRefreshIntervalSeconds = bootstrapResolverRefreshIntervalSeconds;
 	}

@@ -180,47 +177,59 @@ public class CloudEurekaTransportConfig implements EurekaTransportConfig {
 				&& Objects.equals(readClusterVip, that.readClusterVip)
 				&& Objects.equals(writeClusterVip, that.writeClusterVip)
 				&& bootstrapResolverForQuery == that.bootstrapResolverForQuery
-				&& Objects.equals(bootstrapResolverStrategy,
-						that.bootstrapResolverStrategy)
+				&& Objects.equals(bootstrapResolverStrategy, that.bootstrapResolverStrategy)
 				&& applicationsResolverUseIp == that.applicationsResolverUseIp;
 	}

 	@Override
 	public int hashCode() {
-		return Objects.hash(sessionedClientReconnectIntervalSeconds,
-				retryableClientQuarantineRefreshPercentage,
-				bootstrapResolverRefreshIntervalSeconds,
-				applicationsResolverDataStalenessThresholdSeconds,
-				asyncResolverRefreshIntervalMs, asyncResolverWarmUpTimeoutMs,
-				asyncExecutorThreadPoolSize, readClusterVip, writeClusterVip,
-				bootstrapResolverForQuery, bootstrapResolverStrategy,
+		return Objects.hash(sessionedClientReconnectIntervalSeconds, retryableClientQuarantineRefreshPercentage,
+				bootstrapResolverRefreshIntervalSeconds, applicationsResolverDataStalenessThresholdSeconds,
+				asyncResolverRefreshIntervalMs, asyncResolverWarmUpTimeoutMs, asyncExecutorThreadPoolSize,
+				readClusterVip, writeClusterVip, bootstrapResolverForQuery, bootstrapResolverStrategy,
 				applicationsResolverUseIp);
 	}

 	@Override
 	public String toString() {
-		return new StringBuilder("CloudEurekaTransportConfig{")
-				.append("sessionedClientReconnectIntervalSeconds=")
-				.append(sessionedClientReconnectIntervalSeconds).append(", ")
-				.append("retryableClientQuarantineRefreshPercentage=")
-				.append(retryableClientQuarantineRefreshPercentage).append(", ")
-				.append("bootstrapResolverRefreshIntervalSeconds=")
-				.append(bootstrapResolverRefreshIntervalSeconds).append(", ")
-				.append("applicationsResolverDataStalenessThresholdSeconds=")
-				.append(applicationsResolverDataStalenessThresholdSeconds).append(", ")
-				.append("asyncResolverRefreshIntervalMs=")
-				.append(asyncResolverRefreshIntervalMs).append(", ")
-				.append("asyncResolverWarmUpTimeoutMs=")
-				.append(asyncResolverWarmUpTimeoutMs).append(", ")
-				.append("asyncExecutorThreadPoolSize=")
-				.append(asyncExecutorThreadPoolSize).append(", ")
-				.append("readClusterVip='").append(readClusterVip).append("', ")
-				.append("writeClusterVip='").append(writeClusterVip).append("', ")
-				.append("bootstrapResolverForQuery=").append(bootstrapResolverForQuery)
-				.append(", ").append("bootstrapResolverStrategy='")
-				.append(bootstrapResolverStrategy).append("', ")
-				.append("applicationsResolverUseIp=").append(applicationsResolverUseIp)
-				.append(", ").append("}").toString();
+		return new StringBuilder("CloudEurekaTransportConfig{").append("sessionedClientReconnectIntervalSeconds=")
+			.append(sessionedClientReconnectIntervalSeconds)
+			.append(", ")
+			.append("retryableClientQuarantineRefreshPercentage=")
+			.append(retryableClientQuarantineRefreshPercentage)
+			.append(", ")
+			.append("bootstrapResolverRefreshIntervalSeconds=")
+			.append(bootstrapResolverRefreshIntervalSeconds)
+			.append(", ")
+			.append("applicationsResolverDataStalenessThresholdSeconds=")
+			.append(applicationsResolverDataStalenessThresholdSeconds)
+			.append(", ")
+			.append("asyncResolverRefreshIntervalMs=")
+			.append(asyncResolverRefreshIntervalMs)
+			.append(", ")
+			.append("asyncResolverWarmUpTimeoutMs=")
+			.append(asyncResolverWarmUpTimeoutMs)
+			.append(", ")
+			.append("asyncExecutorThreadPoolSize=")
+			.append(asyncExecutorThreadPoolSize)
+			.append(", ")
+			.append("readClusterVip='")
+			.append(readClusterVip)
+			.append("', ")
+			.append("writeClusterVip='")
+			.append(writeClusterVip)
+			.append("', ")
+			.append("bootstrapResolverForQuery=")
+			.append(bootstrapResolverForQuery)
+			.append(", ")
+			.append("bootstrapResolverStrategy='")
+			.append(bootstrapResolverStrategy)
+			.append("', ")
+			.append("applicationsResolverUseIp=")
+			.append(applicationsResolverUseIp)
+			.append(", ")
+			.append("}")
+			.toString();
 	}

 }
@@ -1,42 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Convenience annotation for clients to enable Eureka discovery configuration
- * (specifically). Use this (optionally) in case you want discovery and know for sure that
- * it is Eureka you want. All it does is turn on discovery and let the autoconfiguration
- * find the eureka classes if they are available (i.e. you need Eureka on the classpath as
- * well).
- *
- * @author Dave Syer
- * @author Spencer Gibb
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-public @interface EnableEurekaClient {
-
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,14 +24,36 @@ import java.lang.annotation.Target;
 import java.util.Map;

 import com.netflix.appinfo.ApplicationInfoManager;
+import com.netflix.appinfo.DataCenterInfo;
 import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.appinfo.HealthCheckHandler;
 import com.netflix.appinfo.InstanceInfo;
+import com.netflix.appinfo.LeaseInfo;
+import com.netflix.appinfo.MyDataCenterInfo;
 import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
+import com.netflix.discovery.DiscoveryClient;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.TimedSupervisorTask;
+import com.netflix.discovery.converters.jackson.DataCenterTypeInfoResolver;
+import com.netflix.discovery.converters.jackson.builder.ApplicationsJacksonBuilder;
+import com.netflix.discovery.converters.jackson.mixin.InstanceInfoJsonMixIn;
+import com.netflix.discovery.shared.Application;
+import com.netflix.discovery.shared.Applications;
+import com.netflix.discovery.shared.resolver.AsyncResolver;
+import com.netflix.discovery.shared.resolver.DefaultEndpoint;
+import com.netflix.discovery.shared.resolver.EurekaEndpoint;
+import com.netflix.discovery.shared.transport.EurekaHttpResponse;
+import com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator;
+import com.netflix.discovery.shared.transport.decorator.RetryableEurekaHttpClient;
+import com.netflix.discovery.shared.transport.decorator.SessionedEurekaHttpClient;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;

 import org.springframework.aop.support.AopUtils;
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.TypeReference;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
@@ -50,7 +72,6 @@ import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
 import org.springframework.cloud.client.CommonsClientAutoConfiguration;
 import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
 import org.springframework.cloud.client.actuator.HasFeatures;
-import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistryAutoConfiguration;
 import org.springframework.cloud.commons.util.InetUtils;
@@ -68,6 +89,7 @@ import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;

 import static org.springframework.cloud.commons.util.IdUtils.getDefaultInstanceId;
@@ -81,22 +103,21 @@ import static org.springframework.cloud.commons.util.IdUtils.getDefaultInstanceI
 * @author Daniel Lavoie
 * @author Olga Maciaszek-Sharma
 * @author Tim Ysewyn
+ * @author Robert Bleyl
 */
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@ConditionalOnClass(EurekaClientConfig.class)
@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
@ConditionalOnDiscoveryEnabled
-@AutoConfigureBefore({ NoopDiscoveryClientAutoConfiguration.class,
-		CommonsClientAutoConfiguration.class, ServiceRegistryAutoConfiguration.class })
-@AutoConfigureAfter(name = {
-		"org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration",
+@AutoConfigureBefore({ CommonsClientAutoConfiguration.class, ServiceRegistryAutoConfiguration.class })
+@AutoConfigureAfter(name = { "org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration",
 		"org.springframework.cloud.autoconfigure.RefreshAutoConfiguration",
 		"org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration",
 		"org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration" })
 public class EurekaClientAutoConfiguration {

-	private ConfigurableEnvironment env;
+	private final ConfigurableEnvironment env;

 	public EurekaClientAutoConfiguration(ConfigurableEnvironment env) {
 		this.env = env;
@@ -108,8 +129,7 @@ public class EurekaClientAutoConfiguration {
 	}

 	@Bean
-	@ConditionalOnMissingBean(value = EurekaClientConfig.class,
-			search = SearchStrategy.CURRENT)
+	@ConditionalOnMissingBean(value = EurekaClientConfig.class, search = SearchStrategy.CURRENT)
 	public EurekaClientConfigBean eurekaClientConfigBean(ConfigurableEnvironment env) {
 		return new EurekaClientConfigBean();
 	}
@@ -125,26 +145,25 @@ public class EurekaClientAutoConfiguration {
 	}

 	@Bean
-	@ConditionalOnMissingBean(value = EurekaInstanceConfig.class,
-			search = SearchStrategy.CURRENT)
+	@ConditionalOnMissingBean(value = EurekaInstanceConfig.class, search = SearchStrategy.CURRENT)
 	public EurekaInstanceConfigBean eurekaInstanceConfigBean(InetUtils inetUtils,
 			ManagementMetadataProvider managementMetadataProvider) {
 		String hostname = getProperty("eureka.instance.hostname");
-		boolean preferIpAddress = Boolean
-				.parseBoolean(getProperty("eureka.instance.prefer-ip-address"));
+		boolean preferIpAddress = Boolean.parseBoolean(getProperty("eureka.instance.prefer-ip-address"));
 		String ipAddress = getProperty("eureka.instance.ip-address");
-		boolean isSecurePortEnabled = Boolean
-				.parseBoolean(getProperty("eureka.instance.secure-port-enabled"));
+		boolean isSecurePortEnabled = Boolean.parseBoolean(getProperty("eureka.instance.secure-port-enabled"));

 		String serverContextPath = env.getProperty("server.servlet.context-path", "/");
-		int serverPort = Integer.parseInt(
-				env.getProperty("server.port", env.getProperty("port", "8080")));
+		int serverPort = Integer.parseInt(env.getProperty("server.port", env.getProperty("port", "8080")));

 		Integer managementPort = env.getProperty("management.server.port", Integer.class);
-		String managementContextPath = env
-				.getProperty("management.server.servlet.context-path");
-		Integer jmxPort = env.getProperty("com.sun.management.jmxremote.port",
-				Integer.class);
+
+		String managementContextPath = env.getProperty("management.server.servlet.context-path");
+		if (!StringUtils.hasText(managementContextPath)) {
+			managementContextPath = env.getProperty("management.server.base-path");
+		}
+
+		Integer jmxPort = env.getProperty("com.sun.management.jmxremote.port", Integer.class);
 		EurekaInstanceConfigBean instance = new EurekaInstanceConfigBean(inetUtils);

 		instance.setNonSecurePort(serverPort);
@@ -172,8 +191,8 @@ public class EurekaClientAutoConfiguration {
 			instance.setHealthCheckUrlPath(healthCheckUrlPath);
 		}

-		ManagementMetadata metadata = managementMetadataProvider.get(instance, serverPort,
-				serverContextPath, managementContextPath, managementPort);
+		ManagementMetadata metadata = managementMetadataProvider.get(instance, serverPort, serverContextPath,
+				managementContextPath, managementPort);

 		if (metadata != null) {
 			instance.setStatusPageUrl(metadata.getStatusPageUrl());
@@ -182,18 +201,15 @@ public class EurekaClientAutoConfiguration {
 				instance.setSecureHealthCheckUrl(metadata.getSecureHealthCheckUrl());
 			}
 			Map<String, String> metadataMap = instance.getMetadataMap();
-			metadataMap.computeIfAbsent("management.port",
-					k -> String.valueOf(metadata.getManagementPort()));
+			metadataMap.computeIfAbsent("management.port", k -> String.valueOf(metadata.getManagementPort()));
 		}
 		else {
 			// without the metadata the status and health check URLs will not be set
 			// and the status page and health check url paths will not include the
 			// context path so set them here
 			if (StringUtils.hasText(managementContextPath)) {
-				instance.setHealthCheckUrlPath(
-						managementContextPath + instance.getHealthCheckUrlPath());
-				instance.setStatusPageUrlPath(
-						managementContextPath + instance.getStatusPageUrlPath());
+				instance.setHealthCheckUrlPath(managementContextPath + instance.getHealthCheckUrlPath());
+				instance.setStatusPageUrlPath(managementContextPath + instance.getStatusPageUrlPath());
 			}
 		}

@@ -209,8 +225,8 @@ public class EurekaClientAutoConfiguration {
 	}

 	@Bean
-	public EurekaServiceRegistry eurekaServiceRegistry() {
-		return new EurekaServiceRegistry();
+	public EurekaServiceRegistry eurekaServiceRegistry(EurekaInstanceConfigBean eurekaInstanceConfigBean) {
+		return new EurekaServiceRegistry(eurekaInstanceConfigBean);
 	}

 	// @Bean
@@ -229,12 +245,9 @@ public class EurekaClientAutoConfiguration {

 	@Bean
 	@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-	@ConditionalOnProperty(
-			value = "spring.cloud.service-registry.auto-registration.enabled",
-			matchIfMissing = true)
-	public EurekaAutoServiceRegistration eurekaAutoServiceRegistration(
-			ApplicationContext context, EurekaServiceRegistry registry,
-			EurekaRegistration registration) {
+	@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
+	public EurekaAutoServiceRegistration eurekaAutoServiceRegistration(ApplicationContext context,
+			EurekaServiceRegistry registry, EurekaRegistration registration) {
 		return new EurekaAutoServiceRegistration(context, registry, registration);
 	}

@@ -245,38 +258,34 @@ public class EurekaClientAutoConfiguration {
 		@Autowired
 		private ApplicationContext context;

-		@Autowired
+		@Autowired(required = false)
 		private AbstractDiscoveryClientOptionalArgs<?> optionalArgs;

 		@Bean(destroyMethod = "shutdown")
-		@ConditionalOnMissingBean(value = EurekaClient.class,
-				search = SearchStrategy.CURRENT)
-		public EurekaClient eurekaClient(ApplicationInfoManager manager,
-				EurekaClientConfig config) {
-			return new CloudEurekaClient(manager, config, this.optionalArgs,
-					this.context);
+		@ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT)
+		public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config,
+				TransportClientFactories<?> transportClientFactories) {
+			return new CloudEurekaClient(manager, config, transportClientFactories, this.optionalArgs, this.context);
 		}

 		@Bean
-		@ConditionalOnMissingBean(value = ApplicationInfoManager.class,
-				search = SearchStrategy.CURRENT)
-		public ApplicationInfoManager eurekaApplicationInfoManager(
-				EurekaInstanceConfig config) {
+		@ConditionalOnMissingBean(value = ApplicationInfoManager.class, search = SearchStrategy.CURRENT)
+		public ApplicationInfoManager eurekaApplicationInfoManager(EurekaInstanceConfig config) {
 			InstanceInfo instanceInfo = new InstanceInfoFactory().create(config);
 			return new ApplicationInfoManager(config, instanceInfo);
 		}

 		@Bean
 		@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-		@ConditionalOnProperty(
-				value = "spring.cloud.service-registry.auto-registration.enabled",
-				matchIfMissing = true)
+		@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
 		public EurekaRegistration eurekaRegistration(EurekaClient eurekaClient,
-				CloudEurekaInstanceConfig instanceConfig,
-				ApplicationInfoManager applicationInfoManager, @Autowired(
-						required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
-			return EurekaRegistration.builder(instanceConfig).with(applicationInfoManager)
-					.with(eurekaClient).with(healthCheckHandler).build();
+				CloudEurekaInstanceConfig instanceConfig, ApplicationInfoManager applicationInfoManager,
+				@Autowired(required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
+			return EurekaRegistration.builder(instanceConfig)
+				.with(applicationInfoManager)
+				.with(eurekaClient)
+				.with(healthCheckHandler)
+				.build();
 		}

 	}
@@ -288,22 +297,21 @@ public class EurekaClientAutoConfiguration {
 		@Autowired
 		private ApplicationContext context;

-		@Autowired
+		@Autowired(required = false)
 		private AbstractDiscoveryClientOptionalArgs<?> optionalArgs;

 		@Bean(destroyMethod = "shutdown")
-		@ConditionalOnMissingBean(value = EurekaClient.class,
-				search = SearchStrategy.CURRENT)
+		@ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT)
 		@org.springframework.cloud.context.config.annotation.RefreshScope
 		@Lazy
-		public EurekaClient eurekaClient(ApplicationInfoManager manager,
-				EurekaClientConfig config, EurekaInstanceConfig instance,
+		public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config,
+				EurekaInstanceConfig instance, TransportClientFactories<?> transportClientFactories,
 				@Autowired(required = false) HealthCheckHandler healthCheckHandler) {
 			// If we use the proxy of the ApplicationInfoManager we could run into a
 			// problem
 			// when shutdown is called on the CloudEurekaClient where the
 			// ApplicationInfoManager bean is
-			// requested but wont be allowed because we are shutting down. To avoid this
+			// requested but won't be allowed because we are shutting down. To avoid this
 			// we use the
 			// object directly.
 			ApplicationInfoManager appManager;
@@ -313,19 +321,17 @@ public class EurekaClientAutoConfiguration {
 			else {
 				appManager = manager;
 			}
-			CloudEurekaClient cloudEurekaClient = new CloudEurekaClient(appManager,
-					config, this.optionalArgs, this.context);
+			CloudEurekaClient cloudEurekaClient = new CloudEurekaClient(appManager, config, transportClientFactories,
+					this.optionalArgs, this.context);
 			cloudEurekaClient.registerHealthCheck(healthCheckHandler);
 			return cloudEurekaClient;
 		}

 		@Bean
-		@ConditionalOnMissingBean(value = ApplicationInfoManager.class,
-				search = SearchStrategy.CURRENT)
+		@ConditionalOnMissingBean(value = ApplicationInfoManager.class, search = SearchStrategy.CURRENT)
 		@org.springframework.cloud.context.config.annotation.RefreshScope
 		@Lazy
-		public ApplicationInfoManager eurekaApplicationInfoManager(
-				EurekaInstanceConfig config) {
+		public ApplicationInfoManager eurekaApplicationInfoManager(EurekaInstanceConfig config) {
 			InstanceInfo instanceInfo = new InstanceInfoFactory().create(config);
 			return new ApplicationInfoManager(config, instanceInfo);
 		}
@@ -333,15 +339,15 @@ public class EurekaClientAutoConfiguration {
 		@Bean
 		@org.springframework.cloud.context.config.annotation.RefreshScope
 		@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-		@ConditionalOnProperty(
-				value = "spring.cloud.service-registry.auto-registration.enabled",
-				matchIfMissing = true)
+		@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
 		public EurekaRegistration eurekaRegistration(EurekaClient eurekaClient,
-				CloudEurekaInstanceConfig instanceConfig,
-				ApplicationInfoManager applicationInfoManager, @Autowired(
-						required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
-			return EurekaRegistration.builder(instanceConfig).with(applicationInfoManager)
-					.with(eurekaClient).with(healthCheckHandler).build();
+				CloudEurekaInstanceConfig instanceConfig, ApplicationInfoManager applicationInfoManager,
+				@Autowired(required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
+			return EurekaRegistration.builder(instanceConfig)
+				.with(applicationInfoManager)
+				.with(eurekaClient)
+				.with(healthCheckHandler)
+				.build();
 		}

 	}
@@ -359,8 +365,7 @@ public class EurekaClientAutoConfiguration {
 	@Documented
 	@ConditionalOnClass(RefreshScope.class)
 	@ConditionalOnBean(RefreshAutoConfiguration.class)
-	@ConditionalOnProperty(value = "eureka.client.refresh.enable", havingValue = "true",
-			matchIfMissing = true)
+	@ConditionalOnProperty(value = "eureka.client.refresh.enable", havingValue = "true", matchIfMissing = true)
 	@interface ConditionalOnRefreshScope {

 	}
@@ -381,8 +386,7 @@ public class EurekaClientAutoConfiguration {

 		}

-		@ConditionalOnProperty(value = "eureka.client.refresh.enable",
-				havingValue = "false")
+		@ConditionalOnProperty(value = "eureka.client.refresh.enable", havingValue = "false")
 		static class OnPropertyDisabled {

 		}
@@ -404,3 +408,86 @@ public class EurekaClientAutoConfiguration {
 	}

 }
+
+// Remove after adding hints to GraalVM reachability metadata repo
+class EurekaClientHints implements RuntimeHintsRegistrar {
+
+	@Override
+	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+		if (!ClassUtils.isPresent("com.netflix.discovery.DiscoveryClient", classLoader)) {
+			return;
+		}
+		hints.reflection()
+			.registerType(TypeReference.of(DiscoveryClient.class),
+					hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS,
+							MemberCategory.INTROSPECT_DECLARED_METHODS))
+			.registerType(TypeReference.of(EurekaEndpoint.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS))
+			.registerType(TypeReference.of(DefaultEndpoint.class),
+					hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS))
+			.registerType(TypeReference.of(EurekaHttpClientDecorator.class),
+					hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS,
+							MemberCategory.INTROSPECT_DECLARED_METHODS))
+			.registerType(TypeReference.of(EurekaHttpResponse.class),
+					hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS))
+			.registerType(TypeReference.of(EurekaHttpClientDecorator.RequestExecutor.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS))
+			.registerType(TypeReference.of(ApplicationInfoManager.class),
+					hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS))
+			.registerType(TypeReference.of(InstanceInfo.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS))
+			.registerType(TypeReference.of(InstanceInfo.ActionType.class),
+					hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+							MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(InstanceInfo.PortWrapper.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(LeaseInfo.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(MyDataCenterInfo.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(DataCenterInfo.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(DataCenterInfo.Name.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(EurekaClient.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS))
+			.registerType(TypeReference.of(TimedSupervisorTask.class),
+					hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+							MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(DataCenterTypeInfoResolver.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS))
+			.registerType(TypeReference.of(ApplicationsJacksonBuilder.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(InstanceInfoJsonMixIn.class),
+					hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+							MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(Application.class),
+					hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+							MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(Applications.class),
+					hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+							MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(AsyncResolver.class),
+					hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+							MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(RetryableEurekaHttpClient.class),
+					hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+							MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(SessionedEurekaHttpClient.class),
+					hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+							MemberCategory.DECLARED_FIELDS))
+			.registerType(TypeReference.of(EurekaServiceInstance.class),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+							MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS));
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import java.util.Objects;
 import com.netflix.appinfo.EurekaAccept;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.transport.EurekaTransportConfig;
+import org.apache.hc.client5.http.classic.HttpClient;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -40,6 +41,7 @@ import static org.springframework.cloud.netflix.eureka.EurekaConstants.DEFAULT_P
 *
 * @author Dave Syer
 * @author Gregor Zurowski
+ * @author Mooyong Lee
 */
@ConfigurationProperties(EurekaClientConfigBean.PREFIX)
 public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
@@ -52,16 +54,13 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 	/**
 	 * Default Eureka URL.
 	 */
-	public static final String DEFAULT_URL = "http://localhost:8761" + DEFAULT_PREFIX
-			+ "/";
+	public static final String DEFAULT_URL = "http://localhost:8761" + DEFAULT_PREFIX + "/";

 	/**
 	 * Default availability zone if none is resolved based on region.
 	 */
 	public static final String DEFAULT_ZONE = "defaultZone";

-	private static final int MINUTES = 60;
-
 	@Autowired(required = false)
 	PropertyResolver propertyResolver;

@@ -96,7 +95,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 	 * Eureka servers could be added or removed and this setting controls how soon the
 	 * eureka clients should know about it.
 	 */
-	private int eurekaServiceUrlPollIntervalSeconds = 5 * MINUTES;
+	private int eurekaServiceUrlPollIntervalSeconds = 300; // 5 * MINUTES

 	/**
 	 * Gets the proxy port to eureka server if any.
@@ -127,14 +126,14 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 	/**
 	 * Indicates how long to wait (in seconds) before a connection to eureka server needs
 	 * to timeout. Note that the connections in the client are pooled by
-	 * org.apache.http.client.HttpClient and this setting affects the actual connection
-	 * creation and also the wait time to get the connection from the pool.
+	 * {@link HttpClient} and this setting affects the actual connection creation and also
+	 * the wait time to get the connection from the pool.
 	 */
 	private int eurekaServerConnectTimeoutSeconds = 5;

 	/**
 	 * Gets the name of the implementation which implements BackupRegistry to fetch the
-	 * registry information as a fall back option for only the first time when the eureka
+	 * registry information as a fallback option for only the first time when the eureka
 	 * client starts.
 	 *
 	 * This may be needed for applications which needs additional resiliency for registry
@@ -473,9 +472,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		if (serviceUrls == null || serviceUrls.isEmpty()) {
 			serviceUrls = this.serviceUrl.get(DEFAULT_ZONE);
 		}
-		if (!StringUtils.isEmpty(serviceUrls)) {
-			final String[] serviceUrlsSplit = StringUtils
-					.commaDelimitedListToStringArray(serviceUrls);
+		if (StringUtils.hasText(serviceUrls)) {
+			final String[] serviceUrlsSplit = StringUtils.commaDelimitedListToStringArray(serviceUrls);
 			List<String> eurekaServiceUrls = new ArrayList<>(serviceUrlsSplit.length);
 			for (String eurekaServiceUrl : serviceUrlsSplit) {
 				if (!endsWithSlash(eurekaServiceUrl)) {
@@ -516,8 +514,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 	@Override
 	public String getExperimental(String name) {
 		if (this.propertyResolver != null) {
-			return this.propertyResolver.getProperty(PREFIX + ".experimental." + name,
-					String.class, null);
+			return this.propertyResolver.getProperty(PREFIX + ".experimental." + name, String.class, null);
 		}
 		return null;
 	}
@@ -565,8 +562,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return instanceInfoReplicationIntervalSeconds;
 	}

-	public void setInstanceInfoReplicationIntervalSeconds(
-			int instanceInfoReplicationIntervalSeconds) {
+	public void setInstanceInfoReplicationIntervalSeconds(int instanceInfoReplicationIntervalSeconds) {
 		this.instanceInfoReplicationIntervalSeconds = instanceInfoReplicationIntervalSeconds;
 	}

@@ -575,8 +571,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return initialInstanceInfoReplicationIntervalSeconds;
 	}

-	public void setInitialInstanceInfoReplicationIntervalSeconds(
-			int initialInstanceInfoReplicationIntervalSeconds) {
+	public void setInitialInstanceInfoReplicationIntervalSeconds(int initialInstanceInfoReplicationIntervalSeconds) {
 		this.initialInstanceInfoReplicationIntervalSeconds = initialInstanceInfoReplicationIntervalSeconds;
 	}

@@ -585,8 +580,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return eurekaServiceUrlPollIntervalSeconds;
 	}

-	public void setEurekaServiceUrlPollIntervalSeconds(
-			int eurekaServiceUrlPollIntervalSeconds) {
+	public void setEurekaServiceUrlPollIntervalSeconds(int eurekaServiceUrlPollIntervalSeconds) {
 		this.eurekaServiceUrlPollIntervalSeconds = eurekaServiceUrlPollIntervalSeconds;
 	}

@@ -640,8 +634,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return eurekaServerConnectTimeoutSeconds;
 	}

-	public void setEurekaServerConnectTimeoutSeconds(
-			int eurekaServerConnectTimeoutSeconds) {
+	public void setEurekaServerConnectTimeoutSeconds(int eurekaServerConnectTimeoutSeconds) {
 		this.eurekaServerConnectTimeoutSeconds = eurekaServerConnectTimeoutSeconds;
 	}

@@ -668,8 +661,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return eurekaServerTotalConnectionsPerHost;
 	}

-	public void setEurekaServerTotalConnectionsPerHost(
-			int eurekaServerTotalConnectionsPerHost) {
+	public void setEurekaServerTotalConnectionsPerHost(int eurekaServerTotalConnectionsPerHost) {
 		this.eurekaServerTotalConnectionsPerHost = eurekaServerTotalConnectionsPerHost;
 	}

@@ -714,8 +706,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return eurekaConnectionIdleTimeoutSeconds;
 	}

-	public void setEurekaConnectionIdleTimeoutSeconds(
-			int eurekaConnectionIdleTimeoutSeconds) {
+	public void setEurekaConnectionIdleTimeoutSeconds(int eurekaConnectionIdleTimeoutSeconds) {
 		this.eurekaConnectionIdleTimeoutSeconds = eurekaConnectionIdleTimeoutSeconds;
 	}

@@ -724,8 +715,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return registryRefreshSingleVipAddress;
 	}

-	public void setRegistryRefreshSingleVipAddress(
-			String registryRefreshSingleVipAddress) {
+	public void setRegistryRefreshSingleVipAddress(String registryRefreshSingleVipAddress) {
 		this.registryRefreshSingleVipAddress = registryRefreshSingleVipAddress;
 	}

@@ -743,8 +733,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return heartbeatExecutorExponentialBackOffBound;
 	}

-	public void setHeartbeatExecutorExponentialBackOffBound(
-			int heartbeatExecutorExponentialBackOffBound) {
+	public void setHeartbeatExecutorExponentialBackOffBound(int heartbeatExecutorExponentialBackOffBound) {
 		this.heartbeatExecutorExponentialBackOffBound = heartbeatExecutorExponentialBackOffBound;
 	}

@@ -753,8 +742,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return cacheRefreshExecutorThreadPoolSize;
 	}

-	public void setCacheRefreshExecutorThreadPoolSize(
-			int cacheRefreshExecutorThreadPoolSize) {
+	public void setCacheRefreshExecutorThreadPoolSize(int cacheRefreshExecutorThreadPoolSize) {
 		this.cacheRefreshExecutorThreadPoolSize = cacheRefreshExecutorThreadPoolSize;
 	}

@@ -763,8 +751,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return cacheRefreshExecutorExponentialBackOffBound;
 	}

-	public void setCacheRefreshExecutorExponentialBackOffBound(
-			int cacheRefreshExecutorExponentialBackOffBound) {
+	public void setCacheRefreshExecutorExponentialBackOffBound(int cacheRefreshExecutorExponentialBackOffBound) {
 		this.cacheRefreshExecutorExponentialBackOffBound = cacheRefreshExecutorExponentialBackOffBound;
 	}

@@ -929,8 +916,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		return shouldEnforceRegistrationAtInit;
 	}

-	public void setShouldEnforceRegistrationAtInit(
-			boolean shouldEnforceRegistrationAtInit) {
+	public void setShouldEnforceRegistrationAtInit(boolean shouldEnforceRegistrationAtInit) {
 		this.shouldEnforceRegistrationAtInit = shouldEnforceRegistrationAtInit;
 	}

@@ -952,8 +938,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 			return false;
 		}
 		EurekaClientConfigBean that = (EurekaClientConfigBean) o;
-		return Objects.equals(propertyResolver, that.propertyResolver)
-				&& enabled == that.enabled && Objects.equals(transport, that.transport)
+		return Objects.equals(propertyResolver, that.propertyResolver) && enabled == that.enabled
+				&& Objects.equals(transport, that.transport)
 				&& registryFetchIntervalSeconds == that.registryFetchIntervalSeconds
 				&& instanceInfoReplicationIntervalSeconds == that.instanceInfoReplicationIntervalSeconds
 				&& initialInstanceInfoReplicationIntervalSeconds == that.initialInstanceInfoReplicationIntervalSeconds
@@ -967,128 +953,191 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 				&& heartbeatExecutorExponentialBackOffBound == that.heartbeatExecutorExponentialBackOffBound
 				&& cacheRefreshExecutorThreadPoolSize == that.cacheRefreshExecutorThreadPoolSize
 				&& cacheRefreshExecutorExponentialBackOffBound == that.cacheRefreshExecutorExponentialBackOffBound
-				&& gZipContent == that.gZipContent
-				&& useDnsForFetchingServiceUrls == that.useDnsForFetchingServiceUrls
-				&& registerWithEureka == that.registerWithEureka
-				&& preferSameZoneEureka == that.preferSameZoneEureka
+				&& gZipContent == that.gZipContent && useDnsForFetchingServiceUrls == that.useDnsForFetchingServiceUrls
+				&& registerWithEureka == that.registerWithEureka && preferSameZoneEureka == that.preferSameZoneEureka
 				&& logDeltaDiff == that.logDeltaDiff && disableDelta == that.disableDelta
-				&& filterOnlyUpInstances == that.filterOnlyUpInstances
-				&& fetchRegistry == that.fetchRegistry
+				&& filterOnlyUpInstances == that.filterOnlyUpInstances && fetchRegistry == that.fetchRegistry
 				&& allowRedirects == that.allowRedirects
 				&& onDemandUpdateStatusChange == that.onDemandUpdateStatusChange
 				&& shouldUnregisterOnShutdown == that.shouldUnregisterOnShutdown
 				&& shouldEnforceRegistrationAtInit == that.shouldEnforceRegistrationAtInit
-				&& Objects.equals(proxyPort, that.proxyPort)
-				&& Objects.equals(proxyHost, that.proxyHost)
+				&& Objects.equals(proxyPort, that.proxyPort) && Objects.equals(proxyHost, that.proxyHost)
 				&& Objects.equals(proxyUserName, that.proxyUserName)
 				&& Objects.equals(proxyPassword, that.proxyPassword)
 				&& Objects.equals(backupRegistryImpl, that.backupRegistryImpl)
 				&& Objects.equals(eurekaServerURLContext, that.eurekaServerURLContext)
 				&& Objects.equals(eurekaServerPort, that.eurekaServerPort)
-				&& Objects.equals(eurekaServerDNSName, that.eurekaServerDNSName)
-				&& Objects.equals(region, that.region)
-				&& Objects.equals(registryRefreshSingleVipAddress,
-						that.registryRefreshSingleVipAddress)
+				&& Objects.equals(eurekaServerDNSName, that.eurekaServerDNSName) && Objects.equals(region, that.region)
+				&& Objects.equals(registryRefreshSingleVipAddress, that.registryRefreshSingleVipAddress)
 				&& Objects.equals(serviceUrl, that.serviceUrl)
-				&& Objects.equals(fetchRemoteRegionsRegistry,
-						that.fetchRemoteRegionsRegistry)
+				&& Objects.equals(fetchRemoteRegionsRegistry, that.fetchRemoteRegionsRegistry)
 				&& Objects.equals(availabilityZones, that.availabilityZones)
 				&& Objects.equals(dollarReplacement, that.dollarReplacement)
 				&& Objects.equals(escapeCharReplacement, that.escapeCharReplacement)
-				&& Objects.equals(encoderName, that.encoderName)
-				&& Objects.equals(decoderName, that.decoderName)
-				&& Objects.equals(clientDataAccept, that.clientDataAccept)
-				&& Objects.equals(order, that.order);
+				&& Objects.equals(encoderName, that.encoderName) && Objects.equals(decoderName, that.decoderName)
+				&& Objects.equals(clientDataAccept, that.clientDataAccept) && Objects.equals(order, that.order);
 	}

 	@Override
 	public int hashCode() {
-		return Objects.hash(propertyResolver, enabled, transport,
-				registryFetchIntervalSeconds, instanceInfoReplicationIntervalSeconds,
-				initialInstanceInfoReplicationIntervalSeconds,
-				eurekaServiceUrlPollIntervalSeconds, proxyPort, proxyHost, proxyUserName,
-				proxyPassword, eurekaServerReadTimeoutSeconds,
-				eurekaServerConnectTimeoutSeconds, backupRegistryImpl,
-				eurekaServerTotalConnections, eurekaServerTotalConnectionsPerHost,
-				eurekaServerURLContext, eurekaServerPort, eurekaServerDNSName, region,
-				eurekaConnectionIdleTimeoutSeconds, registryRefreshSingleVipAddress,
-				heartbeatExecutorThreadPoolSize, heartbeatExecutorExponentialBackOffBound,
-				cacheRefreshExecutorThreadPoolSize,
-				cacheRefreshExecutorExponentialBackOffBound, serviceUrl, gZipContent,
-				useDnsForFetchingServiceUrls, registerWithEureka, preferSameZoneEureka,
-				logDeltaDiff, disableDelta, fetchRemoteRegionsRegistry, availabilityZones,
-				filterOnlyUpInstances, fetchRegistry, dollarReplacement,
-				escapeCharReplacement, allowRedirects, onDemandUpdateStatusChange,
-				encoderName, decoderName, clientDataAccept, shouldUnregisterOnShutdown,
-				shouldEnforceRegistrationAtInit, order);
+		return Objects.hash(propertyResolver, enabled, transport, registryFetchIntervalSeconds,
+				instanceInfoReplicationIntervalSeconds, initialInstanceInfoReplicationIntervalSeconds,
+				eurekaServiceUrlPollIntervalSeconds, proxyPort, proxyHost, proxyUserName, proxyPassword,
+				eurekaServerReadTimeoutSeconds, eurekaServerConnectTimeoutSeconds, backupRegistryImpl,
+				eurekaServerTotalConnections, eurekaServerTotalConnectionsPerHost, eurekaServerURLContext,
+				eurekaServerPort, eurekaServerDNSName, region, eurekaConnectionIdleTimeoutSeconds,
+				registryRefreshSingleVipAddress, heartbeatExecutorThreadPoolSize,
+				heartbeatExecutorExponentialBackOffBound, cacheRefreshExecutorThreadPoolSize,
+				cacheRefreshExecutorExponentialBackOffBound, serviceUrl, gZipContent, useDnsForFetchingServiceUrls,
+				registerWithEureka, preferSameZoneEureka, logDeltaDiff, disableDelta, fetchRemoteRegionsRegistry,
+				availabilityZones, filterOnlyUpInstances, fetchRegistry, dollarReplacement, escapeCharReplacement,
+				allowRedirects, onDemandUpdateStatusChange, encoderName, decoderName, clientDataAccept,
+				shouldUnregisterOnShutdown, shouldEnforceRegistrationAtInit, order);
 	}

 	@Override
 	public String toString() {
 		return new StringBuilder("EurekaClientConfigBean{").append("propertyResolver=")
-				.append(propertyResolver).append(", ").append("enabled=").append(enabled)
-				.append(", ").append("transport=").append(transport).append(", ")
-				.append("registryFetchIntervalSeconds=")
-				.append(registryFetchIntervalSeconds).append(", ")
-				.append("instanceInfoReplicationIntervalSeconds=")
-				.append(instanceInfoReplicationIntervalSeconds).append(", ")
-				.append("initialInstanceInfoReplicationIntervalSeconds=")
-				.append(initialInstanceInfoReplicationIntervalSeconds).append(", ")
-				.append("eurekaServiceUrlPollIntervalSeconds=")
-				.append(eurekaServiceUrlPollIntervalSeconds).append(", ")
-				.append("proxyPort='").append(proxyPort).append("', ")
-				.append("proxyHost='").append(proxyHost).append("', ")
-				.append("proxyUserName='").append(proxyUserName).append("', ")
-				.append("proxyPassword='").append(proxyPassword).append("', ")
-				.append("eurekaServerReadTimeoutSeconds=")
-				.append(eurekaServerReadTimeoutSeconds).append(", ")
-				.append("eurekaServerConnectTimeoutSeconds=")
-				.append(eurekaServerConnectTimeoutSeconds).append(", ")
-				.append("backupRegistryImpl='").append(backupRegistryImpl).append("', ")
-				.append("eurekaServerTotalConnections=")
-				.append(eurekaServerTotalConnections).append(", ")
-				.append("eurekaServerTotalConnectionsPerHost=")
-				.append(eurekaServerTotalConnectionsPerHost).append(", ")
-				.append("eurekaServerURLContext='").append(eurekaServerURLContext)
-				.append("', ").append("eurekaServerPort='").append(eurekaServerPort)
-				.append("', ").append("eurekaServerDNSName='").append(eurekaServerDNSName)
-				.append("', ").append("region='").append(region).append("', ")
-				.append("eurekaConnectionIdleTimeoutSeconds=")
-				.append(eurekaConnectionIdleTimeoutSeconds).append(", ")
-				.append("registryRefreshSingleVipAddress='")
-				.append(registryRefreshSingleVipAddress).append("', ")
-				.append("heartbeatExecutorThreadPoolSize=")
-				.append(heartbeatExecutorThreadPoolSize).append(", ")
-				.append("heartbeatExecutorExponentialBackOffBound=")
-				.append(heartbeatExecutorExponentialBackOffBound).append(", ")
-				.append("cacheRefreshExecutorThreadPoolSize=")
-				.append(cacheRefreshExecutorThreadPoolSize).append(", ")
-				.append("cacheRefreshExecutorExponentialBackOffBound=")
-				.append(cacheRefreshExecutorExponentialBackOffBound).append(", ")
-				.append("serviceUrl=").append(serviceUrl).append(", ")
-				.append("gZipContent=").append(gZipContent).append(", ")
-				.append("useDnsForFetchingServiceUrls=")
-				.append(useDnsForFetchingServiceUrls).append(", ")
-				.append("registerWithEureka=").append(registerWithEureka).append(", ")
-				.append("preferSameZoneEureka=").append(preferSameZoneEureka).append(", ")
-				.append("logDeltaDiff=").append(logDeltaDiff).append(", ")
-				.append("disableDelta=").append(disableDelta).append(", ")
-				.append("fetchRemoteRegionsRegistry='").append(fetchRemoteRegionsRegistry)
-				.append("', ").append("availabilityZones=").append(availabilityZones)
-				.append(", ").append("filterOnlyUpInstances=")
-				.append(filterOnlyUpInstances).append(", ").append("fetchRegistry=")
-				.append(fetchRegistry).append(", ").append("dollarReplacement='")
-				.append(dollarReplacement).append("', ").append("escapeCharReplacement='")
-				.append(escapeCharReplacement).append("', ").append("allowRedirects=")
-				.append(allowRedirects).append(", ").append("onDemandUpdateStatusChange=")
-				.append(onDemandUpdateStatusChange).append(", ").append("encoderName='")
-				.append(encoderName).append("', ").append("decoderName='")
-				.append(decoderName).append("', ").append("clientDataAccept='")
-				.append(clientDataAccept).append("', ")
-				.append("shouldUnregisterOnShutdown='").append(shouldUnregisterOnShutdown)
-				.append("shouldEnforceRegistrationAtInit='")
-				.append(shouldEnforceRegistrationAtInit).append("', ").append("order='")
-				.append(order).append("'}").toString();
+			.append(propertyResolver)
+			.append(", ")
+			.append("enabled=")
+			.append(enabled)
+			.append(", ")
+			.append("transport=")
+			.append(transport)
+			.append(", ")
+			.append("registryFetchIntervalSeconds=")
+			.append(registryFetchIntervalSeconds)
+			.append(", ")
+			.append("instanceInfoReplicationIntervalSeconds=")
+			.append(instanceInfoReplicationIntervalSeconds)
+			.append(", ")
+			.append("initialInstanceInfoReplicationIntervalSeconds=")
+			.append(initialInstanceInfoReplicationIntervalSeconds)
+			.append(", ")
+			.append("eurekaServiceUrlPollIntervalSeconds=")
+			.append(eurekaServiceUrlPollIntervalSeconds)
+			.append(", ")
+			.append("proxyPort='")
+			.append(proxyPort)
+			.append("', ")
+			.append("proxyHost='")
+			.append(proxyHost)
+			.append("', ")
+			.append("proxyUserName='")
+			.append(proxyUserName)
+			.append("', ")
+			.append("proxyPassword='")
+			.append(proxyPassword)
+			.append("', ")
+			.append("eurekaServerReadTimeoutSeconds=")
+			.append(eurekaServerReadTimeoutSeconds)
+			.append(", ")
+			.append("eurekaServerConnectTimeoutSeconds=")
+			.append(eurekaServerConnectTimeoutSeconds)
+			.append(", ")
+			.append("backupRegistryImpl='")
+			.append(backupRegistryImpl)
+			.append("', ")
+			.append("eurekaServerTotalConnections=")
+			.append(eurekaServerTotalConnections)
+			.append(", ")
+			.append("eurekaServerTotalConnectionsPerHost=")
+			.append(eurekaServerTotalConnectionsPerHost)
+			.append(", ")
+			.append("eurekaServerURLContext='")
+			.append(eurekaServerURLContext)
+			.append("', ")
+			.append("eurekaServerPort='")
+			.append(eurekaServerPort)
+			.append("', ")
+			.append("eurekaServerDNSName='")
+			.append(eurekaServerDNSName)
+			.append("', ")
+			.append("region='")
+			.append(region)
+			.append("', ")
+			.append("eurekaConnectionIdleTimeoutSeconds=")
+			.append(eurekaConnectionIdleTimeoutSeconds)
+			.append(", ")
+			.append("registryRefreshSingleVipAddress='")
+			.append(registryRefreshSingleVipAddress)
+			.append("', ")
+			.append("heartbeatExecutorThreadPoolSize=")
+			.append(heartbeatExecutorThreadPoolSize)
+			.append(", ")
+			.append("heartbeatExecutorExponentialBackOffBound=")
+			.append(heartbeatExecutorExponentialBackOffBound)
+			.append(", ")
+			.append("cacheRefreshExecutorThreadPoolSize=")
+			.append(cacheRefreshExecutorThreadPoolSize)
+			.append(", ")
+			.append("cacheRefreshExecutorExponentialBackOffBound=")
+			.append(cacheRefreshExecutorExponentialBackOffBound)
+			.append(", ")
+			.append("serviceUrl=")
+			.append(serviceUrl)
+			.append(", ")
+			.append("gZipContent=")
+			.append(gZipContent)
+			.append(", ")
+			.append("useDnsForFetchingServiceUrls=")
+			.append(useDnsForFetchingServiceUrls)
+			.append(", ")
+			.append("registerWithEureka=")
+			.append(registerWithEureka)
+			.append(", ")
+			.append("preferSameZoneEureka=")
+			.append(preferSameZoneEureka)
+			.append(", ")
+			.append("logDeltaDiff=")
+			.append(logDeltaDiff)
+			.append(", ")
+			.append("disableDelta=")
+			.append(disableDelta)
+			.append(", ")
+			.append("fetchRemoteRegionsRegistry='")
+			.append(fetchRemoteRegionsRegistry)
+			.append("', ")
+			.append("availabilityZones=")
+			.append(availabilityZones)
+			.append(", ")
+			.append("filterOnlyUpInstances=")
+			.append(filterOnlyUpInstances)
+			.append(", ")
+			.append("fetchRegistry=")
+			.append(fetchRegistry)
+			.append(", ")
+			.append("dollarReplacement='")
+			.append(dollarReplacement)
+			.append("', ")
+			.append("escapeCharReplacement='")
+			.append(escapeCharReplacement)
+			.append("', ")
+			.append("allowRedirects=")
+			.append(allowRedirects)
+			.append(", ")
+			.append("onDemandUpdateStatusChange=")
+			.append(onDemandUpdateStatusChange)
+			.append(", ")
+			.append("encoderName='")
+			.append(encoderName)
+			.append("', ")
+			.append("decoderName='")
+			.append(decoderName)
+			.append("', ")
+			.append("clientDataAccept='")
+			.append(clientDataAccept)
+			.append("', ")
+			.append("shouldUnregisterOnShutdown='")
+			.append(shouldUnregisterOnShutdown)
+			.append("shouldEnforceRegistrationAtInit='")
+			.append(shouldEnforceRegistrationAtInit)
+			.append("', ")
+			.append("order='")
+			.append(order)
+			.append("'}")
+			.toString();
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ package org.springframework.cloud.netflix.eureka;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;

-import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
@@ -36,6 +36,7 @@ import org.springframework.core.Ordered;
 *
 * @author Spencer Gibb
 * @author Tim Ysewyn
+ * @author Olga Maciaszek-Sharma
 */
 public class EurekaDiscoveryClient implements DiscoveryClient {

@@ -48,13 +49,7 @@ public class EurekaDiscoveryClient implements DiscoveryClient {

 	private final EurekaClientConfig clientConfig;

-	@Deprecated
-	public EurekaDiscoveryClient(EurekaInstanceConfig config, EurekaClient eurekaClient) {
-		this(eurekaClient, eurekaClient.getEurekaClientConfig());
-	}
-
-	public EurekaDiscoveryClient(EurekaClient eurekaClient,
-			EurekaClientConfig clientConfig) {
+	public EurekaDiscoveryClient(EurekaClient eurekaClient, EurekaClientConfig clientConfig) {
 		this.clientConfig = clientConfig;
 		this.eurekaClient = eurekaClient;
 	}
@@ -66,8 +61,7 @@ public class EurekaDiscoveryClient implements DiscoveryClient {

 	@Override
 	public List<ServiceInstance> getInstances(String serviceId) {
-		List<InstanceInfo> infos = this.eurekaClient.getInstancesByVipAddress(serviceId,
-				false);
+		List<InstanceInfo> infos = this.eurekaClient.getInstancesByVipAddress(serviceId, false);
 		List<ServiceInstance> instances = new ArrayList<>();
 		for (InstanceInfo info : infos) {
 			instances.add(new EurekaServiceInstance(info));
@@ -87,7 +81,7 @@ public class EurekaDiscoveryClient implements DiscoveryClient {
 			if (app.getInstances().isEmpty()) {
 				continue;
 			}
-			names.add(app.getName().toLowerCase());
+			names.add(app.getName().toLowerCase(Locale.ROOT));

 		}
 		return names;
@@ -95,8 +89,7 @@ public class EurekaDiscoveryClient implements DiscoveryClient {

 	@Override
 	public int getOrder() {
-		return clientConfig instanceof Ordered ? ((Ordered) clientConfig).getOrder()
-				: DiscoveryClient.DEFAULT_ORDER;
+		return clientConfig instanceof Ordered ? ((Ordered) clientConfig).getOrder() : DiscoveryClient.DEFAULT_ORDER;
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -51,27 +51,14 @@ import org.springframework.context.annotation.Configuration;
@ConditionalOnBlockingDiscoveryEnabled
 public class EurekaDiscoveryClientConfiguration {

-	/**
-	 * Deprecated in favor of auto configuration order.
-	 * @return Marker bean
-	 * @deprecated in favor of auto configuration order.
-	 */
-	@Deprecated
-	@Bean
-	public Marker eurekaDiscoverClientMarker() {
-		return new Marker();
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
-	public EurekaDiscoveryClient discoveryClient(EurekaClient client,
-			EurekaClientConfig clientConfig) {
+	public EurekaDiscoveryClient discoveryClient(EurekaClient client, EurekaClientConfig clientConfig) {
 		return new EurekaDiscoveryClient(client, clientConfig);
 	}

 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(value = "eureka.client.healthcheck.enabled",
-			matchIfMissing = false)
+	@ConditionalOnProperty(value = "eureka.client.healthcheck.enabled", matchIfMissing = false)
 	protected static class EurekaHealthCheckHandlerConfiguration {

 		@Autowired(required = false)
@@ -85,16 +72,6 @@ public class EurekaDiscoveryClientConfiguration {

 	}

-	/**
-	 * Deprecated in favor of auto configuration order.
-	 *
-	 * @deprecated in favor of auto configuration order.
-	 */
-	@Deprecated
-	class Marker {
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(RefreshScopeRefreshedEvent.class)
 	protected static class EurekaClientConfigurationRefresher
@@ -107,8 +84,9 @@ public class EurekaDiscoveryClientConfiguration {
 		private EurekaAutoServiceRegistration autoRegistration;

 		public void onApplicationEvent(RefreshScopeRefreshedEvent event) {
-			// This will force the creation of the EurkaClient bean if not already created
-			// to make sure the client will be reregistered after a refresh event
+			// This will force the creation of the EurekaClient bean if not already
+			// created
+			// to make sure the client will be re-registered after a refresh event
 			if (eurekaClient != null) {
 				eurekaClient.getApplications();
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,26 +17,33 @@
 package org.springframework.cloud.netflix.eureka;

 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;

 import com.netflix.appinfo.HealthCheckHandler;
 import com.netflix.appinfo.InstanceInfo;
+import com.netflix.appinfo.InstanceInfo.InstanceStatus;

 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.actuate.health.CompositeHealthContributor;
+import org.springframework.boot.actuate.health.CompositeReactiveHealthContributor;
 import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthContributor;
 import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.actuate.health.NamedContributor;
+import org.springframework.boot.actuate.health.ReactiveHealthContributor;
+import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
 import org.springframework.boot.actuate.health.Status;
 import org.springframework.boot.actuate.health.StatusAggregator;
 import org.springframework.cloud.client.discovery.health.DiscoveryCompositeHealthContributor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.Lifecycle;
+import org.springframework.core.Ordered;
 import org.springframework.util.Assert;

-import static com.netflix.appinfo.InstanceInfo.InstanceStatus;
-
 /**
 * A Eureka health checker, maps the application status into {@link InstanceStatus} that
 * will be propagated to Eureka registry.
@@ -45,28 +52,42 @@ import static com.netflix.appinfo.InstanceInfo.InstanceStatus;
 * {@link HealthCheckHandler}. By default this implementation will perform aggregation of
 * all registered {@link HealthIndicator} through registered {@link StatusAggregator}.
 *
+ * A {@code null} status is returned when the application context is closed (or in the
+ * process of being closed). This prevents Eureka from updating the health status and only
+ * consider the status present in the current InstanceInfo.
+ *
 * @author Jakub Narloch
 * @author Spencer Gibb
+ * @author Nowrin Anwar Joyita
+ * @author Bertrand Renuart
+ * @author Olga Maciaszek-Sharma
 * @see HealthCheckHandler
 * @see StatusAggregator
 */
 public class EurekaHealthCheckHandler
-		implements HealthCheckHandler, ApplicationContextAware, InitializingBean {
+		implements HealthCheckHandler, ApplicationContextAware, InitializingBean, Ordered, Lifecycle {

-	private static final Map<Status, InstanceInfo.InstanceStatus> STATUS_MAPPING = new HashMap<Status, InstanceInfo.InstanceStatus>() {
+	private static final Map<Status, InstanceInfo.InstanceStatus> STATUS_MAPPING = new HashMap<>() {
 		{
 			put(Status.UNKNOWN, InstanceStatus.UNKNOWN);
-			put(Status.OUT_OF_SERVICE, InstanceStatus.OUT_OF_SERVICE);
+			put(Status.OUT_OF_SERVICE, InstanceStatus.DOWN);
 			put(Status.DOWN, InstanceStatus.DOWN);
 			put(Status.UP, InstanceStatus.UP);
 		}
 	};

-	private StatusAggregator statusAggregator;
+	private final StatusAggregator statusAggregator;

 	private ApplicationContext applicationContext;

-	private Map<String, HealthIndicator> healthIndicators = new HashMap<>();
+	private final Map<String, HealthContributor> healthContributors = new HashMap<>();
+
+	/**
+	 * {@code true} until the context is stopped.
+	 */
+	private boolean running = true;
+
+	private final Map<String, ReactiveHealthContributor> reactiveHealthContributors = new HashMap<>();

 	public EurekaHealthCheckHandler(StatusAggregator statusAggregator) {
 		this.statusAggregator = statusAggregator;
@@ -75,43 +96,44 @@ public class EurekaHealthCheckHandler
 	}

 	@Override
-	public void setApplicationContext(ApplicationContext applicationContext)
-			throws BeansException {
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		this.applicationContext = applicationContext;
 	}

 	@Override
-	public void afterPropertiesSet() throws Exception {
-		final Map<String, HealthIndicator> healthIndicators = applicationContext
-				.getBeansOfType(HealthIndicator.class);
-
-		populateHealthIndicators(healthIndicators);
+	public void afterPropertiesSet() {
+		populateHealthContributors(applicationContext.getBeansOfType(HealthContributor.class));
+		reactiveHealthContributors.putAll(applicationContext.getBeansOfType(ReactiveHealthContributor.class));
 	}

-	void populateHealthIndicators(Map<String, HealthIndicator> healthIndicators) {
-		for (Map.Entry<String, HealthIndicator> entry : healthIndicators.entrySet()) {
+	void populateHealthContributors(Map<String, HealthContributor> healthContributors) {
+		for (Map.Entry<String, HealthContributor> entry : healthContributors.entrySet()) {
 			// ignore EurekaHealthIndicator and flatten the rest of the composite
 			// otherwise there is a never ending cycle of down. See gh-643
-			if (entry.getValue() instanceof DiscoveryCompositeHealthContributor) {
-				DiscoveryCompositeHealthContributor indicator = (DiscoveryCompositeHealthContributor) entry
-						.getValue();
-				indicator.forEach(contributor -> {
-					if (!(contributor
-							.getContributor() instanceof EurekaHealthIndicator)) {
-						this.healthIndicators.put(contributor.getName(),
-								(HealthIndicator) contributor.getContributor());
+			if (entry.getValue() instanceof DiscoveryCompositeHealthContributor indicator) {
+				indicator.getIndicators().forEach((name, discoveryHealthIndicator) -> {
+					if (!(discoveryHealthIndicator instanceof EurekaHealthIndicator)) {
+						this.healthContributors.put(name, (HealthIndicator) discoveryHealthIndicator::health);
 					}
 				});
 			}
 			else {
-				this.healthIndicators.put(entry.getKey(), entry.getValue());
+				this.healthContributors.put(entry.getKey(), entry.getValue());
 			}
 		}
 	}

 	@Override
 	public InstanceStatus getStatus(InstanceStatus instanceStatus) {
-		return getHealthStatus();
+		if (running) {
+			return getHealthStatus();
+		}
+		else {
+			// Return nothing if the context is not running, so the status held by the
+			// InstanceInfo remains unchanged.
+			// See gh-1571
+			return null;
+		}
 	}

 	protected InstanceStatus getHealthStatus() {
@@ -120,12 +142,39 @@ public class EurekaHealthCheckHandler
 	}

 	protected Status getStatus(StatusAggregator statusAggregator) {
-		Status status;
-		Set<Status> statusSet = healthIndicators.values().stream()
-				.map(HealthIndicator::health).map(Health::getStatus)
-				.collect(Collectors.toSet());
-		status = statusAggregator.getAggregateStatus(statusSet);
-		return status;
+		Set<Status> statusSet = new HashSet<>();
+		for (HealthContributor contributor : healthContributors.values()) {
+			processContributor(statusSet, contributor);
+		}
+		for (ReactiveHealthContributor contributor : reactiveHealthContributors.values()) {
+			processContributor(statusSet, contributor);
+		}
+		return statusAggregator.getAggregateStatus(statusSet);
+	}
+
+	private void processContributor(Set<Status> statusSet, HealthContributor contributor) {
+		if (contributor instanceof CompositeHealthContributor) {
+			for (NamedContributor<HealthContributor> contrib : (CompositeHealthContributor) contributor) {
+				processContributor(statusSet, contrib.getContributor());
+			}
+		}
+		else if (contributor instanceof HealthIndicator) {
+			statusSet.add(((HealthIndicator) contributor).health().getStatus());
+		}
+	}
+
+	private void processContributor(Set<Status> statusSet, ReactiveHealthContributor contributor) {
+		if (contributor instanceof CompositeReactiveHealthContributor) {
+			for (NamedContributor<ReactiveHealthContributor> contrib : (CompositeReactiveHealthContributor) contributor) {
+				processContributor(statusSet, contrib.getContributor());
+			}
+		}
+		else if (contributor instanceof ReactiveHealthIndicator) {
+			Health health = ((ReactiveHealthIndicator) contributor).health().block();
+			if (health != null) {
+				statusSet.add(health.getStatus());
+			}
+		}
 	}

 	protected InstanceStatus mapToInstanceStatus(Status status) {
@@ -135,4 +184,29 @@ public class EurekaHealthCheckHandler
 		return STATUS_MAPPING.get(status);
 	}

+	@Override
+	public int getOrder() {
+		// registered with a high order priority so the close() method is invoked early
+		// and *BEFORE* EurekaAutoServiceRegistration
+		// (must be in effect when the registration is closed and the eureka replication
+		// triggered -> health check handler is
+		// consulted at that moment)
+		return Ordered.HIGHEST_PRECEDENCE;
+	}
+
+	@Override
+	public void start() {
+		running = true;
+	}
+
+	@Override
+	public void stop() {
+		running = false;
+	}
+
+	@Override
+	public boolean isRunning() {
+		return true;
+	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -45,8 +45,8 @@ public class EurekaHealthIndicator implements DiscoveryHealthIndicator {

 	private final EurekaClientConfig clientConfig;

-	public EurekaHealthIndicator(EurekaClient eurekaClient,
-			EurekaInstanceConfig instanceConfig, EurekaClientConfig clientConfig) {
+	public EurekaHealthIndicator(EurekaClient eurekaClient, EurekaInstanceConfig instanceConfig,
+			EurekaClientConfig clientConfig) {
 		super();
 		this.eurekaClient = eurekaClient;
 		this.instanceConfig = instanceConfig;
@@ -62,8 +62,7 @@ public class EurekaHealthIndicator implements DiscoveryHealthIndicator {
 	public Health health() {
 		Builder builder = Health.unknown();
 		Status status = getStatus(builder);
-		return builder.status(status).withDetail("applications", getApplications())
-				.build();
+		return builder.status(status).withDetail("applications", getApplications()).build();
 	}

 	private Status getStatus(Builder builder) {
@@ -80,10 +79,8 @@ public class EurekaHealthIndicator implements DiscoveryHealthIndicator {
 			else if (lastFetch > clientConfig.getRegistryFetchIntervalSeconds() * 2000) {
 				status = new Status("UP",
 						"Eureka discovery client is reporting failures to connect to a Eureka server");
-				builder.withDetail("renewalPeriod",
-						instanceConfig.getLeaseRenewalIntervalInSeconds());
-				builder.withDetail("failCount",
-						lastFetch / clientConfig.getRegistryFetchIntervalSeconds());
+				builder.withDetail("renewalPeriod", instanceConfig.getLeaseRenewalIntervalInSeconds());
+				builder.withDetail("failCount", lastFetch / clientConfig.getRegistryFetchIntervalSeconds());
 			}
 		}

@@ -95,7 +92,7 @@ public class EurekaHealthIndicator implements DiscoveryHealthIndicator {
 		if (AopUtils.isAopProxy(eurekaClient)) {
 			discoveryClient = ProxyUtils.getTargetObject(eurekaClient);
 		}
-		else if (DiscoveryClient.class.isInstance(eurekaClient)) {
+		else if (eurekaClient instanceof DiscoveryClient) {
 			discoveryClient = (DiscoveryClient) eurekaClient;
 		}
 		return discoveryClient;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import com.netflix.appinfo.DataCenterInfo;
 import com.netflix.appinfo.InstanceInfo.InstanceStatus;
 import com.netflix.appinfo.MyDataCenterInfo;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.cloud.commons.util.InetUtils.HostInfo;
@@ -37,10 +38,10 @@ import org.springframework.util.StringUtils;
 * @author Spencer Gibb
 * @author Ryan Baxter
 * @author Gregor Zurowski
+ * @author Robert Bleyl
 */
@ConfigurationProperties("eureka.instance")
-public class EurekaInstanceConfigBean
-		implements CloudEurekaInstanceConfig, EnvironmentAware {
+public class EurekaInstanceConfigBean implements CloudEurekaInstanceConfig, EnvironmentAware {

 	private static final String UNKNOWN = "unknown";

@@ -156,8 +157,7 @@ public class EurekaInstanceConfigBean
 	 * Returns the data center this instance is deployed. This information is used to get
 	 * some AWS specific instance information if the instance is deployed in AWS.
 	 */
-	private DataCenterInfo dataCenterInfo = new MyDataCenterInfo(
-			DataCenterInfo.Name.MyOwn);
+	private DataCenterInfo dataCenterInfo = new MyDataCenterInfo(DataCenterInfo.Name.MyOwn);

 	/**
 	 * Get the IPAdress of the instance. This information is for academic purposes only as
@@ -266,10 +266,16 @@ public class EurekaInstanceConfigBean

 	/**
 	 * Flag to say that, when guessing a hostname, the IP address of the server should be
-	 * used in prference to the hostname reported by the OS.
+	 * used in preference to the hostname reported by the OS.
 	 */
 	private boolean preferIpAddress = false;

+	/**
+	 * If true the EurekaClient will be initialized asynchronously when the
+	 * InstanceRegistry bean is created.
+	 */
+	private boolean asyncClientInitialization;
+
 	/**
 	 * Initial status to register with remote Eureka server.
 	 */
@@ -287,6 +293,7 @@ public class EurekaInstanceConfigBean
 	private EurekaInstanceConfigBean() {
 	}

+	@Autowired
 	public EurekaInstanceConfigBean(InetUtils inetUtils) {
 		this.inetUtils = inetUtils;
 		this.hostInfo = this.inetUtils.findFirstNonLoopbackHostInfo();
@@ -331,8 +338,7 @@ public class EurekaInstanceConfigBean
 		this.environment = environment;
 		// set some defaults from the environment, but allow the defaults to use relaxed
 		// binding
-		String springAppName = this.environment.getProperty("spring.application.name",
-				"");
+		String springAppName = this.environment.getProperty("spring.application.name", "");
 		if (StringUtils.hasText(springAppName)) {
 			setAppname(springAppName);
 			setVirtualHostName(springAppName);
@@ -424,8 +430,7 @@ public class EurekaInstanceConfigBean
 		return leaseExpirationDurationInSeconds;
 	}

-	public void setLeaseExpirationDurationInSeconds(
-			int leaseExpirationDurationInSeconds) {
+	public void setLeaseExpirationDurationInSeconds(int leaseExpirationDurationInSeconds) {
 		this.leaseExpirationDurationInSeconds = leaseExpirationDurationInSeconds;
 	}

@@ -549,6 +554,14 @@ public class EurekaInstanceConfigBean
 		this.preferIpAddress = preferIpAddress;
 	}

+	public boolean isAsyncClientInitialization() {
+		return asyncClientInitialization;
+	}
+
+	public void setAsyncClientInitialization(boolean asyncClientInitialization) {
+		this.asyncClientInitialization = asyncClientInitialization;
+	}
+
 	public InstanceStatus getInitialStatus() {
 		return initialStatus;
 	}
@@ -578,23 +591,17 @@ public class EurekaInstanceConfigBean
 			return false;
 		}
 		EurekaInstanceConfigBean that = (EurekaInstanceConfigBean) o;
-		return Objects.equals(hostInfo, that.hostInfo)
-				&& Objects.equals(inetUtils, that.inetUtils)
-				&& Objects.equals(appname, that.appname)
-				&& Objects.equals(appGroupName, that.appGroupName)
-				&& instanceEnabledOnit == that.instanceEnabledOnit
-				&& nonSecurePort == that.nonSecurePort && securePort == that.securePort
-				&& nonSecurePortEnabled == that.nonSecurePortEnabled
+		return Objects.equals(hostInfo, that.hostInfo) && Objects.equals(inetUtils, that.inetUtils)
+				&& Objects.equals(appname, that.appname) && Objects.equals(appGroupName, that.appGroupName)
+				&& instanceEnabledOnit == that.instanceEnabledOnit && nonSecurePort == that.nonSecurePort
+				&& securePort == that.securePort && nonSecurePortEnabled == that.nonSecurePortEnabled
 				&& securePortEnabled == that.securePortEnabled
 				&& leaseRenewalIntervalInSeconds == that.leaseRenewalIntervalInSeconds
 				&& leaseExpirationDurationInSeconds == that.leaseExpirationDurationInSeconds
-				&& Objects.equals(virtualHostName, that.virtualHostName)
-				&& Objects.equals(instanceId, that.instanceId)
+				&& Objects.equals(virtualHostName, that.virtualHostName) && Objects.equals(instanceId, that.instanceId)
 				&& Objects.equals(secureVirtualHostName, that.secureVirtualHostName)
-				&& Objects.equals(aSGName, that.aSGName)
-				&& Objects.equals(metadataMap, that.metadataMap)
-				&& Objects.equals(dataCenterInfo, that.dataCenterInfo)
-				&& Objects.equals(ipAddress, that.ipAddress)
+				&& Objects.equals(aSGName, that.aSGName) && Objects.equals(metadataMap, that.metadataMap)
+				&& Objects.equals(dataCenterInfo, that.dataCenterInfo) && Objects.equals(ipAddress, that.ipAddress)
 				&& Objects.equals(statusPageUrlPath, that.statusPageUrlPath)
 				&& Objects.equals(statusPageUrl, that.statusPageUrl)
 				&& Objects.equals(homePageUrlPath, that.homePageUrlPath)
@@ -602,65 +609,123 @@ public class EurekaInstanceConfigBean
 				&& Objects.equals(healthCheckUrlPath, that.healthCheckUrlPath)
 				&& Objects.equals(healthCheckUrl, that.healthCheckUrl)
 				&& Objects.equals(secureHealthCheckUrl, that.secureHealthCheckUrl)
-				&& Objects.equals(namespace, that.namespace)
-				&& Objects.equals(hostname, that.hostname)
-				&& preferIpAddress == that.preferIpAddress
-				&& Objects.equals(initialStatus, that.initialStatus)
-				&& Arrays.equals(defaultAddressResolutionOrder,
-						that.defaultAddressResolutionOrder)
+				&& Objects.equals(namespace, that.namespace) && Objects.equals(hostname, that.hostname)
+				&& preferIpAddress == that.preferIpAddress && Objects.equals(initialStatus, that.initialStatus)
+				&& Arrays.equals(defaultAddressResolutionOrder, that.defaultAddressResolutionOrder)
+				&& asyncClientInitialization == that.asyncClientInitialization
 				&& Objects.equals(environment, that.environment);
 	}

 	@Override
 	public int hashCode() {
-		return Objects.hash(hostInfo, inetUtils, appname, appGroupName,
-				instanceEnabledOnit, nonSecurePort, securePort, nonSecurePortEnabled,
-				securePortEnabled, leaseRenewalIntervalInSeconds,
-				leaseExpirationDurationInSeconds, virtualHostName, instanceId,
-				secureVirtualHostName, aSGName, metadataMap, dataCenterInfo, ipAddress,
-				statusPageUrlPath, statusPageUrl, homePageUrlPath, homePageUrl,
-				healthCheckUrlPath, healthCheckUrl, secureHealthCheckUrl, namespace,
-				hostname, preferIpAddress, initialStatus, defaultAddressResolutionOrder,
-				environment);
+		return Objects.hash(hostInfo, inetUtils, appname, appGroupName, instanceEnabledOnit, nonSecurePort, securePort,
+				nonSecurePortEnabled, securePortEnabled, leaseRenewalIntervalInSeconds,
+				leaseExpirationDurationInSeconds, virtualHostName, instanceId, secureVirtualHostName, aSGName,
+				metadataMap, dataCenterInfo, ipAddress, statusPageUrlPath, statusPageUrl, homePageUrlPath, homePageUrl,
+				healthCheckUrlPath, healthCheckUrl, secureHealthCheckUrl, namespace, hostname, preferIpAddress,
+				asyncClientInitialization, initialStatus, Arrays.hashCode(defaultAddressResolutionOrder), environment);
 	}

 	@Override
 	public String toString() {
 		return new StringBuilder("EurekaInstanceConfigBean{").append("hostInfo=")
-				.append(hostInfo).append(", ").append("inetUtils=").append(inetUtils)
-				.append(", ").append("appname='").append(appname).append("', ")
-				.append("appGroupName='").append(appGroupName).append("', ")
-				.append("instanceEnabledOnit=").append(instanceEnabledOnit).append(", ")
-				.append("nonSecurePort=").append(nonSecurePort).append(", ")
-				.append("securePort=").append(securePort).append(", ")
-				.append("nonSecurePortEnabled=").append(nonSecurePortEnabled).append(", ")
-				.append("securePortEnabled=").append(securePortEnabled).append(", ")
-				.append("leaseRenewalIntervalInSeconds=")
-				.append(leaseRenewalIntervalInSeconds).append(", ")
-				.append("leaseExpirationDurationInSeconds=")
-				.append(leaseExpirationDurationInSeconds).append(", ")
-				.append("virtualHostName='").append(virtualHostName).append("', ")
-				.append("instanceId='").append(instanceId).append("', ")
-				.append("secureVirtualHostName='").append(secureVirtualHostName)
-				.append("', ").append("aSGName='").append(aSGName).append("', ")
-				.append("metadataMap=").append(metadataMap).append(", ")
-				.append("dataCenterInfo=").append(dataCenterInfo).append(", ")
-				.append("ipAddress='").append(ipAddress).append("', ")
-				.append("statusPageUrlPath='").append(statusPageUrlPath).append("', ")
-				.append("statusPageUrl='").append(statusPageUrl).append("', ")
-				.append("homePageUrlPath='").append(homePageUrlPath).append("', ")
-				.append("homePageUrl='").append(homePageUrl).append("', ")
-				.append("healthCheckUrlPath='").append(healthCheckUrlPath).append("', ")
-				.append("healthCheckUrl='").append(healthCheckUrl).append("', ")
-				.append("secureHealthCheckUrl='").append(secureHealthCheckUrl)
-				.append("', ").append("namespace='").append(namespace).append("', ")
-				.append("hostname='").append(hostname).append("', ")
-				.append("preferIpAddress=").append(preferIpAddress).append(", ")
-				.append("initialStatus=").append(initialStatus).append(", ")
-				.append("defaultAddressResolutionOrder=")
-				.append(Arrays.toString(defaultAddressResolutionOrder)).append(", ")
-				.append("environment=").append(environment).append(", ").append("}")
-				.toString();
+			.append(hostInfo)
+			.append(", ")
+			.append("inetUtils=")
+			.append(inetUtils)
+			.append(", ")
+			.append("appname='")
+			.append(appname)
+			.append("', ")
+			.append("appGroupName='")
+			.append(appGroupName)
+			.append("', ")
+			.append("instanceEnabledOnit=")
+			.append(instanceEnabledOnit)
+			.append(", ")
+			.append("nonSecurePort=")
+			.append(nonSecurePort)
+			.append(", ")
+			.append("securePort=")
+			.append(securePort)
+			.append(", ")
+			.append("nonSecurePortEnabled=")
+			.append(nonSecurePortEnabled)
+			.append(", ")
+			.append("securePortEnabled=")
+			.append(securePortEnabled)
+			.append(", ")
+			.append("leaseRenewalIntervalInSeconds=")
+			.append(leaseRenewalIntervalInSeconds)
+			.append(", ")
+			.append("leaseExpirationDurationInSeconds=")
+			.append(leaseExpirationDurationInSeconds)
+			.append(", ")
+			.append("virtualHostName='")
+			.append(virtualHostName)
+			.append("', ")
+			.append("instanceId='")
+			.append(instanceId)
+			.append("', ")
+			.append("secureVirtualHostName='")
+			.append(secureVirtualHostName)
+			.append("', ")
+			.append("aSGName='")
+			.append(aSGName)
+			.append("', ")
+			.append("metadataMap=")
+			.append(metadataMap)
+			.append(", ")
+			.append("dataCenterInfo=")
+			.append(dataCenterInfo)
+			.append(", ")
+			.append("ipAddress='")
+			.append(ipAddress)
+			.append("', ")
+			.append("statusPageUrlPath='")
+			.append(statusPageUrlPath)
+			.append("', ")
+			.append("statusPageUrl='")
+			.append(statusPageUrl)
+			.append("', ")
+			.append("homePageUrlPath='")
+			.append(homePageUrlPath)
+			.append("', ")
+			.append("homePageUrl='")
+			.append(homePageUrl)
+			.append("', ")
+			.append("healthCheckUrlPath='")
+			.append(healthCheckUrlPath)
+			.append("', ")
+			.append("healthCheckUrl='")
+			.append(healthCheckUrl)
+			.append("', ")
+			.append("secureHealthCheckUrl='")
+			.append(secureHealthCheckUrl)
+			.append("', ")
+			.append("namespace='")
+			.append(namespace)
+			.append("', ")
+			.append("hostname='")
+			.append(hostname)
+			.append("', ")
+			.append("asyncClientInitialization=")
+			.append(asyncClientInitialization)
+			.append(", ")
+			.append("preferIpAddress=")
+			.append(preferIpAddress)
+			.append(", ")
+			.append("initialStatus=")
+			.append(initialStatus)
+			.append(", ")
+			.append("defaultAddressResolutionOrder=")
+			.append(Arrays.toString(defaultAddressResolutionOrder))
+			.append(", ")
+			.append("environment=")
+			.append(environment)
+			.append(", ")
+			.append("}")
+			.toString();
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ import static com.netflix.appinfo.InstanceInfo.PortType.SECURE;
 */
 public class EurekaServiceInstance implements ServiceInstance {

-	private InstanceInfo instance;
+	private final InstanceInfo instance;

 	public EurekaServiceInstance(InstanceInfo instance) {
 		Assert.notNull(instance, "Service instance required");
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -35,8 +35,8 @@ public class InstanceInfoFactory {

 	public InstanceInfo create(EurekaInstanceConfig config) {
 		LeaseInfo.Builder leaseInfoBuilder = LeaseInfo.Builder.newBuilder()
-				.setRenewalIntervalInSecs(config.getLeaseRenewalIntervalInSeconds())
-				.setDurationInSecs(config.getLeaseExpirationDurationInSeconds());
+			.setRenewalIntervalInSecs(config.getLeaseRenewalIntervalInSeconds())
+			.setDurationInSecs(config.getLeaseExpirationDurationInSeconds());

 		// Builder the instance information to be registered with eureka
 		// server
@@ -46,24 +46,24 @@ public class InstanceInfoFactory {
 		if (!namespace.endsWith(".")) {
 			namespace = namespace + ".";
 		}
-		builder.setNamespace(namespace).setAppName(config.getAppname())
-				.setInstanceId(config.getInstanceId())
-				.setAppGroupName(config.getAppGroupName())
-				.setDataCenterInfo(config.getDataCenterInfo())
-				.setIPAddr(config.getIpAddress()).setHostName(config.getHostName(false))
-				.setPort(config.getNonSecurePort())
-				.enablePort(InstanceInfo.PortType.UNSECURE,
-						config.isNonSecurePortEnabled())
-				.setSecurePort(config.getSecurePort())
-				.enablePort(InstanceInfo.PortType.SECURE, config.getSecurePortEnabled())
-				.setVIPAddress(config.getVirtualHostName())
-				.setSecureVIPAddress(config.getSecureVirtualHostName())
-				.setHomePageUrl(config.getHomePageUrlPath(), config.getHomePageUrl())
-				.setStatusPageUrl(config.getStatusPageUrlPath(),
-						config.getStatusPageUrl())
-				.setHealthCheckUrls(config.getHealthCheckUrlPath(),
-						config.getHealthCheckUrl(), config.getSecureHealthCheckUrl())
-				.setASGName(config.getASGName());
+		builder.setNamespace(namespace)
+			.setAppName(config.getAppname())
+			.setInstanceId(config.getInstanceId())
+			.setAppGroupName(config.getAppGroupName())
+			.setDataCenterInfo(config.getDataCenterInfo())
+			.setIPAddr(config.getIpAddress())
+			.setHostName(config.getHostName(false))
+			.setPort(config.getNonSecurePort())
+			.enablePort(InstanceInfo.PortType.UNSECURE, config.isNonSecurePortEnabled())
+			.setSecurePort(config.getSecurePort())
+			.enablePort(InstanceInfo.PortType.SECURE, config.getSecurePortEnabled())
+			.setVIPAddress(config.getVirtualHostName())
+			.setSecureVIPAddress(config.getSecureVirtualHostName())
+			.setHomePageUrl(config.getHomePageUrlPath(), config.getHomePageUrl())
+			.setStatusPageUrl(config.getStatusPageUrlPath(), config.getStatusPageUrl())
+			.setHealthCheckUrls(config.getHealthCheckUrlPath(), config.getHealthCheckUrl(),
+					config.getSecureHealthCheckUrl())
+			.setASGName(config.getASGName());

 		// Start off with the STARTING state to avoid traffic
 		if (!config.isInstanceEnabledOnit()) {
@@ -75,8 +75,7 @@ public class InstanceInfoFactory {
 		}
 		else {
 			if (log.isInfoEnabled()) {
-				log.info("Setting initial instance status as: "
-						+ InstanceInfo.InstanceStatus.UP
+				log.info("Setting initial instance status as: " + InstanceInfo.InstanceStatus.UP
 						+ ". This may be too early for the instance to advertise itself as available. "
 						+ "You would instead want to control this via a healthcheck handler.");
 			}
@@ -1,43 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.util.Collection;
-import java.util.LinkedHashSet;
-
-import com.netflix.discovery.DiscoveryClient.DiscoveryClientOptionalArgs;
-import com.sun.jersey.api.client.filter.ClientFilter;
-
-/**
- * @author Dave Syer
- */
-public class MutableDiscoveryClientOptionalArgs extends DiscoveryClientOptionalArgs {
-
-	private Collection<ClientFilter> additionalFilters;
-
-	@Override
-	public void setAdditionalFilters(Collection<ClientFilter> additionalFilters) {
-		additionalFilters = new LinkedHashSet<>(additionalFilters);
-		this.additionalFilters = additionalFilters;
-		super.setAdditionalFilters(additionalFilters);
-	}
-
-	public Collection<ClientFilter> getAdditionalFilters() {
-		return this.additionalFilters;
-	}
-
-}
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2013-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.util.Objects;
+
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.http.io.SocketConfig;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateEurekaHttpClient;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * Properties for configuring timeouts used in {@link RestTemplate} required by
+ * {@link RestTemplateEurekaHttpClient}.
+ *
+ * @author Jiwon Jeon
+ * @author Mooyong Lee
+ * @since 3.1.6
+ */
+@ConfigurationProperties("eureka.client.rest-template-timeout")
+public class RestTemplateTimeoutProperties {
+
+	/**
+	 * Default values are set to 180000, in keeping with {@link RequestConfig} and
+	 * {@link SocketConfig} defaults.
+	 */
+	private int connectTimeout = 180000; // 3 * MINUTES
+
+	private int connectRequestTimeout = 180000; // 3 * MINUTES
+
+	private int socketTimeout = 180000; // 3 * MINUTES
+
+	public int getConnectTimeout() {
+		return connectTimeout;
+	}
+
+	public int getConnectRequestTimeout() {
+		return connectRequestTimeout;
+	}
+
+	public int getSocketTimeout() {
+		return socketTimeout;
+	}
+
+	public void setConnectTimeout(int connectTimeout) {
+		this.connectTimeout = connectTimeout;
+	}
+
+	public void setConnectRequestTimeout(int connectRequestTimeout) {
+		this.connectRequestTimeout = connectRequestTimeout;
+	}
+
+	public void setSocketTimeout(int socketTimeout) {
+		this.socketTimeout = socketTimeout;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		RestTemplateTimeoutProperties that = (RestTemplateTimeoutProperties) o;
+
+		return connectTimeout == that.connectTimeout && connectRequestTimeout == that.connectRequestTimeout
+				&& socketTimeout == that.socketTimeout;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(connectTimeout, connectRequestTimeout, socketTimeout);
+	}
+
+	@Override
+	public String toString() {
+		return "RestTemplateTimeoutProperties{" + ", connectTimeout=" + connectTimeout + ", connectRequestTimeout="
+				+ connectRequestTimeout + ", socketTimeout=" + socketTimeout + '}';
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,76 +16,190 @@

 package org.springframework.cloud.netflix.eureka.config;

+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
 import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
+import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
-import org.springframework.cloud.netflix.eureka.MutableDiscoveryClientOptionalArgs;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.configuration.SSLContextFactory;
+import org.springframework.cloud.configuration.TlsProperties;
+import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties;
+import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier;
+import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier;
 import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories;
 import org.springframework.cloud.netflix.eureka.http.WebClientDiscoveryClientOptionalArgs;
+import org.springframework.cloud.netflix.eureka.http.WebClientTransportClientFactories;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.client.WebClient;

 /**
 * @author Daniel Lavoie
+ * @author Armin Krezovic
+ * @author Olga Maciaszek-Sharma
 */
@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties(RestTemplateTimeoutProperties.class)
 public class DiscoveryClientOptionalArgsConfiguration {

-	protected final Log logger = LogFactory.getLog(getClass());
+	protected static final Log logger = LogFactory.getLog(DiscoveryClientOptionalArgsConfiguration.class);
+
+	@Bean
+	@ConfigurationProperties("eureka.client.tls")
+	public TlsProperties tlsProperties() {
+		return new TlsProperties();
+	}

 	@Bean
 	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
-	@ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter")
-	@ConditionalOnMissingBean(value = { AbstractDiscoveryClientOptionalArgs.class },
-			search = SearchStrategy.CURRENT)
-	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled",
-			matchIfMissing = true, havingValue = "false")
-	public RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs() {
+	@Conditional(JerseyClientNotPresentOrNotEnabledCondition.class)
+	@ConditionalOnMissingBean(value = { AbstractDiscoveryClientOptionalArgs.class }, search = SearchStrategy.CURRENT)
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", matchIfMissing = true,
+			havingValue = "false")
+	public RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs(TlsProperties tlsProperties,
+			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier,
+			ObjectProvider<RestTemplateBuilder> restTemplateBuilders) throws GeneralSecurityException, IOException {
 		logger.info("Eureka HTTP Client uses RestTemplate.");
-		return new RestTemplateDiscoveryClientOptionalArgs();
+		RestTemplateDiscoveryClientOptionalArgs result = new RestTemplateDiscoveryClientOptionalArgs(
+				eurekaClientHttpRequestFactorySupplier, restTemplateBuilders::getIfAvailable);
+		setupTLS(result, tlsProperties);
+		return result;
 	}

 	@Bean
-	@ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter")
-	@ConditionalOnClass(
-			name = "org.springframework.web.reactive.function.client.WebClient")
-	@ConditionalOnMissingBean(
-			value = { AbstractDiscoveryClientOptionalArgs.class,
-					RestTemplateDiscoveryClientOptionalArgs.class },
-			search = SearchStrategy.CURRENT)
-	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled",
-			havingValue = "true")
-	public WebClientDiscoveryClientOptionalArgs webClientDiscoveryClientOptionalArgs() {
-		logger.info("Eureka HTTP Client uses WebClient.");
-		return new WebClientDiscoveryClientOptionalArgs();
+	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
+	@Conditional(JerseyClientNotPresentOrNotEnabledCondition.class)
+	@ConditionalOnMissingBean(value = { TransportClientFactories.class }, search = SearchStrategy.CURRENT)
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", matchIfMissing = true,
+			havingValue = "false")
+	public RestTemplateTransportClientFactories restTemplateTransportClientFactories(
+			RestTemplateDiscoveryClientOptionalArgs optionalArgs) {
+		return new RestTemplateTransportClientFactories(optionalArgs);
 	}

 	@Bean
-	@ConditionalOnClass(name = "com.sun.jersey.api.client.filter.ClientFilter")
-	@ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class,
-			search = SearchStrategy.CURRENT)
-	public MutableDiscoveryClientOptionalArgs discoveryClientOptionalArgs() {
-		logger.info("Eureka Client uses Jersey");
-		return new MutableDiscoveryClientOptionalArgs();
+	@ConditionalOnMissingBean
+	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
+	EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier(
+			RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
+		return new DefaultEurekaClientHttpRequestFactorySupplier(restTemplateTimeoutProperties);
+	}
+
+	private static void setupTLS(AbstractDiscoveryClientOptionalArgs<?> args, TlsProperties properties)
+			throws GeneralSecurityException, IOException {
+		if (properties.isEnabled()) {
+			SSLContextFactory factory = new SSLContextFactory(properties);
+			args.setSSLContext(factory.createSSLContext());
+		}
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@Conditional(JerseyClientPresentAndEnabledCondition.class)
+	@ConditionalOnBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT)
+	static class DiscoveryClientOptionalArgsTlsConfiguration {
+
+		DiscoveryClientOptionalArgsTlsConfiguration(TlsProperties tlsProperties,
+				AbstractDiscoveryClientOptionalArgs optionalArgs) throws GeneralSecurityException, IOException {
+			logger.info("Eureka HTTP Client uses Jersey");
+			setupTLS(optionalArgs, tlsProperties);
+		}
+
+	}
+
+	@Conditional(JerseyClientNotPresentOrNotEnabledCondition.class)
+	@ConditionalOnClass(name = "org.springframework.web.reactive.function.client.WebClient")
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", havingValue = "true")
+	protected static class WebClientConfiguration {
+
+		@Autowired
+		private TlsProperties tlsProperties;
+
+		@Bean
+		@ConditionalOnMissingBean(
+				value = { AbstractDiscoveryClientOptionalArgs.class, RestTemplateDiscoveryClientOptionalArgs.class },
+				search = SearchStrategy.CURRENT)
+		public WebClientDiscoveryClientOptionalArgs webClientDiscoveryClientOptionalArgs(
+				ObjectProvider<WebClient.Builder> builder) throws GeneralSecurityException, IOException {
+			logger.info("Eureka HTTP Client uses WebClient.");
+			WebClientDiscoveryClientOptionalArgs result = new WebClientDiscoveryClientOptionalArgs(
+					builder::getIfAvailable);
+			setupTLS(result, tlsProperties);
+			return result;
+		}
+
+		@Bean
+		@ConditionalOnMissingBean(value = TransportClientFactories.class, search = SearchStrategy.CURRENT)
+		public WebClientTransportClientFactories webClientTransportClientFactories(
+				ObjectProvider<WebClient.Builder> builder) {
+			return new WebClientTransportClientFactories(builder::getIfAvailable);
+		}
+
 	}

 	@Configuration
-	@ConditionalOnMissingClass({ "com.sun.jersey.api.client.filter.ClientFilter",
-			"org.springframework.web.reactive.function.client.WebClient" })
-	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled",
-			havingValue = "true")
+	@Conditional(JerseyClientNotPresentOrNotEnabledCondition.class)
+	@ConditionalOnMissingClass("org.springframework.web.reactive.function.client.WebClient")
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", havingValue = "true")
 	protected static class WebClientNotFoundConfiguration {

 		public WebClientNotFoundConfiguration() {
-			throw new IllegalStateException("eureka.client.webclient.enabled is true, "
-					+ "but WebClient is not on the classpath. Please add "
-					+ "spring-boot-starter-webflux as a dependency.");
+			throw new IllegalStateException(
+					"eureka.client.webclient.enabled is true, " + "but WebClient is not on the classpath. Please add "
+							+ "spring-boot-starter-webflux as a dependency.");
+		}
+
+	}
+
+	static class JerseyClientPresentAndEnabledCondition extends AllNestedConditions {
+
+		JerseyClientPresentAndEnabledCondition() {
+			super(ConfigurationPhase.REGISTER_BEAN);
+		}
+
+		@ConditionalOnClass(name = "org.glassfish.jersey.client.JerseyClient")
+		static class OnJerseyClientPresent {
+
+		}
+
+		@ConditionalOnProperty(value = "eureka.client.jersey.enabled", matchIfMissing = true)
+		static class OnJerseyClientEnabled {
+
+		}
+
+	}
+
+	static class JerseyClientNotPresentOrNotEnabledCondition extends AnyNestedCondition {
+
+		JerseyClientNotPresentOrNotEnabledCondition() {
+			super(ConfigurationPhase.REGISTER_BEAN);
+		}
+
+		@ConditionalOnMissingClass("org.glassfish.jersey.client.JerseyClient")
+		static class OnJerseyClientMissing {
+
+		}
+
+		@ConditionalOnProperty(value = "eureka.client.jersey.enabled", havingValue = "false")
+		static class OnJerseyClientDisabled {
+
 		}

 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,17 +16,16 @@

 package org.springframework.cloud.netflix.eureka.config;

-import javax.annotation.PostConstruct;
-
 import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.discovery.EurekaClient;
+import jakarta.annotation.PostConstruct;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.config.server.config.ConfigServerProperties;
 import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;

 /**
@@ -36,24 +35,23 @@ import org.springframework.util.StringUtils;
 */
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
-@ConditionalOnClass({ EurekaInstanceConfigBean.class, EurekaClient.class,
-		ConfigServerProperties.class })
+@ConditionalOnClass(value = { EurekaInstanceConfigBean.class, EurekaClient.class },
+		name = "org.springframework.cloud.config.server.config.ConfigServerProperties")
 public class EurekaClientConfigServerAutoConfiguration {

 	@Autowired(required = false)
 	private EurekaInstanceConfig instance;

-	@Autowired(required = false)
-	private ConfigServerProperties server;
+	@Autowired
+	private Environment env;

 	@PostConstruct
 	public void init() {
-		if (this.instance == null || this.server == null) {
+		if (this.instance == null) {
 			return;
 		}
-		String prefix = this.server.getPrefix();
-		if (StringUtils.hasText(prefix) && !StringUtils
-				.hasText(this.instance.getMetadataMap().get("configPath"))) {
+		String prefix = this.env.getProperty("spring.cloud.config.server.prefix");
+		if (StringUtils.hasText(prefix) && !StringUtils.hasText(this.instance.getMetadataMap().get("configPath"))) {
 			this.instance.getMetadataMap().put("configPath", prefix);
 		}
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,156 +16,113 @@

 package org.springframework.cloud.netflix.eureka.config;

-import java.util.ArrayList;
-import java.util.List;
-
-import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.endpoint.EndpointUtils;
-import com.netflix.discovery.shared.Applications;
-import com.netflix.discovery.shared.resolver.DefaultEndpoint;
 import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import com.netflix.discovery.shared.transport.EurekaHttpResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;

+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
+import org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
 import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
+import org.springframework.cloud.configuration.TlsProperties;
 import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-import org.springframework.cloud.netflix.eureka.EurekaServiceInstance;
+import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties;
+import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier;
+import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier;
 import org.springframework.cloud.netflix.eureka.http.RestTemplateEurekaHttpClient;
 import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactory;
 import org.springframework.cloud.netflix.eureka.http.WebClientEurekaHttpClient;
 import org.springframework.cloud.netflix.eureka.http.WebClientTransportClientFactory;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
-import org.springframework.http.HttpStatus;
-import org.springframework.util.StringUtils;
+import org.springframework.lang.Nullable;
+import org.springframework.web.reactive.function.client.WebClient;

 /**
 * Bootstrap configuration for config client that wants to lookup the config server via
 * discovery.
 *
 * @author Dave Syer
+ * @author Armin Krezovic
 */
@ConditionalOnClass(ConfigServicePropertySourceLocator.class)
-@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled",
-		matchIfMissing = false)
+@Conditional(EurekaConfigServerBootstrapConfiguration.EurekaConfigServerBootstrapCondition.class)
@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
+@EnableConfigurationProperties(RestTemplateTimeoutProperties.class)
 public class EurekaConfigServerBootstrapConfiguration {

-	private static final Log log = LogFactory
-			.getLog(EurekaConfigServerBootstrapConfiguration.class);
-
 	@Bean
-	@ConditionalOnMissingBean(value = EurekaClientConfig.class,
-			search = SearchStrategy.CURRENT)
+	@ConditionalOnMissingBean(value = EurekaClientConfig.class, search = SearchStrategy.CURRENT)
 	public EurekaClientConfigBean eurekaClientConfigBean() {
 		return new EurekaClientConfigBean();
 	}

 	@Bean
 	@ConditionalOnMissingBean(EurekaHttpClient.class)
-	@ConditionalOnClass(
-			name = "org.springframework.web.reactive.function.client.WebClient")
-	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled",
-			havingValue = "true")
-	public WebClientEurekaHttpClient configDiscoveryWebClientEurekaHttpClient(
-			EurekaClientConfigBean config, Environment env) {
-		return (WebClientEurekaHttpClient) new WebClientTransportClientFactory()
-				.newClient(new DefaultEndpoint(getEurekaUrl(config, env)));
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", matchIfMissing = true,
+			havingValue = "false")
+	public RestTemplateEurekaHttpClient configDiscoveryRestTemplateEurekaHttpClient(EurekaClientConfigBean config,
+			Environment env, @Nullable TlsProperties properties,
+			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier,
+			ObjectProvider<RestTemplateBuilder> restTemplateBuilders) {
+		return (RestTemplateEurekaHttpClient) new RestTemplateTransportClientFactory(properties,
+				eurekaClientHttpRequestFactorySupplier, restTemplateBuilders::getIfAvailable)
+			.newClient(HostnameBasedUrlRandomizer.randomEndpoint(config, env));
 	}

 	@Bean
-	@ConditionalOnMissingBean(EurekaHttpClient.class)
-	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled",
-			matchIfMissing = true, havingValue = "false")
-	public RestTemplateEurekaHttpClient configDiscoveryRestTemplateEurekaHttpClient(
-			EurekaClientConfigBean config, Environment env) {
-		return (RestTemplateEurekaHttpClient) new RestTemplateTransportClientFactory()
-				.newClient(new DefaultEndpoint(getEurekaUrl(config, env)));
-	}
-
-	private String getEurekaUrl(EurekaClientConfigBean config, Environment env) {
-		List<String> urls = EndpointUtils.getDiscoveryServiceUrls(config,
-				EurekaClientConfigBean.DEFAULT_ZONE, new HostnameBasedUrlRandomizer(
-						env.getProperty("eureka.instance.hostname")));
-		return urls.get(0);
-	}
-
-	private boolean isSuccessful(EurekaHttpResponse<Applications> response) {
-		HttpStatus httpStatus = HttpStatus.resolve(response.getStatusCode());
-		return httpStatus != null && httpStatus.is2xxSuccessful();
+	@ConditionalOnMissingBean
+	EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier(
+			RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
+		return new DefaultEurekaClientHttpRequestFactorySupplier(restTemplateTimeoutProperties);
 	}

 	@Bean
-	public ConfigServerInstanceProvider.Function eurekaConfigServerInstanceProvider(
-			EurekaHttpClient client, EurekaClientConfig config) {
-
-		return serviceId -> {
-			if (log.isDebugEnabled()) {
-				log.debug("eurekaConfigServerInstanceProvider finding instances for "
-						+ serviceId);
-			}
-			EurekaHttpResponse<Applications> response = client
-					.getApplications(config.getRegion());
-			List<ServiceInstance> instances = new ArrayList<>();
-			if (!isSuccessful(response) || response.getEntity() == null) {
-				return instances;
-			}
-
-			Applications applications = response.getEntity();
-			applications.shuffleInstances(config.shouldFilterOnlyUpInstances());
-			List<InstanceInfo> infos = applications
-					.getInstancesByVirtualHostName(serviceId);
-			for (InstanceInfo info : infos) {
-				instances.add(new EurekaServiceInstance(info));
-			}
-			if (log.isDebugEnabled()) {
-				log.debug("eurekaConfigServerInstanceProvider found " + infos.size()
-						+ " instance(s) for " + serviceId + ", " + instances);
-			}
-			return instances;
-		};
+	public ConfigServerInstanceProvider.Function eurekaConfigServerInstanceProvider(EurekaHttpClient client,
+			EurekaClientConfig config) {
+		return new EurekaConfigServerInstanceProvider(client, config)::getInstances;
 	}

-	private static final class HostnameBasedUrlRandomizer
-			implements EndpointUtils.ServiceUrlRandomizer {
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(name = "org.springframework.web.reactive.function.client.WebClient")
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", havingValue = "true")
+	@ImportAutoConfiguration({ CodecsAutoConfiguration.class, WebClientAutoConfiguration.class })
+	protected static class WebClientConfiguration {

-		private final String hostname;
-
-		private HostnameBasedUrlRandomizer(String hostname) {
-			this.hostname = hostname;
+		@Bean
+		@ConditionalOnMissingBean(EurekaHttpClient.class)
+		public WebClientEurekaHttpClient configDiscoveryWebClientEurekaHttpClient(EurekaClientConfigBean config,
+				ObjectProvider<WebClient.Builder> builder, Environment env) {
+			return (WebClientEurekaHttpClient) new WebClientTransportClientFactory(builder::getIfAvailable)
+				.newClient(HostnameBasedUrlRandomizer.randomEndpoint(config, env));
 		}

-		@Override
-		public void randomize(List<String> urlList) {
-			int listSize = 0;
-			if (urlList != null) {
-				listSize = urlList.size();
-			}
-			if (!StringUtils.hasText(hostname) || listSize == 0) {
-				return;
-			}
-			// Find the hashcode of the instance hostname and use it to find an entry
-			// and then arrange the rest of the entries after this entry.
-			int instanceHashcode = hostname.hashCode();
-			if (instanceHashcode < 0) {
-				instanceHashcode = instanceHashcode * -1;
-			}
-			int backupInstance = instanceHashcode % listSize;
-			for (int i = 0; i < backupInstance; i++) {
-				String zone = urlList.remove(0);
-				urlList.add(zone);
-			}
+	}
+
+	static class EurekaConfigServerBootstrapCondition extends AllNestedConditions {
+
+		EurekaConfigServerBootstrapCondition() {
+			super(ConfigurationPhase.REGISTER_BEAN);
+		}
+
+		@ConditionalOnProperty("spring.cloud.config.discovery.enabled")
+		static class OnCloudConfigProperty {
+
+		}
+
+		@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
+		static class OnEurekaClient {
+
 		}

 	}
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka.config;
+
+import java.util.Collections;
+
+import com.netflix.discovery.shared.transport.EurekaHttpClient;
+
+import org.springframework.boot.BootstrapContext;
+import org.springframework.boot.BootstrapRegistry;
+import org.springframework.boot.BootstrapRegistryInitializer;
+import org.springframework.boot.context.properties.bind.BindHandler;
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.cloud.config.client.ConfigClientProperties;
+import org.springframework.cloud.config.client.ConfigServerConfigDataLocationResolver.PropertyResolver;
+import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
+import org.springframework.cloud.configuration.TlsProperties;
+import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
+import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier;
+import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactory;
+import org.springframework.util.ClassUtils;
+
+public class EurekaConfigServerBootstrapper implements BootstrapRegistryInitializer {
+
+	@Override
+	public void initialize(BootstrapRegistry registry) {
+		if (!ClassUtils.isPresent("org.springframework.cloud.config.client.ConfigServerInstanceProvider", null)) {
+			return;
+		}
+
+		registry.registerIfAbsent(EurekaClientConfigBean.class, context -> {
+			if (!getDiscoveryEnabled(context)) {
+				return null;
+			}
+			PropertyResolver propertyResolver = getPropertyResolver(context);
+			return propertyResolver.resolveConfigurationProperties(EurekaClientConfigBean.PREFIX,
+					EurekaClientConfigBean.class, EurekaClientConfigBean::new);
+		});
+
+		registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, context -> {
+			if (!getDiscoveryEnabled(context)) {
+				return (id) -> Collections.emptyList();
+			}
+			EurekaClientConfigBean config = context.get(EurekaClientConfigBean.class);
+			EurekaHttpClient httpClient = new RestTemplateTransportClientFactory(
+					context.getOrElse(TlsProperties.class, null),
+					context.getOrElse(EurekaClientHttpRequestFactorySupplier.class,
+							new DefaultEurekaClientHttpRequestFactorySupplier()))
+				.newClient(HostnameBasedUrlRandomizer.randomEndpoint(config, getPropertyResolver(context)));
+			return new EurekaConfigServerInstanceProvider(httpClient, config)::getInstances;
+		});
+	}
+
+	private static PropertyResolver getPropertyResolver(BootstrapContext context) {
+		return context.getOrElseSupply(PropertyResolver.class,
+				() -> new PropertyResolver(context.get(Binder.class), context.getOrElse(BindHandler.class, null)));
+	}
+
+	public static Boolean getDiscoveryEnabled(BootstrapContext bootstrapContext) {
+		PropertyResolver propertyResolver = getPropertyResolver(bootstrapContext);
+		return propertyResolver.get(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class, false)
+				&& propertyResolver.get("eureka.client.enabled", Boolean.class, true)
+				&& propertyResolver.get("spring.cloud.discovery.enabled", Boolean.class, true);
+	}
+
+}
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.shared.Applications;
+import com.netflix.discovery.shared.transport.EurekaHttpClient;
+import com.netflix.discovery.shared.transport.EurekaHttpResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.netflix.eureka.EurekaServiceInstance;
+import org.springframework.http.HttpStatus;
+
+/**
+ * @author Tang Xiong
+ */
+public class EurekaConfigServerInstanceProvider {
+
+	private final Log log;
+
+	private final EurekaHttpClient client;
+
+	private final EurekaClientConfig config;
+
+	public EurekaConfigServerInstanceProvider(EurekaHttpClient client, EurekaClientConfig config) {
+		this(LogFactory.getLog(EurekaConfigServerInstanceProvider.class), client, config);
+	}
+
+	public EurekaConfigServerInstanceProvider(Log log, EurekaHttpClient client, EurekaClientConfig config) {
+		this.log = log;
+		this.client = client;
+		this.config = config;
+	}
+
+	public List<ServiceInstance> getInstances(String serviceId) {
+		if (log.isDebugEnabled()) {
+			log.debug("eurekaConfigServerInstanceProvider finding instances for " + serviceId);
+		}
+		String remoteRegionsStr = config.fetchRegistryForRemoteRegions();
+		String[] remoteRegions = remoteRegionsStr == null ? null : remoteRegionsStr.split(",");
+		EurekaHttpResponse<Applications> response = config.getRegistryRefreshSingleVipAddress() == null
+				? client.getApplications(remoteRegions)
+				: client.getVip(config.getRegistryRefreshSingleVipAddress(), remoteRegions);
+		List<ServiceInstance> instances = new ArrayList<>();
+		if (!isSuccessful(response) || response.getEntity() == null) {
+			return instances;
+		}
+
+		Applications applications = response.getEntity();
+		applications.shuffleInstances(config.shouldFilterOnlyUpInstances());
+		List<InstanceInfo> infos = applications.getInstancesByVirtualHostName(serviceId);
+		for (InstanceInfo info : infos) {
+			instances.add(new EurekaServiceInstance(info));
+		}
+		if (log.isDebugEnabled()) {
+			log.debug("eurekaConfigServerInstanceProvider found " + infos.size() + " instance(s) for " + serviceId
+					+ ", " + instances);
+		}
+		return instances;
+	}
+
+	private boolean isSuccessful(EurekaHttpResponse<Applications> response) {
+		HttpStatus httpStatus = HttpStatus.resolve(response.getStatusCode());
+		return httpStatus != null && httpStatus.is2xxSuccessful();
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,18 +14,19 @@
 * limitations under the License.
 */

-package org.springframework.cloud.netflix.eureka.http;
+package org.springframework.cloud.netflix.eureka.config;

-import org.junit.Test;
+import org.springframework.cloud.configuration.TlsProperties;

 /**
- * @author Daniel Lavoie
+ * Eureka client TLS properties.
 */
-public class WebClientTransportClientFactoriesTest {

-	@Test(expected = UnsupportedOperationException.class)
-	public void testJerseyIsUnsuported() {
-		new WebClientTransportClientFactories().newTransportClientFactory(null, null);
-	}
+public class EurekaTlsProperties extends TlsProperties {
+
+	/**
+	 * Prefix for Eureka client TLS properties.
+	 */
+	public static final String PREFIX = "eureka.client.tls";

 }
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2013-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka.config;
+
+import java.util.List;
+
+import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.endpoint.EndpointUtils;
+import com.netflix.discovery.shared.resolver.DefaultEndpoint;
+
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.cloud.config.client.ConfigServerConfigDataLocationResolver.PropertyResolver;
+import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
+import org.springframework.core.env.Environment;
+import org.springframework.util.StringUtils;
+
+public final class HostnameBasedUrlRandomizer implements EndpointUtils.ServiceUrlRandomizer {
+
+	private static final String EUREKA_INSTANCE_HOSTNAME = "eureka.instance.hostname";
+
+	private final String hostname;
+
+	HostnameBasedUrlRandomizer(String hostname) {
+		this.hostname = hostname;
+	}
+
+	@Override
+	public void randomize(List<String> urlList) {
+		int listSize = 0;
+		if (urlList != null) {
+			listSize = urlList.size();
+		}
+		if (!StringUtils.hasText(hostname) || listSize == 0) {
+			return;
+		}
+		// Find the hashcode of the instance hostname and use it to find an entry
+		// and then arrange the rest of the entries after this entry.
+		int instanceHashcode = hostname.hashCode();
+		if (instanceHashcode < 0) {
+			instanceHashcode = instanceHashcode * -1;
+		}
+		int backupInstance = instanceHashcode % listSize;
+		for (int i = 0; i < backupInstance; i++) {
+			String zone = urlList.remove(0);
+			urlList.add(zone);
+		}
+	}
+
+	public static String getEurekaUrl(EurekaClientConfig config, String hostname) {
+		List<String> urls = EndpointUtils.getDiscoveryServiceUrls(config, EurekaClientConfigBean.DEFAULT_ZONE,
+				new HostnameBasedUrlRandomizer(hostname));
+		return urls.get(0);
+	}
+
+	public static DefaultEndpoint randomEndpoint(EurekaClientConfig config, Environment env) {
+		String hostname = env.getProperty(EUREKA_INSTANCE_HOSTNAME);
+		return new DefaultEndpoint(getEurekaUrl(config, hostname));
+	}
+
+	public static DefaultEndpoint randomEndpoint(EurekaClientConfig config, Binder binder) {
+		String hostname = binder.bind(EUREKA_INSTANCE_HOSTNAME, String.class).orElseGet(() -> null);
+		return new DefaultEndpoint(getEurekaUrl(config, hostname));
+	}
+
+	public static DefaultEndpoint randomEndpoint(EurekaClientConfig config, PropertyResolver propertyResolver) {
+		String hostname = propertyResolver.get(EUREKA_INSTANCE_HOSTNAME, String.class, null);
+		return new DefaultEndpoint(getEurekaUrl(config, hostname));
+	}
+
+}
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2013-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka.http;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
+import org.apache.hc.core5.http.io.SocketConfig;
+import org.apache.hc.core5.util.Timeout;
+
+import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.lang.Nullable;
+
+/**
+ * Supplier for the {@link ClientHttpRequestFactory} to be used by Eureka client that uses
+ * {@link HttpClients}.
+ *
+ * @author Marcin Grzejszczak
+ * @author Olga Maciaszek-Sharma
+ * @author Jiwon Jeon
+ * @since 3.0.0
+ */
+public class DefaultEurekaClientHttpRequestFactorySupplier implements EurekaClientHttpRequestFactorySupplier {
+
+	private final RestTemplateTimeoutProperties restTemplateTimeoutProperties;
+
+	/**
+	 * @deprecated in favour of
+	 * {@link DefaultEurekaClientHttpRequestFactorySupplier#DefaultEurekaClientHttpRequestFactorySupplier(RestTemplateTimeoutProperties)}
+	 */
+	@Deprecated
+	public DefaultEurekaClientHttpRequestFactorySupplier() {
+		this.restTemplateTimeoutProperties = new RestTemplateTimeoutProperties();
+	}
+
+	public DefaultEurekaClientHttpRequestFactorySupplier(RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
+		this.restTemplateTimeoutProperties = restTemplateTimeoutProperties;
+	}
+
+	@Override
+	public ClientHttpRequestFactory get(SSLContext sslContext, @Nullable HostnameVerifier hostnameVerifier) {
+		HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+		if (sslContext != null || hostnameVerifier != null || restTemplateTimeoutProperties != null) {
+			httpClientBuilder.setConnectionManager(
+					buildConnectionManager(sslContext, hostnameVerifier, restTemplateTimeoutProperties));
+		}
+		if (restTemplateTimeoutProperties != null) {
+			httpClientBuilder.setDefaultRequestConfig(buildRequestConfig());
+		}
+
+		CloseableHttpClient httpClient = httpClientBuilder.build();
+		HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+		requestFactory.setHttpClient(httpClient);
+		return requestFactory;
+	}
+
+	private HttpClientConnectionManager buildConnectionManager(SSLContext sslContext, HostnameVerifier hostnameVerifier,
+			RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
+		PoolingHttpClientConnectionManagerBuilder connectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder
+			.create();
+		SSLConnectionSocketFactoryBuilder sslConnectionSocketFactoryBuilder = SSLConnectionSocketFactoryBuilder
+			.create();
+		if (sslContext != null) {
+			sslConnectionSocketFactoryBuilder.setSslContext(sslContext);
+		}
+		if (hostnameVerifier != null) {
+			sslConnectionSocketFactoryBuilder.setHostnameVerifier(hostnameVerifier);
+		}
+		connectionManagerBuilder.setSSLSocketFactory(sslConnectionSocketFactoryBuilder.build());
+		if (restTemplateTimeoutProperties != null) {
+			connectionManagerBuilder.setDefaultSocketConfig(SocketConfig.custom()
+				.setSoTimeout(Timeout.of(restTemplateTimeoutProperties.getSocketTimeout(), TimeUnit.MILLISECONDS))
+				.build());
+		}
+		return connectionManagerBuilder.build();
+	}
+
+	private RequestConfig buildRequestConfig() {
+		return RequestConfig.custom()
+			.setConnectTimeout(Timeout.of(restTemplateTimeoutProperties.getConnectTimeout(), TimeUnit.MILLISECONDS))
+			.setConnectionRequestTimeout(
+					Timeout.of(restTemplateTimeoutProperties.getConnectRequestTimeout(), TimeUnit.MILLISECONDS))
+			.build();
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka.http;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.lang.Nullable;
+
+/**
+ * Supplier for the {@link ClientHttpRequestFactory} to be used by Eureka client.
+ *
+ * @author Marcin Grzejszczak
+ * @since 3.0.0
+ */
+public interface EurekaClientHttpRequestFactorySupplier {
+
+	/**
+	 * Returns a constructed {@link ClientHttpRequestFactory}.
+	 * @param sslContext SSL Context
+	 * @param hostnameVerifier Hostname verifier
+	 * @return {@link ClientHttpRequestFactory}
+	 */
+	ClientHttpRequestFactory get(SSLContext sslContext, @Nullable HostnameVerifier hostnameVerifier);
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,16 +16,32 @@

 package org.springframework.cloud.netflix.eureka.http;

+import java.util.function.Supplier;
+
 import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;

+import org.springframework.boot.web.client.RestTemplateBuilder;
+
 /**
 * @author Daniel Lavoie
+ * @author Armin Krezovic
 */
-public class RestTemplateDiscoveryClientOptionalArgs
-		extends AbstractDiscoveryClientOptionalArgs<Void> {
+public class RestTemplateDiscoveryClientOptionalArgs extends AbstractDiscoveryClientOptionalArgs<Void> {

-	public RestTemplateDiscoveryClientOptionalArgs() {
-		setTransportClientFactories(new RestTemplateTransportClientFactories());
+	protected final EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier;
+
+	protected final Supplier<RestTemplateBuilder> restTemplateBuilderSupplier;
+
+	public RestTemplateDiscoveryClientOptionalArgs(
+			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) {
+		this(eurekaClientHttpRequestFactorySupplier, RestTemplateBuilder::new);
+	}
+
+	public RestTemplateDiscoveryClientOptionalArgs(
+			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier,
+			Supplier<RestTemplateBuilder> restTemplateBuilderSupplier) {
+		this.eurekaClientHttpRequestFactorySupplier = eurekaClientHttpRequestFactorySupplier;
+		this.restTemplateBuilderSupplier = restTemplateBuilderSupplier;
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@

 package org.springframework.cloud.netflix.eureka.http;

+import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +31,6 @@ import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.EurekaHttpResponse;
 import com.netflix.discovery.shared.transport.EurekaHttpResponse.EurekaHttpResponseBuilder;
 import com.netflix.discovery.util.StringUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;

 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -40,17 +39,17 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;

 import static com.netflix.discovery.shared.transport.EurekaHttpResponse.anEurekaHttpResponse;

 /**
 * @author Daniel Lavoie
+ * @author Václav Plic
 */
 public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private RestTemplate restTemplate;
+	private final RestTemplate restTemplate;

 	private String serviceUrl;

@@ -66,46 +65,58 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 		return this.serviceUrl;
 	}

+	public RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
 	@Override
 	public EurekaHttpResponse<Void> register(InstanceInfo info) {
-		String urlPath = serviceUrl + "apps/" + info.getAppName();
+		URI uri = UriComponentsBuilder.fromHttpUrl(serviceUrl)
+			.path("apps/{appName}")
+			.buildAndExpand(info.getAppName())
+			.toUri();

 		HttpHeaders headers = new HttpHeaders();
 		headers.add(HttpHeaders.ACCEPT_ENCODING, "gzip");
 		headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);

-		ResponseEntity<Void> response = restTemplate.exchange(urlPath, HttpMethod.POST,
-				new HttpEntity<>(info, headers), Void.class);
+		ResponseEntity<Void> response = restTemplate.exchange(uri, HttpMethod.POST, new HttpEntity<>(info, headers),
+				Void.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue())
-				.headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
 	}

 	@Override
 	public EurekaHttpResponse<Void> cancel(String appName, String id) {
-		String urlPath = serviceUrl + "apps/" + appName + '/' + id;
+		URI uri = UriComponentsBuilder.fromHttpUrl(serviceUrl)
+			.path("apps/{appName}/{id}")
+			.buildAndExpand(appName, id)
+			.toUri();

-		ResponseEntity<Void> response = restTemplate.exchange(urlPath, HttpMethod.DELETE,
-				null, Void.class);
+		ResponseEntity<Void> response = restTemplate.exchange(uri, HttpMethod.DELETE, null, Void.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue())
-				.headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
 	}

 	@Override
-	public EurekaHttpResponse<InstanceInfo> sendHeartBeat(String appName, String id,
-			InstanceInfo info, InstanceStatus overriddenStatus) {
-		String urlPath = serviceUrl + "apps/" + appName + '/' + id + "?status="
-				+ info.getStatus().toString() + "&lastDirtyTimestamp="
-				+ info.getLastDirtyTimestamp().toString() + (overriddenStatus != null
-						? "&overriddenstatus=" + overriddenStatus.name() : "");
+	public EurekaHttpResponse<InstanceInfo> sendHeartBeat(String appName, String id, InstanceInfo info,
+			InstanceStatus overriddenStatus) {
+		UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromHttpUrl(serviceUrl)
+			.path("apps/{appName}/{id}")
+			.queryParam("status", info.getStatus().toString())
+			.queryParam("lastDirtyTimestamp", info.getLastDirtyTimestamp().toString());

-		ResponseEntity<InstanceInfo> response = restTemplate.exchange(urlPath,
-				HttpMethod.PUT, null, InstanceInfo.class);
+		if (overriddenStatus != null) {
+			uriBuilder = uriBuilder.queryParam("overriddenstatus", overriddenStatus.name());
+		}
+
+		URI uri = uriBuilder.buildAndExpand(appName, id).toUri();
+
+		ResponseEntity<InstanceInfo> response = restTemplate.exchange(uri, HttpMethod.PUT, null, InstanceInfo.class);

 		EurekaHttpResponseBuilder<InstanceInfo> eurekaResponseBuilder = anEurekaHttpResponse(
-				response.getStatusCodeValue(), InstanceInfo.class)
-						.headers(headersOf(response));
+				response.getStatusCode().value(), InstanceInfo.class)
+			.headers(headersOf(response));

 		if (response.hasBody()) {
 			eurekaResponseBuilder.entity(response.getBody());
@@ -115,30 +126,31 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 	}

 	@Override
-	public EurekaHttpResponse<Void> statusUpdate(String appName, String id,
-			InstanceStatus newStatus, InstanceInfo info) {
-		String urlPath = serviceUrl + "apps/" + appName + '/' + id + "/status?value="
-				+ newStatus.name() + "&lastDirtyTimestamp="
-				+ info.getLastDirtyTimestamp().toString();
+	public EurekaHttpResponse<Void> statusUpdate(String appName, String id, InstanceStatus newStatus,
+			InstanceInfo info) {
+		URI uri = UriComponentsBuilder.fromHttpUrl(serviceUrl)
+			.path("apps/{appName}/{id}/status")
+			.queryParam("value", newStatus.name())
+			.queryParam("lastDirtyTimestamp", info.getLastDirtyTimestamp().toString())
+			.buildAndExpand(appName, id)
+			.toUri();

-		ResponseEntity<Void> response = restTemplate.exchange(urlPath, HttpMethod.PUT,
-				null, Void.class);
+		ResponseEntity<Void> response = restTemplate.exchange(uri, HttpMethod.PUT, null, Void.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue())
-				.headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
 	}

 	@Override
-	public EurekaHttpResponse<Void> deleteStatusOverride(String appName, String id,
-			InstanceInfo info) {
-		String urlPath = serviceUrl + "apps/" + appName + '/' + id
-				+ "/status?lastDirtyTimestamp=" + info.getLastDirtyTimestamp().toString();
+	public EurekaHttpResponse<Void> deleteStatusOverride(String appName, String id, InstanceInfo info) {
+		URI uri = UriComponentsBuilder.fromHttpUrl(serviceUrl)
+			.path("apps/{appName}/{id}/status")
+			.queryParam("lastDirtyTimestamp", info.getLastDirtyTimestamp().toString())
+			.buildAndExpand(appName, id)
+			.toUri();

-		ResponseEntity<Void> response = restTemplate.exchange(urlPath, HttpMethod.DELETE,
-				null, Void.class);
+		ResponseEntity<Void> response = restTemplate.exchange(uri, HttpMethod.DELETE, null, Void.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue())
-				.headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
 	}

 	@Override
@@ -146,22 +158,23 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 		return getApplicationsInternal("apps/", regions);
 	}

-	private EurekaHttpResponse<Applications> getApplicationsInternal(String urlPath,
-			String[] regions) {
-		String url = serviceUrl + urlPath;
+	private EurekaHttpResponse<Applications> getApplicationsInternal(String urlPath, String[] regions) {
+		UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromHttpUrl(serviceUrl).path(urlPath);

 		if (regions != null && regions.length > 0) {
-			url = url + (urlPath.contains("?") ? "&" : "?") + "regions="
-					+ StringUtil.join(regions);
+			uriBuilder = uriBuilder.queryParam("regions", StringUtil.join(regions));
 		}

-		ResponseEntity<EurekaApplications> response = restTemplate.exchange(url,
-				HttpMethod.GET, null, EurekaApplications.class);
+		URI uri = uriBuilder.build().toUri();

-		return anEurekaHttpResponse(response.getStatusCodeValue(),
-				response.getStatusCode().value() == HttpStatus.OK.value()
-						&& response.hasBody() ? (Applications) response.getBody() : null)
-								.headers(headersOf(response)).build();
+		ResponseEntity<EurekaApplications> response = restTemplate.exchange(uri, HttpMethod.GET, null,
+				EurekaApplications.class);
+
+		return anEurekaHttpResponse(response.getStatusCode().value(),
+				response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody()
+						? (Applications) response.getBody() : null)
+			.headers(headersOf(response))
+			.build();
 	}

 	@Override
@@ -175,45 +188,42 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 	}

 	@Override
-	public EurekaHttpResponse<Applications> getSecureVip(String secureVipAddress,
-			String... regions) {
+	public EurekaHttpResponse<Applications> getSecureVip(String secureVipAddress, String... regions) {
 		return getApplicationsInternal("svips/" + secureVipAddress, regions);
 	}

 	@Override
 	public EurekaHttpResponse<Application> getApplication(String appName) {
-		String urlPath = serviceUrl + "apps/" + appName;
+		URI uri = UriComponentsBuilder.fromHttpUrl(serviceUrl).path("apps/{appName}").buildAndExpand(appName).toUri();

-		ResponseEntity<Application> response = restTemplate.exchange(urlPath,
-				HttpMethod.GET, null, Application.class);
+		ResponseEntity<Application> response = restTemplate.exchange(uri, HttpMethod.GET, null, Application.class);

-		Application application = response.getStatusCodeValue() == HttpStatus.OK.value()
-				&& response.hasBody() ? response.getBody() : null;
+		Application application = response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody()
+				? response.getBody() : null;

-		return anEurekaHttpResponse(response.getStatusCodeValue(), application)
-				.headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value(), application).headers(headersOf(response)).build();
 	}

 	@Override
 	public EurekaHttpResponse<InstanceInfo> getInstance(String appName, String id) {
-		return getInstanceInternal("apps/" + appName + '/' + id);
+		return getInstanceInternal("apps", appName, id);
 	}

 	@Override
 	public EurekaHttpResponse<InstanceInfo> getInstance(String id) {
-		return getInstanceInternal("instances/" + id);
+		return getInstanceInternal("instances", id);
 	}

-	private EurekaHttpResponse<InstanceInfo> getInstanceInternal(String urlPath) {
-		urlPath = serviceUrl + urlPath;
+	private EurekaHttpResponse<InstanceInfo> getInstanceInternal(String... pathSegments) {
+		URI uri = UriComponentsBuilder.fromHttpUrl(serviceUrl).pathSegment(pathSegments).build().toUri();

-		ResponseEntity<InstanceInfo> response = restTemplate.exchange(urlPath,
-				HttpMethod.GET, null, InstanceInfo.class);
+		ResponseEntity<InstanceInfo> response = restTemplate.exchange(uri, HttpMethod.GET, null, InstanceInfo.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue(),
-				response.getStatusCodeValue() == HttpStatus.OK.value()
-						&& response.hasBody() ? response.getBody() : null)
-								.headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value(),
+				response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody() ? response.getBody()
+						: null)
+			.headers(headersOf(response))
+			.build();
 	}

 	@Override
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,35 +25,33 @@ import javax.net.ssl.SSLContext;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.transport.TransportClientFactory;
-import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClient;
 import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;

 /**
 * @author Daniel Lavoie
+ * @author Armin Krezovic
 */
-public class RestTemplateTransportClientFactories
-		implements TransportClientFactories<Void> {
+public class RestTemplateTransportClientFactories implements TransportClientFactories<Void> {

-	@Override
-	public TransportClientFactory newTransportClientFactory(
-			Collection<Void> additionalFilters, EurekaJerseyClient providedJerseyClient) {
-		throw new UnsupportedOperationException();
+	private final RestTemplateDiscoveryClientOptionalArgs args;
+
+	public RestTemplateTransportClientFactories(RestTemplateDiscoveryClientOptionalArgs args) {
+		this.args = args;
 	}

 	@Override
-	public TransportClientFactory newTransportClientFactory(
-			EurekaClientConfig clientConfig, Collection<Void> additionalFilters,
-			InstanceInfo myInstanceInfo) {
-		return new RestTemplateTransportClientFactory();
+	public TransportClientFactory newTransportClientFactory(EurekaClientConfig clientConfig,
+			Collection<Void> additionalFilters, InstanceInfo myInstanceInfo) {
+		return new RestTemplateTransportClientFactory(this.args.getSSLContext(), this.args.getHostnameVerifier(),
+				this.args.eurekaClientHttpRequestFactorySupplier, this.args.restTemplateBuilderSupplier);
 	}

 	@Override
-	public TransportClientFactory newTransportClientFactory(
-			final EurekaClientConfig clientConfig,
+	public TransportClientFactory newTransportClientFactory(final EurekaClientConfig clientConfig,
 			final Collection<Void> additionalFilters, final InstanceInfo myInstanceInfo,
-			final Optional<SSLContext> sslContext,
-			final Optional<HostnameVerifier> hostnameVerifier) {
-		return new RestTemplateTransportClientFactory();
+			final Optional<SSLContext> sslContext, final Optional<HostnameVerifier> hostnameVerifier) {
+		return new RestTemplateTransportClientFactory(this.args.getSSLContext(), this.args.getHostnameVerifier(),
+				this.args.eurekaClientHttpRequestFactorySupplier, this.args.restTemplateBuilderSupplier);
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,14 +16,21 @@

 package org.springframework.cloud.netflix.eureka.http;

+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;

 import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -38,11 +45,19 @@ import com.netflix.discovery.shared.resolver.EurekaEndpoint;
 import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.TransportClientFactory;

+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.configuration.SSLContextFactory;
+import org.springframework.cloud.configuration.TlsProperties;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;

 /**
 * Provides the custom {@link RestTemplate} required by the
@@ -50,24 +65,97 @@ import org.springframework.web.client.RestTemplate;
 * deserialization.
 *
 * @author Daniel Lavoie
+ * @author Armin Krezovic
 */
 public class RestTemplateTransportClientFactory implements TransportClientFactory {

+	private final Optional<SSLContext> sslContext;
+
+	private final Optional<HostnameVerifier> hostnameVerifier;
+
+	private final EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier;
+
+	private final Supplier<RestTemplateBuilder> restTemplateBuilderSupplier;
+
+	public RestTemplateTransportClientFactory(TlsProperties tlsProperties,
+			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier,
+			Supplier<RestTemplateBuilder> restTemplateBuilderSupplier) {
+		this.sslContext = context(tlsProperties);
+		this.hostnameVerifier = Optional.empty();
+		this.eurekaClientHttpRequestFactorySupplier = eurekaClientHttpRequestFactorySupplier;
+		this.restTemplateBuilderSupplier = restTemplateBuilderSupplier;
+	}
+
+	public RestTemplateTransportClientFactory(TlsProperties tlsProperties,
+			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) {
+		this(tlsProperties, eurekaClientHttpRequestFactorySupplier, RestTemplateBuilder::new);
+	}
+
+	private Optional<SSLContext> context(TlsProperties properties) {
+		if (properties == null || !properties.isEnabled()) {
+			return Optional.empty();
+		}
+		try {
+			return Optional.of(new SSLContextFactory(properties).createSSLContext());
+		}
+		catch (Exception e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	public RestTemplateTransportClientFactory(Optional<SSLContext> sslContext,
+			Optional<HostnameVerifier> hostnameVerifier,
+			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier,
+			Supplier<RestTemplateBuilder> restTemplateBuilderSupplier) {
+		this.sslContext = sslContext;
+		this.hostnameVerifier = hostnameVerifier;
+		this.eurekaClientHttpRequestFactorySupplier = eurekaClientHttpRequestFactorySupplier;
+		this.restTemplateBuilderSupplier = restTemplateBuilderSupplier;
+	}
+
+	public RestTemplateTransportClientFactory(Optional<SSLContext> sslContext,
+			Optional<HostnameVerifier> hostnameVerifier,
+			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) {
+
+		this(sslContext, hostnameVerifier, eurekaClientHttpRequestFactorySupplier, RestTemplateBuilder::new);
+	}
+
+	public RestTemplateTransportClientFactory() {
+		this(Optional.empty(), Optional.empty(), new DefaultEurekaClientHttpRequestFactorySupplier());
+	}
+
 	@Override
 	public EurekaHttpClient newClient(EurekaEndpoint serviceUrl) {
 		return new RestTemplateEurekaHttpClient(restTemplate(serviceUrl.getServiceUrl()),
-				serviceUrl.getServiceUrl());
+				stripUserInfo(serviceUrl.getServiceUrl()));
+	}
+
+	// apache http client 5.2 fails with non-null userinfo
+	// basic auth added in restTemplate() below
+	private String stripUserInfo(String serviceUrl) {
+		return UriComponentsBuilder.fromUriString(serviceUrl).userInfo(null).toUriString();
 	}

 	private RestTemplate restTemplate(String serviceUrl) {
-		RestTemplate restTemplate = new RestTemplate();
+		ClientHttpRequestFactory requestFactory = this.eurekaClientHttpRequestFactorySupplier
+			.get(this.sslContext.orElse(null), this.hostnameVerifier.orElse(null));
+
+		RestTemplate restTemplate;
+
+		if (restTemplateBuilderSupplier != null && restTemplateBuilderSupplier.get() != null) {
+			restTemplate = restTemplateBuilderSupplier.get().requestFactory(() -> requestFactory).build();
+		}
+		else {
+			restTemplate = new RestTemplate(requestFactory);
+		}
+
 		try {
 			URI serviceURI = new URI(serviceUrl);
 			if (serviceURI.getUserInfo() != null) {
 				String[] credentials = serviceURI.getUserInfo().split(":");
 				if (credentials.length == 2) {
-					restTemplate.getInterceptors().add(new BasicAuthenticationInterceptor(
-							credentials[0], credentials[1]));
+					restTemplate.getInterceptors()
+						.add(new BasicAuthenticationInterceptor(credentials[0], credentials[1]));
 				}
 			}
 		}
@@ -78,6 +166,14 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 		restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter());
 		restTemplate.setErrorHandler(new ErrorHandler());

+		restTemplate.getInterceptors().add((request, body, execution) -> {
+			ClientHttpResponse response = execution.execute(request, body);
+			if (!response.getStatusCode().equals(HttpStatus.NOT_FOUND)) {
+				return response;
+			}
+			return new NotFoundHttpResponse(response);
+		});
+
 		return restTemplate;
 	}

@@ -87,59 +183,33 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 	 * serialized or deserialized. Achived with
 	 * {@link SerializationFeature#WRAP_ROOT_VALUE} and
 	 * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}.
-	 * {@link PropertyNamingStrategy.SnakeCaseStrategy} is applied to the underlying
+	 * {@link PropertyNamingStrategies.SnakeCaseStrategy} is applied to the underlying
 	 * {@link ObjectMapper}.
 	 * @return a {@link MappingJackson2HttpMessageConverter} object
 	 */
 	public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() {
 		MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-		converter.setObjectMapper(new ObjectMapper()
-				.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE));
+		converter.setObjectMapper(new ObjectMapper().setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE));

 		SimpleModule jsonModule = new SimpleModule();
-		jsonModule.setSerializerModifier(createJsonSerializerModifier()); // keyFormatter,
-		// compact));
+		jsonModule.setSerializerModifier(createJsonSerializerModifier());
 		converter.getObjectMapper().registerModule(jsonModule);

 		converter.getObjectMapper().configure(SerializationFeature.WRAP_ROOT_VALUE, true);
-		converter.getObjectMapper().configure(DeserializationFeature.UNWRAP_ROOT_VALUE,
-				true);
-		converter.getObjectMapper().addMixIn(Applications.class,
-				ApplicationsJsonMixIn.class);
-		converter.getObjectMapper().addMixIn(InstanceInfo.class,
-				InstanceInfoJsonMixIn.class);
-
-		// converter.getObjectMapper().addMixIn(DataCenterInfo.class,
-		// DataCenterInfoXmlMixIn.class);
-		// converter.getObjectMapper().addMixIn(InstanceInfo.PortWrapper.class,
-		// PortWrapperXmlMixIn.class);
-		// converter.getObjectMapper().addMixIn(Application.class,
-		// ApplicationXmlMixIn.class);
-		// converter.getObjectMapper().addMixIn(Applications.class,
-		// ApplicationsXmlMixIn.class);
+		converter.getObjectMapper().configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+		converter.getObjectMapper().addMixIn(Applications.class, ApplicationsJsonMixIn.class);
+		converter.getObjectMapper().addMixIn(InstanceInfo.class, InstanceInfoJsonMixIn.class);

 		return converter;
 	}

-	public static BeanSerializerModifier createJsonSerializerModifier() { // final
-		// KeyFormatter
-		// keyFormatter,
-		// final
-		// boolean
-		// compactMode)
-		// {
+	public static BeanSerializerModifier createJsonSerializerModifier() {
 		return new BeanSerializerModifier() {
 			@Override
-			public JsonSerializer<?> modifySerializer(SerializationConfig config,
-					BeanDescription beanDesc, JsonSerializer<?> serializer) {
-				/*
-				 * if (beanDesc.getBeanClass().isAssignableFrom(Applications.class)) {
-				 * return new ApplicationsJsonBeanSerializer((BeanSerializerBase)
-				 * serializer, keyFormatter); }
-				 */
+			public JsonSerializer<?> modifySerializer(SerializationConfig config, BeanDescription beanDesc,
+					JsonSerializer<?> serializer) {
 				if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) {
-					return new InstanceInfoJsonBeanSerializer(
-							(BeanSerializerBase) serializer, false);
+					return new InstanceInfoJsonBeanSerializer((BeanSerializerBase) serializer, false);
 				}
 				return serializer;
 			}
@@ -150,15 +220,54 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 	public void shutdown() {
 	}

+	/**
+	 * Response that ignores body, specifically for 404 errors.
+	 */
+	private static class NotFoundHttpResponse implements ClientHttpResponse {
+
+		private final ClientHttpResponse response;
+
+		NotFoundHttpResponse(ClientHttpResponse response) {
+			this.response = response;
+		}
+
+		@Override
+		public HttpStatusCode getStatusCode() throws IOException {
+			return response.getStatusCode();
+		}
+
+		@Override
+		public String getStatusText() throws IOException {
+			return response.getStatusText();
+		}
+
+		@Override
+		public void close() {
+			response.close();
+		}
+
+		@Override
+		public InputStream getBody() throws IOException {
+			// ignore body on 404 for heartbeat, see gh-4145
+			return null;
+		}
+
+		@Override
+		public HttpHeaders getHeaders() {
+			return response.getHeaders();
+		}
+
+	}
+
 	class ErrorHandler extends DefaultResponseErrorHandler {

 		@Override
-		protected boolean hasError(HttpStatus statusCode) {
+		protected boolean hasError(HttpStatusCode statusCode) {
 			/**
-			 * When the Eureka server restarts and a client tries to sent a heartbeat the
-			 * server will respond with a 404. By default RestTemplate will throw an
+			 * When the Eureka server restarts and a client tries to send a heartbeat the
+			 * server will respond with a 404. By default, RestTemplate will throw an
 			 * exception in this case. What we want is to return the 404 to the upstream
-			 * code so it will send another registration request to the server.
+			 * code, so it will send another registration request to the server.
 			 */
 			if (statusCode.is4xxClientError()) {
 				return false;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,17 +16,19 @@

 package org.springframework.cloud.netflix.eureka.http;

+import java.util.function.Supplier;
+
 import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;

+import org.springframework.web.reactive.function.client.WebClient;
+
 /**
 * @author Daniel Lavoie
 * @author Haytham Mohamed
 */
-public class WebClientDiscoveryClientOptionalArgs
-		extends AbstractDiscoveryClientOptionalArgs<Void> {
+public class WebClientDiscoveryClientOptionalArgs extends AbstractDiscoveryClientOptionalArgs<Void> {

-	public WebClientDiscoveryClientOptionalArgs() {
-		setTransportClientFactories(new WebClientTransportClientFactories());
+	public WebClientDiscoveryClientOptionalArgs(Supplier<WebClient.Builder> builder) {
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@

 package org.springframework.cloud.netflix.eureka.http;

-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;

 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.appinfo.InstanceInfo.InstanceStatus;
@@ -28,12 +27,13 @@ import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.EurekaHttpResponse;
 import com.netflix.discovery.shared.transport.EurekaHttpResponse.EurekaHttpResponseBuilder;
 import com.netflix.discovery.util.StringUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import reactor.core.publisher.Mono;

 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -43,11 +43,10 @@ import static com.netflix.discovery.shared.transport.EurekaHttpResponse.anEureka
 /**
 * @author Daniel Lavoie
 * @author Haytham Mohamed
+ * @author Václav Plic
 */
 public class WebClientEurekaHttpClient implements EurekaHttpClient {

-	protected final Log logger = LogFactory.getLog(getClass());
-
 	private WebClient webClient;

 	public WebClientEurekaHttpClient(WebClient webClient) {
@@ -56,37 +55,50 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {

 	@Override
 	public EurekaHttpResponse<Void> register(InstanceInfo info) {
-		return webClient.post().uri("apps/" + info.getAppName(), Void.class)
-				.body(BodyInserters.fromValue(info))
-				.header(HttpHeaders.ACCEPT_ENCODING, "gzip")
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.exchange().map(response -> eurekaHttpResponse(response)).block();
+		return webClient.post()
+			.uri(uriBuilder -> uriBuilder.path("apps/{appName}").build(info.getAppName()))
+			.body(BodyInserters.fromValue(info))
+			.header(HttpHeaders.ACCEPT_ENCODING, "gzip")
+			.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+			.retrieve()
+			.onStatus(HttpStatusCode::isError, this::ignoreError)
+			.toBodilessEntity()
+			.map(this::eurekaHttpResponse)
+			.block();
 	}

 	@Override
 	public EurekaHttpResponse<Void> cancel(String appName, String id) {
-		return webClient.delete().uri("apps/" + appName + '/' + id, Void.class).exchange()
-				.map(response -> eurekaHttpResponse(response)).block();
+		return webClient.delete()
+			.uri(uriBuilder -> uriBuilder.path("apps/{appName}/{id}").build(appName, id))
+			.retrieve()
+			.onStatus(HttpStatusCode::isError, this::ignoreError)
+			.toBodilessEntity()
+			.map(this::eurekaHttpResponse)
+			.block();
 	}

 	@Override
-	public EurekaHttpResponse<InstanceInfo> sendHeartBeat(String appName, String id,
-			InstanceInfo info, InstanceStatus overriddenStatus) {
-		String urlPath = "apps/" + appName + '/' + id + "?status="
-				+ info.getStatus().toString() + "&lastDirtyTimestamp="
-				+ info.getLastDirtyTimestamp().toString() + (overriddenStatus != null
-						? "&overriddenstatus=" + overriddenStatus.name() : "");
+	public EurekaHttpResponse<InstanceInfo> sendHeartBeat(String appName, String id, InstanceInfo info,
+			InstanceStatus overriddenStatus) {

-		ClientResponse response = webClient.put().uri(urlPath, InstanceInfo.class)
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange()
-				.block();
+		ResponseEntity<InstanceInfo> response = webClient.put()
+			.uri(uriBuilder -> uriBuilder.path("apps/{appName}/{id}")
+				.queryParam("status", info.getStatus().toString())
+				.queryParam("lastDirtyTimestamp", info.getLastDirtyTimestamp().toString())
+				.build(appName, id))
+			.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+			.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
+			.retrieve()
+			.onStatus(HttpStatusCode::isError, this::ignoreError)
+			.toEntity(InstanceInfo.class)
+			.block();

-		EurekaHttpResponseBuilder<InstanceInfo> builder = anEurekaHttpResponse(
-				statusCodeValueOf(response), InstanceInfo.class)
-						.headers(headersOf(response));
+		EurekaHttpResponseBuilder<InstanceInfo> builder = anEurekaHttpResponse(statusCodeValueOf(response),
+				InstanceInfo.class)
+			.headers(headersOf(response));

-		InstanceInfo entity = response.toEntity(InstanceInfo.class).block().getBody();
+		InstanceInfo entity = response.getBody();

 		if (entity != null) {
 			builder.entity(entity);
@@ -97,26 +109,33 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 	}

 	@Override
-	public EurekaHttpResponse<Void> statusUpdate(String appName, String id,
-			InstanceStatus newStatus, InstanceInfo info) {
-		String urlPath = "apps/" + appName + '/' + id + "/status?value="
-				+ newStatus.name() + "&lastDirtyTimestamp="
-				+ info.getLastDirtyTimestamp().toString();
-
-		return webClient.put().uri(urlPath, Void.class)
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.exchange().map(response -> eurekaHttpResponse(response)).block();
+	public EurekaHttpResponse<Void> statusUpdate(String appName, String id, InstanceStatus newStatus,
+			InstanceInfo info) {
+		return webClient.put()
+			.uri(uriBuilder -> uriBuilder.path("apps/{appName}/{id}/status")
+				.queryParam("value", newStatus.name())
+				.queryParam("lastDirtyTimestamp", info.getLastDirtyTimestamp().toString())
+				.build(appName, id))
+			.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+			.retrieve()
+			.onStatus(HttpStatusCode::isError, this::ignoreError)
+			.toBodilessEntity()
+			.map(this::eurekaHttpResponse)
+			.block();
 	}

 	@Override
-	public EurekaHttpResponse<Void> deleteStatusOverride(String appName, String id,
-			InstanceInfo info) {
-		String urlPath = "apps/" + appName + '/' + id + "/status?lastDirtyTimestamp="
-				+ info.getLastDirtyTimestamp().toString();
-
-		return webClient.delete().uri(urlPath, Void.class)
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.exchange().map(response -> eurekaHttpResponse(response)).block();
+	public EurekaHttpResponse<Void> deleteStatusOverride(String appName, String id, InstanceInfo info) {
+		return webClient.delete()
+			.uri(uriBuilder -> uriBuilder.path("apps/{appName}/{id}/status")
+				.queryParam("lastDirtyTimestamp", info.getLastDirtyTimestamp().toString())
+				.build(appName, id))
+			.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+			.retrieve()
+			.onStatus(HttpStatusCode::isError, this::ignoreError)
+			.toBodilessEntity()
+			.map(this::eurekaHttpResponse)
+			.block();
 	}

 	@Override
@@ -124,27 +143,26 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 		return getApplicationsInternal("apps/", regions);
 	}

-	private EurekaHttpResponse<Applications> getApplicationsInternal(String urlPath,
-			String[] regions) {
-		String url = urlPath;
+	private EurekaHttpResponse<Applications> getApplicationsInternal(String urlPath, String[] regions) {
+		Optional<String> regionsParam = (regions != null && regions.length > 0) ? Optional.of(StringUtil.join(regions))
+				: Optional.empty();

-		if (regions != null && regions.length > 0) {
-			url = url + (urlPath.contains("?") ? "&" : "?") + "regions="
-					+ StringUtil.join(regions);
-		}
-
-		ClientResponse response = webClient.get().uri(url, Applications.class)
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange()
-				.block();
+		ResponseEntity<Applications> response = webClient.get()
+			.uri(uriBuilder -> uriBuilder.path(urlPath).queryParamIfPresent("regions", regionsParam).build())
+			.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+			.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
+			.retrieve()
+			.onStatus(HttpStatusCode::isError, this::ignoreError)
+			.toEntity(Applications.class)
+			.block();

 		int statusCode = statusCodeValueOf(response);

-		Applications body = response.toEntity(Applications.class).block().getBody();
+		Applications body = response.getBody();

-		return anEurekaHttpResponse(statusCode,
-				statusCode == HttpStatus.OK.value() && body != null ? body : null)
-						.headers(headersOf(response)).build();
+		return anEurekaHttpResponse(statusCode, statusCode == HttpStatus.OK.value() && body != null ? body : null)
+			.headers(headersOf(response))
+			.build();
 	}

 	@Override
@@ -158,50 +176,54 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 	}

 	@Override
-	public EurekaHttpResponse<Applications> getSecureVip(String secureVipAddress,
-			String... regions) {
+	public EurekaHttpResponse<Applications> getSecureVip(String secureVipAddress, String... regions) {
 		return getApplicationsInternal("svips/" + secureVipAddress, regions);
 	}

 	@Override
 	public EurekaHttpResponse<Application> getApplication(String appName) {

-		ClientResponse response = webClient.get()
-				.uri("apps/" + appName, Application.class)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange()
-				.block();
+		ResponseEntity<Application> response = webClient.get()
+			.uri(uriBuilder -> uriBuilder.path("apps/{appName}").build(appName))
+			.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
+			.retrieve()
+			.onStatus(HttpStatusCode::isError, this::ignoreError)
+			.toEntity(Application.class)
+			.block();

 		int statusCode = statusCodeValueOf(response);
-		Application body = response.toEntity(Application.class).block().getBody();
+		Application body = response.getBody();

-		Application application = statusCode == HttpStatus.OK.value() && body != null
-				? body : null;
+		Application application = statusCode == HttpStatus.OK.value() && body != null ? body : null;

-		return anEurekaHttpResponse(statusCode, application).headers(headersOf(response))
-				.build();
+		return anEurekaHttpResponse(statusCode, application).headers(headersOf(response)).build();
 	}

 	@Override
 	public EurekaHttpResponse<InstanceInfo> getInstance(String appName, String id) {
-		return getInstanceInternal("apps/" + appName + '/' + id);
+		return getInstanceInternal("apps", appName, id);
 	}

 	@Override
 	public EurekaHttpResponse<InstanceInfo> getInstance(String id) {
-		return getInstanceInternal("instances/" + id);
+		return getInstanceInternal("instances", id);
 	}

-	private EurekaHttpResponse<InstanceInfo> getInstanceInternal(String urlPath) {
-		ClientResponse response = webClient.get().uri(urlPath, InstanceInfo.class)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange()
-				.block();
+	private EurekaHttpResponse<InstanceInfo> getInstanceInternal(String... pathSegments) {
+		ResponseEntity<InstanceInfo> response = webClient.get()
+			.uri(uriBuilder -> uriBuilder.pathSegment(pathSegments).build())
+			.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
+			.retrieve()
+			.onStatus(HttpStatusCode::isError, this::ignoreError)
+			.toEntity(InstanceInfo.class)
+			.block();

 		int statusCode = statusCodeValueOf(response);
-		InstanceInfo body = response.toEntity(InstanceInfo.class).block().getBody();
+		InstanceInfo body = response.getBody();

-		return anEurekaHttpResponse(statusCode,
-				statusCode == HttpStatus.OK.value() && body != null ? body : null)
-						.headers(headersOf(response)).build();
+		return anEurekaHttpResponse(statusCode, statusCode == HttpStatus.OK.value() && body != null ? body : null)
+			.headers(headersOf(response))
+			.build();
 	}

 	@Override
@@ -209,28 +231,24 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 		// Nothing to do
 	}

-	private static Map<String, String> headersOf(ClientResponse response) {
-		ClientResponse.Headers httpHeaders = response.headers();
-		if (httpHeaders == null) {
-			return Collections.emptyMap();
-		}
-		HttpHeaders asHeaders = httpHeaders.asHttpHeaders();
-		if (asHeaders == null) {
-			return Collections.emptyMap();
-		}
-		Map<String, String> headers = new HashMap<>();
-		asHeaders.entrySet().stream().forEach(entry -> entry.getValue().stream()
-				.forEach(v -> headers.put(entry.getKey(), v)));
-		return headers;
+	public WebClient getWebClient() {
+		return this.webClient;
 	}

-	private int statusCodeValueOf(ClientResponse response) {
-		return response.statusCode().value();
+	private Mono<? extends Throwable> ignoreError(ClientResponse response) {
+		return Mono.empty();
 	}

-	private EurekaHttpResponse<Void> eurekaHttpResponse(ClientResponse response) {
-		return anEurekaHttpResponse(statusCodeValueOf(response))
-				.headers(headersOf(response)).build();
+	private static Map<String, String> headersOf(ResponseEntity<?> response) {
+		return response.getHeaders().toSingleValueMap();
+	}
+
+	private int statusCodeValueOf(ResponseEntity<?> response) {
+		return response.getStatusCode().value();
+	}
+
+	private EurekaHttpResponse<Void> eurekaHttpResponse(ResponseEntity<?> response) {
+		return anEurekaHttpResponse(statusCodeValueOf(response)).headers(headersOf(response)).build();
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.cloud.netflix.eureka.http;

 import java.util.Collection;
 import java.util.Optional;
+import java.util.function.Supplier;

 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -25,35 +26,33 @@ import javax.net.ssl.SSLContext;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.transport.TransportClientFactory;
-import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClient;
 import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;

+import org.springframework.web.reactive.function.client.WebClient;
+
 /**
 * @author Daniel Lavoie
 * @author Haytham Mohamed
 */
 public class WebClientTransportClientFactories implements TransportClientFactories<Void> {

-	@Override
-	public TransportClientFactory newTransportClientFactory(
-			Collection<Void> additionalFilters, EurekaJerseyClient providedJerseyClient) {
-		throw new UnsupportedOperationException();
+	private final Supplier<WebClient.Builder> builder;
+
+	public WebClientTransportClientFactories(Supplier<WebClient.Builder> builder) {
+		this.builder = builder;
 	}

 	@Override
-	public TransportClientFactory newTransportClientFactory(
-			EurekaClientConfig clientConfig, Collection<Void> additionalFilters,
-			InstanceInfo myInstanceInfo) {
-		return new WebClientTransportClientFactory();
+	public TransportClientFactory newTransportClientFactory(EurekaClientConfig clientConfig,
+			Collection<Void> additionalFilters, InstanceInfo myInstanceInfo) {
+		return new WebClientTransportClientFactory(builder);
 	}

 	@Override
-	public TransportClientFactory newTransportClientFactory(
-			final EurekaClientConfig clientConfig,
+	public TransportClientFactory newTransportClientFactory(final EurekaClientConfig clientConfig,
 			final Collection<Void> additionalFilters, final InstanceInfo myInstanceInfo,
-			final Optional<SSLContext> sslContext,
-			final Optional<HostnameVerifier> hostnameVerifier) {
-		return new WebClientTransportClientFactory();
+			final Optional<SSLContext> sslContext, final Optional<HostnameVerifier> hostnameVerifier) {
+		return new WebClientTransportClientFactory(builder);
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,12 +18,13 @@ package org.springframework.cloud.netflix.eureka.http;

 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.function.Supplier;

 import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -37,18 +38,19 @@ import com.netflix.discovery.shared.Applications;
 import com.netflix.discovery.shared.resolver.EurekaEndpoint;
 import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.TransportClientFactory;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.codec.ClientCodecConfigurer;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
 import org.springframework.web.reactive.function.client.ExchangeFilterFunctions;
-import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.util.UriComponentsBuilder;

 /**
 * Provides the custom {@link WebClient.Builder} required by the
@@ -57,29 +59,35 @@ import org.springframework.web.reactive.function.client.WebClient;
 *
 * @author Daniel Lavoie
 * @author Haytham Mohamed
+ * @author Armin Krezovic
 */
 public class WebClientTransportClientFactory implements TransportClientFactory {

+	private final Supplier<WebClient.Builder> builderSupplier;
+
+	public WebClientTransportClientFactory(Supplier<WebClient.Builder> builderSupplier) {
+		this.builderSupplier = builderSupplier;
+	}
+
 	@Override
-	public EurekaHttpClient newClient(EurekaEndpoint serviceUrl) {
-		WebClient.Builder builder = of(serviceUrl.getServiceUrl());
-		this.setExchangeStrategies(builder);
-		this.skipHttp400Error(builder);
+	public EurekaHttpClient newClient(EurekaEndpoint endpoint) {
+		// we want a copy to modify. Don't change the original
+		WebClient.Builder builder = this.builderSupplier.get().clone();
+		setUrl(builder, endpoint.getServiceUrl());
+		setCodecs(builder);
+		builder.filter(http4XxErrorExchangeFilterFunction());
 		return new WebClientEurekaHttpClient(builder.build());
 	}

-	private WebClient.Builder of(String serviceUrl) {
-		String url = serviceUrl;
-		WebClient.Builder builder = WebClient.builder();
+	private WebClient.Builder setUrl(WebClient.Builder builder, String serviceUrl) {
+		String url = UriComponentsBuilder.fromUriString(serviceUrl).userInfo(null).toUriString();
+
 		try {
 			URI serviceURI = new URI(serviceUrl);
 			if (serviceURI.getUserInfo() != null) {
 				String[] credentials = serviceURI.getUserInfo().split(":");
 				if (credentials.length == 2) {
-					builder.filter(ExchangeFilterFunctions
-							.basicAuthentication(credentials[0], credentials[1]));
-					url = serviceUrl.replace(credentials[0] + ":" + credentials[1] + "@",
-							"");
+					builder.filter(ExchangeFilterFunctions.basicAuthentication(credentials[0], credentials[1]));
 				}
 			}
 		}
@@ -88,38 +96,26 @@ public class WebClientTransportClientFactory implements TransportClientFactory {
 		return builder.baseUrl(url);
 	}

-	private void setExchangeStrategies(WebClient.Builder builder) {
-		ObjectMapper objectMapper = objectMapper();
-		ExchangeStrategies strategies = ExchangeStrategies.builder()
-				.codecs(clientDefaultCodecsConfigurer -> {
-					clientDefaultCodecsConfigurer.defaultCodecs()
-							.jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper,
-									MediaType.APPLICATION_JSON));
-					clientDefaultCodecsConfigurer.defaultCodecs()
-							.jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper,
-									MediaType.APPLICATION_JSON));
-
-				}).build();
-		builder.exchangeStrategies(strategies);
-	}
-
-	private void skipHttp400Error(WebClient.Builder builder) {
-		builder.filter(http4XxErrorExchangeFilterFunction());
-	}
-
-	// Skip over 4xx http errors
-	private ExchangeFilterFunction http4XxErrorExchangeFilterFunction() {
-		return ExchangeFilterFunction.ofResponseProcessor(clientResponse -> {
-			// literally 400 pass the tests, not 4xxClientError
-			if (clientResponse.statusCode().value() == 400) {
-				ClientResponse newResponse = ClientResponse.from(clientResponse)
-						.statusCode(HttpStatus.OK).build();
-				newResponse.body((clientHttpResponse, context) -> {
-					return clientHttpResponse.getBody();
-				});
-				return Mono.just(newResponse);
+	private static BeanSerializerModifier createJsonSerializerModifier() {
+		return new BeanSerializerModifier() {
+			@Override
+			public JsonSerializer<?> modifySerializer(SerializationConfig config, BeanDescription beanDesc,
+					JsonSerializer<?> serializer) {
+				if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) {
+					return new InstanceInfoJsonBeanSerializer((BeanSerializerBase) serializer, false);
+				}
+				return serializer;
 			}
-			return Mono.just(clientResponse);
+		};
+	}
+
+	private void setCodecs(WebClient.Builder builder) {
+		ObjectMapper objectMapper = objectMapper();
+		builder.codecs(configurer -> {
+			ClientCodecConfigurer.ClientDefaultCodecs defaults = configurer.defaultCodecs();
+			defaults.jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON));
+			defaults.jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
+
 		});
 	}

@@ -129,31 +125,13 @@ public class WebClientTransportClientFactory implements TransportClientFactory {
 	 * serialized or deserialized. Achieved with
 	 * {@link SerializationFeature#WRAP_ROOT_VALUE} and
 	 * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}.
-	 * {@link PropertyNamingStrategy.SnakeCaseStrategy} is applied to the underlying
-	 * {@link ObjectMapper}.
-	 * @deprecated to be removed.
-	 * @return a {@link MappingJackson2HttpMessageConverter} object
-	 */
-	@Deprecated
-	public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() {
-		MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-		converter.setObjectMapper(objectMapper());
-		return converter;
-	}
-
-	/**
-	 * Provides the serialization configurations required by the Eureka Server. JSON
-	 * content exchanged with eureka requires a root node matching the entity being
-	 * serialized or deserialized. Achieved with
-	 * {@link SerializationFeature#WRAP_ROOT_VALUE} and
-	 * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}.
-	 * {@link PropertyNamingStrategy.SnakeCaseStrategy} is applied to the underlying
+	 * {@link PropertyNamingStrategies.SnakeCaseStrategy} is applied to the underlying
 	 * {@link ObjectMapper}.
 	 * @return a {@link ObjectMapper} object
 	 */
 	private ObjectMapper objectMapper() {
 		ObjectMapper objectMapper = new ObjectMapper();
-		objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+		objectMapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);

 		SimpleModule jsonModule = new SimpleModule();
 		jsonModule.setSerializerModifier(createJsonSerializerModifier());
@@ -167,19 +145,25 @@ public class WebClientTransportClientFactory implements TransportClientFactory {
 		return objectMapper;
 	}

-	@Deprecated // reduce visibility in future release
-	public static BeanSerializerModifier createJsonSerializerModifier() {
-		return new BeanSerializerModifier() {
-			@Override
-			public JsonSerializer<?> modifySerializer(SerializationConfig config,
-					BeanDescription beanDesc, JsonSerializer<?> serializer) {
-				if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) {
-					return new InstanceInfoJsonBeanSerializer(
-							(BeanSerializerBase) serializer, false);
-				}
-				return serializer;
+	// Skip over 4xx http errors
+	private ExchangeFilterFunction http4XxErrorExchangeFilterFunction() {
+		return ExchangeFilterFunction.ofResponseProcessor(clientResponse -> {
+			// literally 400 pass the tests, not 4xxClientError
+			if (clientResponse.statusCode().value() == 400) {
+				ClientResponse newResponse = clientResponse.mutate().statusCode(HttpStatus.OK).build();
+				newResponse.body((clientHttpResponse, context) -> clientHttpResponse.getBody());
+				return Mono.just(newResponse);
 			}
-		};
+			if (clientResponse.statusCode().equals(HttpStatus.NOT_FOUND)) {
+				ClientResponse newResponse = clientResponse.mutate()
+					.statusCode(clientResponse.statusCode())
+					// ignore body on 404 for heartbeat, see gh-4145
+					.body(Flux.empty())
+					.build();
+				return Mono.just(newResponse);
+			}
+			return Mono.just(clientResponse);
+		});
 	}

 	@Override
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,10 +16,9 @@

 package org.springframework.cloud.netflix.eureka.loadbalancer;

-import javax.annotation.PostConstruct;
-
 import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.discovery.EurekaClientConfig;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -45,8 +44,7 @@ import static org.springframework.cloud.netflix.eureka.loadbalancer.LoadBalancer
@ConditionalOnBean({ LoadBalancerZoneConfig.class, EurekaLoadBalancerProperties.class })
 public class EurekaLoadBalancerClientConfiguration {

-	private static final Log LOG = LogFactory
-			.getLog(EurekaLoadBalancerClientConfiguration.class);
+	private static final Log LOG = LogFactory.getLog(EurekaLoadBalancerClientConfiguration.class);

 	private final EurekaClientConfig clientConfig;

@@ -56,10 +54,8 @@ public class EurekaLoadBalancerClientConfiguration {

 	private final EurekaLoadBalancerProperties eurekaLoadBalancerProperties;

-	public EurekaLoadBalancerClientConfiguration(
-			@Autowired(required = false) EurekaClientConfig clientConfig,
-			@Autowired(required = false) EurekaInstanceConfig eurekaInstanceConfig,
-			LoadBalancerZoneConfig zoneConfig,
+	public EurekaLoadBalancerClientConfiguration(@Autowired(required = false) EurekaClientConfig clientConfig,
+			@Autowired(required = false) EurekaInstanceConfig eurekaInstanceConfig, LoadBalancerZoneConfig zoneConfig,
 			EurekaLoadBalancerProperties eurekaLoadBalancerProperties) {
 		this.clientConfig = clientConfig;
 		this.eurekaConfig = eurekaInstanceConfig;
@@ -69,11 +65,11 @@ public class EurekaLoadBalancerClientConfiguration {

 	@PostConstruct
 	public void postprocess() {
-		if (!StringUtils.isEmpty(zoneConfig.getZone())) {
+		if (StringUtils.hasText(zoneConfig.getZone())) {
 			return;
 		}
 		String zone = getZoneFromEureka();
-		if (!StringUtils.isEmpty(zone)) {
+		if (StringUtils.hasText(zone)) {
 			if (LOG.isDebugEnabled()) {
 				LOG.debug("Setting the value of '" + LOADBALANCER_ZONE + "' to " + zone);
 			}
@@ -83,17 +79,14 @@ public class EurekaLoadBalancerClientConfiguration {

 	private String getZoneFromEureka() {
 		String zone;
-		boolean approximateZoneFromHostname = eurekaLoadBalancerProperties
-				.isApproximateZoneFromHostname();
+		boolean approximateZoneFromHostname = eurekaLoadBalancerProperties.isApproximateZoneFromHostname();
 		if (approximateZoneFromHostname && eurekaConfig != null) {
 			return ZoneUtils.extractApproximateZone(this.eurekaConfig.getHostName(false));
 		}
 		else {
-			zone = eurekaConfig == null ? null
-					: eurekaConfig.getMetadataMap().get("zone");
-			if (StringUtils.isEmpty(zone) && clientConfig != null) {
-				String[] zones = clientConfig
-						.getAvailabilityZones(clientConfig.getRegion());
+			zone = eurekaConfig == null ? null : eurekaConfig.getMetadataMap().get("zone");
+			if (!StringUtils.hasText(zone) && clientConfig != null) {
+				String[] zones = clientConfig.getAvailabilityZones(clientConfig.getRegion());
 				// Pick the first one from the regions we want to connect to
 				zone = zones != null && zones.length > 0 ? zones[0] : null;
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -34,29 +34,27 @@ public class DefaultManagementMetadataProvider implements ManagementMetadataProv

 	private static final int RANDOM_PORT = 0;

-	private static final Log log = LogFactory
-			.getLog(DefaultManagementMetadataProvider.class);
+	private static final Log log = LogFactory.getLog(DefaultManagementMetadataProvider.class);

 	@Override
-	public ManagementMetadata get(EurekaInstanceConfigBean instance, int serverPort,
-			String serverContextPath, String managementContextPath,
-			Integer managementPort) {
+	public ManagementMetadata get(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
+			String managementContextPath, Integer managementPort) {
 		if (isRandom(managementPort)) {
 			return null;
 		}
 		if (managementPort == null && isRandom(serverPort)) {
 			return null;
 		}
-		String healthCheckUrl = getHealthCheckUrl(instance, serverPort, serverContextPath,
-				managementContextPath, managementPort, false);
-		String statusPageUrl = getStatusPageUrl(instance, serverPort, serverContextPath,
-				managementContextPath, managementPort);
+		String healthCheckUrl = getHealthCheckUrl(instance, serverPort, serverContextPath, managementContextPath,
+				managementPort, false);
+		String statusPageUrl = getStatusPageUrl(instance, serverPort, serverContextPath, managementContextPath,
+				managementPort);

-		ManagementMetadata metadata = new ManagementMetadata(healthCheckUrl,
-				statusPageUrl, managementPort == null ? serverPort : managementPort);
+		ManagementMetadata metadata = new ManagementMetadata(healthCheckUrl, statusPageUrl,
+				managementPort == null ? serverPort : managementPort);
 		if (instance.isSecurePortEnabled()) {
-			metadata.setSecureHealthCheckUrl(getHealthCheckUrl(instance, serverPort,
-					serverContextPath, managementContextPath, managementPort, true));
+			metadata.setSecureHealthCheckUrl(getHealthCheckUrl(instance, serverPort, serverContextPath,
+					managementContextPath, managementPort, true));
 		}
 		return metadata;
 	}
@@ -65,41 +63,36 @@ public class DefaultManagementMetadataProvider implements ManagementMetadataProv
 		return port != null && port == RANDOM_PORT;
 	}

-	protected String getHealthCheckUrl(EurekaInstanceConfigBean instance, int serverPort,
-			String serverContextPath, String managementContextPath,
-			Integer managementPort, boolean isSecure) {
+	protected String getHealthCheckUrl(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
+			String managementContextPath, Integer managementPort, boolean isSecure) {
 		String healthCheckUrlPath = instance.getHealthCheckUrlPath();
-		String healthCheckUrl = getUrl(instance, serverPort, serverContextPath,
-				managementContextPath, managementPort, healthCheckUrlPath, isSecure);
+		String healthCheckUrl = getUrl(instance, serverPort, serverContextPath, managementContextPath, managementPort,
+				healthCheckUrlPath, isSecure);
 		log.debug("Constructed eureka meta-data healthcheckUrl: " + healthCheckUrl);
 		return healthCheckUrl;
 	}

-	public String getStatusPageUrl(EurekaInstanceConfigBean instance, int serverPort,
-			String serverContextPath, String managementContextPath,
-			Integer managementPort) {
+	public String getStatusPageUrl(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
+			String managementContextPath, Integer managementPort) {
 		String statusPageUrlPath = instance.getStatusPageUrlPath();
-		String statusPageUrl = getUrl(instance, serverPort, serverContextPath,
-				managementContextPath, managementPort, statusPageUrlPath, false);
+		String statusPageUrl = getUrl(instance, serverPort, serverContextPath, managementContextPath, managementPort,
+				statusPageUrlPath, false);
 		log.debug("Constructed eureka meta-data statusPageUrl: " + statusPageUrl);
 		return statusPageUrl;
 	}

-	private String getUrl(EurekaInstanceConfigBean instance, int serverPort,
-			String serverContextPath, String managementContextPath,
-			Integer managementPort, String urlPath, boolean isSecure) {
-		managementContextPath = refineManagementContextPath(serverContextPath,
-				managementContextPath, managementPort);
+	private String getUrl(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
+			String managementContextPath, Integer managementPort, String urlPath, boolean isSecure) {
+		managementContextPath = refineManagementContextPath(serverContextPath, managementContextPath, managementPort);
 		if (managementPort == null) {
 			managementPort = serverPort;
 		}
 		String scheme = isSecure ? "https" : "http";
-		return constructValidUrl(scheme, instance.getHostname(), managementPort,
-				managementContextPath, urlPath);
+		return constructValidUrl(scheme, instance.getHostname(), managementPort, managementContextPath, urlPath);
 	}

-	private String refineManagementContextPath(String serverContextPath,
-			String managementContextPath, Integer managementPort) {
+	private String refineManagementContextPath(String serverContextPath, String managementContextPath,
+			Integer managementPort) {
 		// management context path is relative to server context path when no management
 		// port is set
 		if (managementContextPath != null && managementPort == null) {
@@ -114,21 +107,18 @@ public class DefaultManagementMetadataProvider implements ManagementMetadataProv
 		return serverContextPath;
 	}

-	private String constructValidUrl(String scheme, String hostname, int port,
-			String contextPath, String statusPath) {
+	private String constructValidUrl(String scheme, String hostname, int port, String contextPath, String statusPath) {
 		try {
 			if (!contextPath.endsWith("/")) {
 				contextPath = contextPath + "/";
 			}
-			String refinedContextPath = '/'
-					+ StringUtils.trimLeadingCharacter(contextPath, '/');
+			String refinedContextPath = '/' + StringUtils.trimLeadingCharacter(contextPath, '/');
 			URL base = new URL(scheme, hostname, port, refinedContextPath);
 			String refinedStatusPath = refinedStatusPath(statusPath, contextPath);
 			return new URL(base, refinedStatusPath).toString();
 		}
 		catch (MalformedURLException e) {
-			String message = getErrorMessage(scheme, hostname, port, contextPath,
-					statusPath);
+			String message = getErrorMessage(scheme, hostname, port, contextPath, statusPath);
 			throw new IllegalStateException(message, e);
 		}
 	}
@@ -140,11 +130,10 @@ public class DefaultManagementMetadataProvider implements ManagementMetadataProv
 		return StringUtils.trimLeadingCharacter(statusPath, '/');
 	}

-	private String getErrorMessage(String scheme, String hostname, int port,
-			String contextPath, String statusPath) {
+	private String getErrorMessage(String scheme, String hostname, int port, String contextPath, String statusPath) {
 		return String.format(
-				"Failed to construct url for scheme: %s, hostName: %s port: %s contextPath: %s statusPath: %s",
-				scheme, hostname, port, contextPath, statusPath);
+				"Failed to construct url for scheme: %s, hostName: %s port: %s contextPath: %s statusPath: %s", scheme,
+				hostname, port, contextPath, statusPath);
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -34,8 +34,7 @@ public class ManagementMetadata {

 	private String secureHealthCheckUrl;

-	public ManagementMetadata(String healthCheckUrl, String statusPageUrl,
-			Integer managementPort) {
+	public ManagementMetadata(String healthCheckUrl, String statusPageUrl, Integer managementPort) {
 		this.healthCheckUrl = healthCheckUrl;
 		this.statusPageUrl = statusPageUrl;
 		this.managementPort = managementPort;
@@ -71,8 +70,7 @@ public class ManagementMetadata {
 			return false;
 		}
 		ManagementMetadata that = (ManagementMetadata) o;
-		return Objects.equals(healthCheckUrl, that.healthCheckUrl)
-				&& Objects.equals(statusPageUrl, that.statusPageUrl)
+		return Objects.equals(healthCheckUrl, that.healthCheckUrl) && Objects.equals(statusPageUrl, that.statusPageUrl)
 				&& Objects.equals(managementPort, that.managementPort);
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,8 +25,7 @@ import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
 */
 public interface ManagementMetadataProvider {

-	ManagementMetadata get(EurekaInstanceConfigBean instance, int serverPort,
-			String serverContextPath, String managementContextPath,
-			Integer managementPort);
+	ManagementMetadata get(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
+			String managementContextPath, Integer managementPort);

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -39,8 +39,7 @@ public class EurekaReactiveDiscoveryClient implements ReactiveDiscoveryClient {

 	private final EurekaClientConfig clientConfig;

-	public EurekaReactiveDiscoveryClient(EurekaClient eurekaClient,
-			EurekaClientConfig clientConfig) {
+	public EurekaReactiveDiscoveryClient(EurekaClient eurekaClient, EurekaClientConfig clientConfig) {
 		this.eurekaClient = eurekaClient;
 		this.clientConfig = clientConfig;
 	}
@@ -52,18 +51,17 @@ public class EurekaReactiveDiscoveryClient implements ReactiveDiscoveryClient {

 	@Override
 	public Flux<ServiceInstance> getInstances(String serviceId) {
-		return Flux
-				.defer(() -> Flux.fromIterable(
-						eurekaClient.getInstancesByVipAddress(serviceId, false)))
-				.map(EurekaServiceInstance::new);
+		return Flux.defer(() -> Flux.fromIterable(eurekaClient.getInstancesByVipAddress(serviceId, false)))
+			.map(EurekaServiceInstance::new);
 	}

 	@Override
 	public Flux<String> getServices() {
 		return Flux.defer(() -> Mono.justOrEmpty(eurekaClient.getApplications()))
-				.flatMapIterable(Applications::getRegisteredApplications)
-				.filter(application -> !application.getInstances().isEmpty())
-				.map(Application::getName).map(String::toLowerCase);
+			.flatMapIterable(Applications::getRegisteredApplications)
+			.filter(application -> !application.getInstances().isEmpty())
+			.map(Application::getName)
+			.map(String::toLowerCase);
 	}

 	@Override
--- a/Show More
+++ b/Show More