Update SNAPSHOT to 3.1.8

Bump actions/setup-java from 3 to 4 (#4231 )
Adjust checkstyle settings.
2026-09-20 00:59:01 +00:00 · 2023-12-18 23:20:52 +00:00 · 2023-12-04 17:58:13 +01:00 · 2023-11-13 14:14:00 +01:00 · 2023-11-13 14:08:05 +01:00 · 2023-11-09 18:55:51 +01:00
97 changed files with 1160 additions and 880 deletions
@@ -1,47 +0,0 @@
-version: 2
-jobs:
-  build:
-    machine:
-      image: "ubuntu-2004:202201-02"
-    environment:
-      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
-      TERM: dumb
-    branches:
-      ignore:
-        - gh-pages # list of branches to ignore
-    steps:
-      - run:
-          name: Install OpenJDK 17
-          command: |
-            wget -qO - https://adoptium.jfrog.io/adoptium/api/gpg/key/public | sudo apt-key add -
-            sudo add-apt-repository --yes https://adoptium.jfrog.io/adoptium/deb/
-            sudo apt-get update && sudo apt-get install temurin-17-jdk
-            sudo update-alternatives --set java /usr/lib/jvm/temurin-17-jdk-amd64/bin/java
-            sudo update-alternatives --set javac /usr/lib/jvm/temurin-17-jdk-amd64/bin/javac
-            java -version
-      - checkout
-      - restore_cache:
-          key: sc-netflix-{{ .Branch }}
-      - run:
-          name: "Download dependencies"
-          command: ./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
@@ -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: [ 3.1.x ]
+  pull_request:
+    branches: [ 3.1.x ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: ["8"]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java }}
+          cache: 'maven'
+      - name: Build with Maven
+        run: ./mvnw clean install -B -U -P sonar
+      - uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: false
@@ -1,3 +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
+java=8.0.292.hs-adpt
@@ -21,9 +21,9 @@ Edit the files in the src/main/asciidoc/ directory instead.
 :sc-ext: java
 :project-full-name: Spring Cloud Netflix

-image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/main.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/main"]
-image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main"]
+image::https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml/badge.svg?branch=3.1.x&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/3.1.x/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-netflix/tree/3.1.x"]

 :doctype: book
 :idprefix:
@@ -56,8 +56,7 @@ patterns provided include Service Discovery (Eureka).

 == Building

-
-:jdkversion: 17
+:jdkversion: 1.8

 === Basic Compile and Test

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-RC3</version>
+		<version>3.1.8</version>
 	</parent>
 	<artifactId>spring-cloud-netflix-docs</artifactId>
 	<packaging>jar</packaging>
@@ -1,8 +1,8 @@
 include::_attributes.adoc[]

-image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/main.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/main"]
-image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main"]
+image::https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml/badge.svg?branch=3.1.x&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/3.1.x/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-netflix/tree/3.1.x"]

 include::intro.adoc[]

@@ -14,14 +14,14 @@ include::intro.adoc[]

 == Building

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building-jdk8.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building-jdk8.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

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing.adoc[]

 == License

@@ -2,7 +2,7 @@
 |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 {@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-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.
@@ -14,7 +14,6 @@
 |eureka.client.register-with-eureka | `+++true+++` | Indicates whether or not this instance should register its information with eureka server for discovery by others. In some cases, you do not want your instances to be discovered whereas you just want do discover other instances.
 |eureka.server.peer-eureka-nodes-update-interval-ms | `+++0+++` | 
 |eureka.server.peer-eureka-status-refresh-time-interval-ms | `+++0+++` | 
-|ribbon.eureka.enabled | `+++true+++` | Enables the use of Eureka with Ribbon.
 |spring.cloud.loadbalancer.eureka.approximate-zone-from-hostname | `+++false+++` | Used to determine whether we should try to get the `zone` value from host name.

 |===
@@ -112,6 +112,19 @@ NOTE: Because of a limitation in Eureka, it is not possible to support per-serve

 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 infinite. 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.
@@ -294,7 +307,7 @@ The following example shows the dependencies you need to add:

 You need not use the raw Netflix `EurekaClient`.
 Also, it is usually more convenient to use it behind a wrapper of some sort.
-Spring Cloud has support for <<spring-cloud-feign, Feign>> (a REST client builder) and <<spring-cloud-ribbon, Spring `RestTemplate`>> through the logical Eureka service identifiers (VIPs) instead of physical URLs.
+Spring Cloud has support for <<spring-cloud-feign, Feign>> (a REST client builder) and https://docs.spring.io/spring-cloud-commons/docs/3.1.7/reference/html/#spring-cloud-loadbalancer[Spring Cloud LoadBalancer] through the logical Eureka service identifiers (VIPs) instead of physical URLs.

 You can also use the `org.springframework.cloud.client.discovery.DiscoveryClient`, which provides a simple API (not specific to Netflix) for discovery clients, as shown in the following example:

@@ -366,12 +379,6 @@ 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`
-
 [[spring-cloud-eureka-server]]
 == Service Discovery: Eureka Server

@@ -597,10 +604,6 @@ 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.
-
 == Configuration properties

 To see the list of all Spring Cloud Netflix related configuration properties please check link:appendix.html[the Appendix page].
@@ -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>4.0.0-RC3</version>
+	<version>3.1.8</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>4.0.0-RC3</version>
+		<version>3.1.9</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -21,17 +21,18 @@
 	</scm>
 	<properties>
 		<bintray.package>netflix</bintray.package>
-		<spring-cloud-commons.version>4.0.0-RC3</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.0.0-RC3</spring-cloud-config.version>
+		<spring-cloud-commons.version>3.1.8</spring-cloud-commons.version>
+		<spring-cloud-config.version>3.1.9</spring-cloud-config.version>
+		<testcontainers.version>1.17.6</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.4</eureka-jersey.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>
@@ -57,6 +58,14 @@
 					</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>
@@ -114,7 +123,48 @@
 				<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>
 			<!-- 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>
@@ -165,23 +215,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<!-- FIXME: 4.0 -->
-				<repository>
-					<id>netflix-snapshots</id>
-					<name>Netflix Snapshots</name>
-					<url>https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-snapshots</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>netflix-candidates</id>
-					<name>Netflix Candidates</name>
-					<url>https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>
@@ -5,16 +5,16 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.0.0-RC3</version>
+		<version>3.1.9</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-netflix-dependencies</artifactId>
-	<version>4.0.0-RC3</version>
+	<version>3.1.8</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-netflix-dependencies</name>
 	<description>Spring Cloud Netflix Dependencies</description>
 	<properties>
-		<eureka.version>2.0.0-rc.4</eureka.version>
+		<eureka.version>1.10.18</eureka.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -112,23 +112,6 @@
 					</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>
-				<!-- FIXME: 4.0 -->
-				<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>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-RC3</version>
+		<version>3.1.8</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-client-tls-tests</artifactId>
@@ -82,11 +82,6 @@
 			<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>
@@ -120,6 +115,12 @@
 					</excludes>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
@@ -22,15 +22,15 @@ 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;
+import org.springframework.util.SocketUtils;

 public class AppRunner implements AutoCloseable {

-	private final Class<?> appClass;
+	private Class<?> appClass;

-	private final Map<String, String> props;
+	private Map<String, String> props;

 	private ConfigurableApplicationContext app;

@@ -56,7 +56,7 @@ public class AppRunner implements AutoCloseable {
 	}

 	private int availabeTcpPort() {
-		return TestSocketUtils.findAvailableTcpPort();
+		return SocketUtils.findAvailableTcpPort();
 	}

 	private String[] props() {
@@ -56,7 +56,6 @@ abstract class BaseCertTest {
 	protected BaseCertTest() {
 	}

-	@SuppressWarnings("rawtypes")
 	static EurekaServerRunner startEurekaServer(Class config) {
 		EurekaServerRunner server = new EurekaServerRunner(config);
 		server.enableTls();
@@ -71,7 +70,6 @@ abstract class BaseCertTest {
 		server.stop();
 	}

-	@SuppressWarnings("rawtypes")
 	static EurekaClientRunner startService(EurekaServerRunner server, Class config) {
 		EurekaClientRunner service = new EurekaClientRunner(config, server, "testservice");
 		enableTlsClient(service);
@@ -155,7 +153,9 @@ abstract class BaseCertTest {
 		EurekaClientRunner client = createEurekaClient();
 		enableTlsClient(client);
 		client.setKeyStore(clientCert, WRONG_PASSWORD, WRONG_PASSWORD);
-		Assertions.assertThrows(BeanCreationException.class, client::start);
+		Assertions.assertThrows(BeanCreationException.class, () -> {
+			client.start();
+		});
 	}

 	@Test
@@ -163,7 +163,9 @@ abstract class BaseCertTest {
 		EurekaClientRunner client = createEurekaClient();
 		enableTlsClient(client);
 		client.setKeyStore(new File("nonExistFile"));
-		Assertions.assertThrows(BeanCreationException.class, client::start);
+		Assertions.assertThrows(BeanCreationException.class, () -> {
+			client.start();
+		});
 	}

 	@Test
@@ -181,7 +183,7 @@ abstract class BaseCertTest {
 	}

 	private static File saveCert(KeyAndCert keyCert) throws Exception {
-		return saveKeyStore(keyCert.subject(), keyCert::storeCert);
+		return saveKeyStore(keyCert.subject(), () -> keyCert.storeCert());
 	}

 	private static File saveKeyStore(String prefix, KeyStoreSupplier func) throws Exception {
@@ -72,13 +72,13 @@ public class EurekaClientRunner extends AppRunner {
 	}

 	public void waitServiceViaEureka(int seconds) {
-		assertInSeconds(this::foundServiceViaEureka, seconds);
+		assertInSeconds(() -> foundServiceViaEureka(), seconds);
 	}

 	private void assertInSeconds(BooleanSupplier assertion, int seconds) {
 		long start = System.currentTimeMillis();
 		long limit = 1000L * seconds;
-		long duration;
+		long duration = 0;

 		do {
 			if (assertion.getAsBoolean()) {
@@ -98,9 +98,8 @@ public class EurekaClientRunner extends AppRunner {
 		return !discovery.getServices().isEmpty();
 	}

-	@SuppressWarnings("unchecked")
 	public AbstractDiscoveryClientOptionalArgs<Void> discoveryClientOptionalArgs() {
-		return getBean(AbstractDiscoveryClientOptionalArgs.class);
+		return this.getBean(AbstractDiscoveryClientOptionalArgs.class);
 	}

 }
@@ -16,6 +16,7 @@

 package org.springframework.cloud.netflix.eureka;

+import com.netflix.discovery.DiscoveryClient;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.BeforeAll;
@@ -24,6 +25,8 @@ import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;

+import static org.assertj.core.api.Assertions.assertThat;
+
 public class EurekaClientTest extends BaseCertTest {

 	private static final Log log = LogFactory.getLog(EurekaClientTest.class);
@@ -37,9 +40,8 @@ public class EurekaClientTest extends BaseCertTest {
 		server = startEurekaServer(EurekaClientTest.TestEurekaServer.class);
 		service = startService(server, EurekaClientTest.TestApp.class);
 		// Will use Jersey
-		// FIXME: 4.0
-		// assertThat(service.discoveryClientOptionalArgs())
-		// .isInstanceOf(DiscoveryClient.DiscoveryClientOptionalArgs.class);
+		assertThat(service.discoveryClientOptionalArgs())
+				.isInstanceOf(DiscoveryClient.DiscoveryClientOptionalArgs.class);
 		log.info("Successfully asserted that Jersey will be used");
 		waitForRegistration(() -> new EurekaClientTest().createEurekaClient());
 	}
@@ -25,9 +25,9 @@ import java.security.cert.X509Certificate;

 public class KeyAndCert {

-	private final KeyPair keyPair;
+	private KeyPair keyPair;

-	private final X509Certificate certificate;
+	private X509Certificate certificate;

 	public KeyAndCert(KeyPair keyPair, X509Certificate certificate) {
 		this.keyPair = keyPair;
@@ -51,7 +51,7 @@ public class KeyAndCert {
 	}

 	public String subject() {
-		String dn = certificate.getSubjectX500Principal().getName();
+		String dn = certificate.getSubjectDN().getName();
 		int index = dn.indexOf('=');
 		return dn.substring(index + 1);
 	}
@@ -56,7 +56,9 @@ public class KeyTool {

 	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);
+		KeyAndCert result = new KeyAndCert(keyPair, certificate);
+
+		return result;
 	}

 	public KeyPair createKeyPair() throws Exception {
@@ -1,12 +1,11 @@
 <?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>4.0.0-RC3</version>
+		<version>3.1.8</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-client</artifactId>
@@ -15,7 +14,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>
@@ -51,6 +50,43 @@
 		<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>
+				<exclusion>
+					<groupId>aopalliance</groupId>
+					<artifactId>aopalliance</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-core</artifactId>
+			<version>${eureka-jersey.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>${eureka-jersey.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.jersey.contribs</groupId>
+			<artifactId>jersey-apache-client4</artifactId>
+			<version>${eureka-jersey.version}</version>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.inject</groupId>
@@ -68,10 +104,6 @@
 			<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>
@@ -108,5 +140,20 @@
 			<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>
@@ -28,7 +28,6 @@ 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;

@@ -49,23 +48,22 @@ public class CloudEurekaClient extends DiscoveryClient {

 	private final AtomicLong cacheRefreshedCount = new AtomicLong(0);

-	private final ApplicationEventPublisher publisher;
+	private ApplicationEventPublisher publisher;

-	private final Field eurekaTransportField;
+	private Field eurekaTransportField;

-	private final ApplicationInfoManager applicationInfoManager;
+	private ApplicationInfoManager applicationInfoManager;

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

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

 	public CloudEurekaClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config,
-			TransportClientFactories transportClientFactories, AbstractDiscoveryClientOptionalArgs<?> args,
-			ApplicationEventPublisher publisher) {
-		super(applicationInfoManager, config, transportClientFactories, args);
+			AbstractDiscoveryClientOptionalArgs<?> args, ApplicationEventPublisher publisher) {
+		super(applicationInfoManager, config, args);
 		this.applicationInfoManager = applicationInfoManager;
 		this.publisher = publisher;
 		this.eurekaTransportField = ReflectionUtils.findField(DiscoveryClient.class, "eurekaTransport");
@@ -0,0 +1,42 @@
+/*
+ * 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;
+
+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 {
+
+}
@@ -24,36 +24,14 @@ 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;
@@ -89,7 +67,6 @@ 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;
@@ -116,7 +93,7 @@ import static org.springframework.cloud.commons.util.IdUtils.getDefaultInstanceI
 		"org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration" })
 public class EurekaClientAutoConfiguration {

-	private final ConfigurableEnvironment env;
+	private ConfigurableEnvironment env;

 	public EurekaClientAutoConfiguration(ConfigurableEnvironment env) {
 		this.env = env;
@@ -262,9 +239,8 @@ public class EurekaClientAutoConfiguration {

 		@Bean(destroyMethod = "shutdown")
 		@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);
+		public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config) {
+			return new CloudEurekaClient(manager, config, this.optionalArgs, this.context);
 		}

 		@Bean
@@ -301,8 +277,7 @@ public class EurekaClientAutoConfiguration {
 		@org.springframework.cloud.context.config.annotation.RefreshScope
 		@Lazy
 		public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config,
-				EurekaInstanceConfig instance, TransportClientFactories<?> transportClientFactories,
-				@Autowired(required = false) HealthCheckHandler healthCheckHandler) {
+				EurekaInstanceConfig instance, @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
@@ -317,8 +292,8 @@ public class EurekaClientAutoConfiguration {
 			else {
 				appManager = manager;
 			}
-			CloudEurekaClient cloudEurekaClient = new CloudEurekaClient(appManager, config, transportClientFactories,
-					this.optionalArgs, this.context);
+			CloudEurekaClient cloudEurekaClient = new CloudEurekaClient(appManager, config, this.optionalArgs,
+					this.context);
 			cloudEurekaClient.registerHealthCheck(healthCheckHandler);
 			return cloudEurekaClient;
 		}
@@ -401,80 +376,3 @@ 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));
-	}
-
-}
@@ -25,7 +25,6 @@ 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;
@@ -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
-	 * {@link HttpClient} and this setting affects the actual connection creation and also
-	 * the wait time to get the connection from the pool.
+	 * 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.
 	 */
 	private int eurekaServerConnectTimeoutSeconds = 5;

 	/**
 	 * 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
+	 * registry information as a fall back option for only the first time when the eureka
 	 * client starts.
 	 *
 	 * This may be needed for applications which needs additional resiliency for registry
@@ -473,7 +472,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		if (serviceUrls == null || serviceUrls.isEmpty()) {
 			serviceUrls = this.serviceUrl.get(DEFAULT_ZONE);
 		}
-		if (StringUtils.hasText(serviceUrls)) {
+		if (!StringUtils.isEmpty(serviceUrls)) {
 			final String[] serviceUrlsSplit = StringUtils.commaDelimitedListToStringArray(serviceUrls);
 			List<String> eurekaServiceUrls = new ArrayList<>(serviceUrlsSplit.length);
 			for (String eurekaServiceUrl : serviceUrlsSplit) {
@@ -67,7 +67,7 @@ import org.springframework.util.Assert;
 public class EurekaHealthCheckHandler
 		implements HealthCheckHandler, ApplicationContextAware, InitializingBean, Ordered, Lifecycle {

-	private static final Map<Status, InstanceInfo.InstanceStatus> STATUS_MAPPING = new HashMap<>() {
+	private static final Map<Status, InstanceInfo.InstanceStatus> STATUS_MAPPING = new HashMap<Status, InstanceInfo.InstanceStatus>() {
 		{
 			put(Status.UNKNOWN, InstanceStatus.UNKNOWN);
 			put(Status.OUT_OF_SERVICE, InstanceStatus.DOWN);
@@ -76,18 +76,18 @@ public class EurekaHealthCheckHandler
 		}
 	};

-	private final StatusAggregator statusAggregator;
+	private StatusAggregator statusAggregator;

 	private ApplicationContext applicationContext;

-	private final Map<String, HealthContributor> healthContributors = new HashMap<>();
+	private 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<>();
+	private Map<String, ReactiveHealthContributor> reactiveHealthContributors = new HashMap<>();

 	public EurekaHealthCheckHandler(StatusAggregator statusAggregator) {
 		this.statusAggregator = statusAggregator;
@@ -110,7 +110,8 @@ public class EurekaHealthCheckHandler
 		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 indicator) {
+			if (entry.getValue() instanceof DiscoveryCompositeHealthContributor) {
+				DiscoveryCompositeHealthContributor indicator = (DiscoveryCompositeHealthContributor) entry.getValue();
 				indicator.getIndicators().forEach((name, discoveryHealthIndicator) -> {
 					if (!(discoveryHealthIndicator instanceof EurekaHealthIndicator)) {
 						this.healthContributors.put(name, (HealthIndicator) discoveryHealthIndicator::health);
@@ -92,7 +92,7 @@ public class EurekaHealthIndicator implements DiscoveryHealthIndicator {
 		if (AopUtils.isAopProxy(eurekaClient)) {
 			discoveryClient = ProxyUtils.getTargetObject(eurekaClient);
 		}
-		else if (eurekaClient instanceof DiscoveryClient) {
+		else if (DiscoveryClient.class.isInstance(eurekaClient)) {
 			discoveryClient = (DiscoveryClient) eurekaClient;
 		}
 		return discoveryClient;
@@ -25,7 +25,6 @@ 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;
@@ -286,7 +285,6 @@ public class EurekaInstanceConfigBean implements CloudEurekaInstanceConfig, Envi
 	private EurekaInstanceConfigBean() {
 	}

-	@Autowired
 	public EurekaInstanceConfigBean(InetUtils inetUtils) {
 		this.inetUtils = inetUtils;
 		this.hostInfo = this.inetUtils.findFirstNonLoopbackHostInfo();
@@ -607,7 +605,7 @@ public class EurekaInstanceConfigBean implements CloudEurekaInstanceConfig, Envi
 				leaseExpirationDurationInSeconds, virtualHostName, instanceId, secureVirtualHostName, aSGName,
 				metadataMap, dataCenterInfo, ipAddress, statusPageUrlPath, statusPageUrl, homePageUrlPath, homePageUrl,
 				healthCheckUrlPath, healthCheckUrl, secureHealthCheckUrl, namespace, hostname, preferIpAddress,
-				initialStatus, Arrays.hashCode(defaultAddressResolutionOrder), environment);
+				initialStatus, defaultAddressResolutionOrder, environment);
 	}

 	@Override
@@ -39,7 +39,7 @@ import static com.netflix.appinfo.InstanceInfo.PortType.SECURE;
 */
 public class EurekaServiceInstance implements ServiceInstance {

-	private final InstanceInfo instance;
+	private InstanceInfo instance;

 	public EurekaServiceInstance(InstanceInfo instance) {
 		Assert.notNull(instance, "Service instance required");
@@ -16,24 +16,28 @@

 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
 */
-// FIXME: 4.0
-public class MutableDiscoveryClientOptionalArgs {
+public class MutableDiscoveryClientOptionalArgs extends DiscoveryClientOptionalArgs {

-} /*
-	 * 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; }
-	 *
-	 * }
-	 */
+	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,96 @@
+/*
+ * 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;
+
+import java.util.Objects;
+
+import org.apache.http.client.config.RequestConfig;
+
+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
+ * @since 3.1.6
+ */
+@ConfigurationProperties("eureka.client.rest-template-timeout")
+public class RestTemplateTimeoutProperties {
+
+	/**
+	 * Default values are set to -1 according to {@link RequestConfig .DEFAULT}.
+	 */
+	private int connectTimeout = -1;
+
+	private int connectRequestTimeout = -1;
+
+	private int socketTimeout = -1;
+
+	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 + '}';
+	}
+
+}
@@ -20,7 +20,6 @@ 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;

@@ -32,14 +31,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClas
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.configuration.SSLContextFactory;
 import org.springframework.cloud.configuration.TlsProperties;
+import org.springframework.cloud.netflix.eureka.MutableDiscoveryClientOptionalArgs;
+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.Configuration;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -48,6 +48,7 @@ import org.springframework.web.reactive.function.client.WebClient;
 * @author Daniel Lavoie
 */
@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties(RestTemplateTimeoutProperties.class)
 public class DiscoveryClientOptionalArgsConfiguration {

 	protected static final Log logger = LogFactory.getLog(DiscoveryClientOptionalArgsConfiguration.class);
@@ -75,38 +76,24 @@ public class DiscoveryClientOptionalArgsConfiguration {
 	}

 	@Bean
+	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
-	@ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter")
-	@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);
+	EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier(
+			RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
+		return new DefaultEurekaClientHttpRequestFactorySupplier(restTemplateTimeoutProperties);
 	}

 	@Bean
-	@ConditionalOnMissingBean
-	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
-	EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier() {
-		return new DefaultEurekaClientHttpRequestFactorySupplier();
+	@ConditionalOnClass(name = "com.sun.jersey.api.client.filter.ClientFilter")
+	@ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT)
+	public MutableDiscoveryClientOptionalArgs discoveryClientOptionalArgs(TlsProperties tlsProperties)
+			throws GeneralSecurityException, IOException {
+		logger.info("Eureka HTTP Client uses Jersey");
+		MutableDiscoveryClientOptionalArgs result = new MutableDiscoveryClientOptionalArgs();
+		setupTLS(result, tlsProperties);
+		return result;
 	}

-	// FIXME: 4.0
-	/*
-	 * @Bean
-	 *
-	 * @ConditionalOnClass(name = "com.sun.jersey.api.client.filter.ClientFilter")
-	 *
-	 * @ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, search
-	 * = SearchStrategy.CURRENT) public MutableDiscoveryClientOptionalArgs
-	 * discoveryClientOptionalArgs(TlsProperties tlsProperties) throws
-	 * GeneralSecurityException, IOException {
-	 * logger.info("Eureka HTTP Client uses Jersey"); MutableDiscoveryClientOptionalArgs
-	 * result = new MutableDiscoveryClientOptionalArgs(); setupTLS(result, tlsProperties);
-	 * return result; }
-	 */
-
 	private static void setupTLS(AbstractDiscoveryClientOptionalArgs<?> args, TlsProperties properties)
 			throws GeneralSecurityException, IOException {
 		if (properties.isEnabled()) {
@@ -136,13 +123,6 @@ public class DiscoveryClientOptionalArgsConfiguration {
 			return result;
 		}

-		@Bean
-		@ConditionalOnMissingBean(value = TransportClientFactories.class, search = SearchStrategy.CURRENT)
-		public WebClientTransportClientFactories webClientTransportClientFactories(
-				ObjectProvider<WebClient.Builder> builder) {
-			return new WebClientTransportClientFactories(builder::getIfAvailable);
-		}
-
 	}

 	@Configuration
@@ -16,9 +16,10 @@

 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;
@@ -17,12 +17,17 @@
 package org.springframework.cloud.netflix.eureka.config;

 import java.util.Collections;
+import java.util.List;

 import com.netflix.discovery.shared.transport.EurekaHttpClient;
+import org.apache.commons.logging.Log;

+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.client.ServiceInstance;
 import org.springframework.cloud.config.client.ConfigClientProperties;
 import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
 import org.springframework.cloud.configuration.TlsProperties;
@@ -39,35 +44,53 @@ public class EurekaConfigServerBootstrapper implements BootstrapRegistryInitiali
 		if (!ClassUtils.isPresent("org.springframework.cloud.config.client.ConfigServerInstanceProvider", null)) {
 			return;
 		}
-		registry.registerIfAbsent(EurekaClientConfigBean.class, context -> {
-			Binder binder = context.get(Binder.class);
-			if (!getDiscoveryEnabled(binder)) {
-				return null;
-			}

-			return binder.bind(EurekaClientConfigBean.PREFIX, EurekaClientConfigBean.class)
-					.orElseGet(EurekaClientConfigBean::new);
-		});
-
-		registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, context -> {
-			Binder binder = context.get(Binder.class);
-			if (!getDiscoveryEnabled(binder)) {
-				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, binder));
-			return new EurekaConfigServerInstanceProvider(httpClient, config)::getInstances;
-		});
+		// It is important that we pass a lambda for the Function or else we will get a
+		// ClassNotFoundException when config is not on the classpath
+		registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, EurekaFunction::create);
 	}

-	private Boolean getDiscoveryEnabled(Binder binder) {
+	private static Boolean getDiscoveryEnabled(Binder binder) {
 		return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false)
 				&& binder.bind("eureka.client.enabled", Boolean.class).orElse(true)
 				&& binder.bind("spring.cloud.discovery.enabled", Boolean.class).orElse(true);
 	}

+	final static class EurekaFunction implements ConfigServerInstanceProvider.Function {
+
+		private final BootstrapContext context;
+
+		static EurekaFunction create(BootstrapContext context) {
+			return new EurekaFunction(context);
+		}
+
+		private EurekaFunction(BootstrapContext context) {
+			this.context = context;
+		}
+
+		@Override
+		public List<ServiceInstance> apply(String serviceId, Binder binder, BindHandler bindHandler, Log log) {
+			if (binder == null || !getDiscoveryEnabled(binder)) {
+				return Collections.emptyList();
+			}
+
+			EurekaClientConfigBean config = binder.bind(EurekaClientConfigBean.PREFIX, EurekaClientConfigBean.class)
+					.orElseGet(EurekaClientConfigBean::new);
+			EurekaHttpClient httpClient = new RestTemplateTransportClientFactory(
+					context.getOrElse(TlsProperties.class, null),
+					context.getOrElse(EurekaClientHttpRequestFactorySupplier.class,
+							new DefaultEurekaClientHttpRequestFactorySupplier()))
+									.newClient(HostnameBasedUrlRandomizer.randomEndpoint(config, binder));
+			return new EurekaConfigServerInstanceProvider(httpClient, config).getInstances(serviceId);
+		}
+
+		@Override
+		public List<ServiceInstance> apply(String serviceId) {
+			// This should never be called now but is here for backward
+			// compatibility
+			return apply(serviceId, null, null, null);
+		}
+
+	}
+
 }
@@ -18,7 +18,6 @@ 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;

@@ -27,7 +26,7 @@ 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 {
+final class HostnameBasedUrlRandomizer implements EndpointUtils.ServiceUrlRandomizer {

 	private final String hostname;

@@ -57,18 +56,18 @@ public final class HostnameBasedUrlRandomizer implements EndpointUtils.ServiceUr
 		}
 	}

-	public static String getEurekaUrl(EurekaClientConfig config, String hostname) {
+	static String getEurekaUrl(EurekaClientConfigBean 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) {
+	static DefaultEndpoint randomEndpoint(EurekaClientConfigBean config, Environment env) {
 		String hostname = env.getProperty("eureka.instance.hostname");
 		return new DefaultEndpoint(getEurekaUrl(config, hostname));
 	}

-	public static DefaultEndpoint randomEndpoint(EurekaClientConfig config, Binder binder) {
+	static DefaultEndpoint randomEndpoint(EurekaClientConfigBean config, Binder binder) {
 		String hostname = binder.bind("eureka.instance.hostname", String.class).orElseGet(() -> null);
 		return new DefaultEndpoint(getEurekaUrl(config, hostname));
 	}
@@ -19,13 +19,12 @@ package org.springframework.cloud.netflix.eureka.http;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

-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.http.client.config.RequestConfig;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;

+import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.lang.Nullable;
@@ -35,35 +34,49 @@ import org.springframework.lang.Nullable;
 * {@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) {
-			httpClientBuilder.setConnectionManager(buildConnectionManager(sslContext, hostnameVerifier));
+		HttpClientBuilder httpClientBuilder = HttpClients.custom();
+		if (sslContext != null) {
+			httpClientBuilder = httpClientBuilder.setSSLContext(sslContext);
 		}
+		if (hostnameVerifier != null) {
+			httpClientBuilder = httpClientBuilder.setSSLHostnameVerifier(hostnameVerifier);
+		}
+		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) {
-		SSLConnectionSocketFactoryBuilder sslConnectionSocketFactoryBuilder = SSLConnectionSocketFactoryBuilder
-				.create();
-		if (sslContext != null) {
-			sslConnectionSocketFactoryBuilder.setSslContext(sslContext);
-		}
-		if (hostnameVerifier != null) {
-			sslConnectionSocketFactoryBuilder.setHostnameVerifier(hostnameVerifier);
-		}
-		return PoolingHttpClientConnectionManagerBuilder.create()
-				.setSSLSocketFactory(sslConnectionSocketFactoryBuilder.build()).build();
+	private RequestConfig buildRequestConfig() {
+		return RequestConfig.custom().setConnectTimeout(restTemplateTimeoutProperties.getConnectTimeout())
+				.setConnectionRequestTimeout(restTemplateTimeoutProperties.getConnectRequestTimeout())
+				.setSocketTimeout(restTemplateTimeoutProperties.getSocketTimeout()).build();
 	}

 }
@@ -28,6 +28,16 @@ public class RestTemplateDiscoveryClientOptionalArgs extends AbstractDiscoveryCl
 	public RestTemplateDiscoveryClientOptionalArgs(
 			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) {
 		this.eurekaClientHttpRequestFactorySupplier = eurekaClientHttpRequestFactorySupplier;
+		setTransportClientFactories(new RestTemplateTransportClientFactories(this));
+	}
+
+	/**
+	 * @deprecated - use
+	 * {@link RestTemplateDiscoveryClientOptionalArgs#RestTemplateDiscoveryClientOptionalArgs(EurekaClientHttpRequestFactorySupplier)}
+	 */
+	@Deprecated
+	public RestTemplateDiscoveryClientOptionalArgs() {
+		this(new DefaultEurekaClientHttpRequestFactorySupplier());
 	}

 }
@@ -50,7 +50,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

 	protected final Log logger = LogFactory.getLog(getClass());

-	private final RestTemplate restTemplate;
+	private RestTemplate restTemplate;

 	private String serviceUrl;

@@ -77,7 +77,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 		ResponseEntity<Void> response = restTemplate.exchange(urlPath, HttpMethod.POST, new HttpEntity<>(info, headers),
 				Void.class);

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

 	@Override
@@ -86,7 +86,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

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

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

 	@Override
@@ -100,7 +100,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 				InstanceInfo.class);

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

 		if (response.hasBody()) {
 			eurekaResponseBuilder.entity(response.getBody());
@@ -117,7 +117,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

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

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

 	@Override
@@ -127,7 +127,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

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

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

 	@Override
@@ -145,7 +145,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 		ResponseEntity<EurekaApplications> response = restTemplate.exchange(url, HttpMethod.GET, null,
 				EurekaApplications.class);

-		return anEurekaHttpResponse(response.getStatusCode().value(),
+		return anEurekaHttpResponse(response.getStatusCodeValue(),
 				response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody()
 						? (Applications) response.getBody() : null).headers(headersOf(response)).build();
 	}
@@ -171,10 +171,10 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

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

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

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

 	@Override
@@ -193,8 +193,8 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 		ResponseEntity<InstanceInfo> response = restTemplate.exchange(urlPath, HttpMethod.GET, null,
 				InstanceInfo.class);

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

@@ -25,6 +25,7 @@ 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;

 /**
@@ -38,6 +39,12 @@ public class RestTemplateTransportClientFactories implements TransportClientFact
 		this.args = args;
 	}

+	@Override
+	public TransportClientFactory newTransportClientFactory(Collection<Void> additionalFilters,
+			EurekaJerseyClient providedJerseyClient) {
+		throw new UnsupportedOperationException();
+	}
+
 	@Override
 	public TransportClientFactory newTransportClientFactory(EurekaClientConfig clientConfig,
 			Collection<Void> additionalFilters, InstanceInfo myInstanceInfo) {
@@ -27,7 +27,7 @@ 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.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -44,7 +44,7 @@ import com.netflix.discovery.shared.transport.TransportClientFactory;

 import org.springframework.cloud.configuration.SSLContextFactory;
 import org.springframework.cloud.configuration.TlsProperties;
-import org.springframework.http.HttpStatusCode;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@@ -139,17 +139,16 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 	 * serialized or deserialized. Achived with
 	 * {@link SerializationFeature#WRAP_ROOT_VALUE} and
 	 * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}.
-	 * {@link PropertyNamingStrategies.SnakeCaseStrategy} is applied to the underlying
+	 * {@link PropertyNamingStrategy.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(PropertyNamingStrategies.SNAKE_CASE));
+		converter.setObjectMapper(new ObjectMapper().setPropertyNamingStrategy(PropertyNamingStrategy.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);
@@ -157,25 +156,10 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 		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);
-
 		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,
@@ -200,7 +184,7 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 	class ErrorHandler extends DefaultResponseErrorHandler {

 		@Override
-		protected boolean hasError(HttpStatusCode statusCode) {
+		protected boolean hasError(HttpStatus 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
@@ -29,6 +29,7 @@ import org.springframework.web.reactive.function.client.WebClient;
 public class WebClientDiscoveryClientOptionalArgs extends AbstractDiscoveryClientOptionalArgs<Void> {

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

 }
@@ -16,8 +16,6 @@

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

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

 import com.netflix.appinfo.InstanceInfo;
@@ -28,10 +26,12 @@ 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 reactor.core.publisher.Mono;

 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 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;
@@ -44,7 +44,7 @@ import static com.netflix.discovery.shared.transport.EurekaHttpResponse.anEureka
 */
 public class WebClientEurekaHttpClient implements EurekaHttpClient {

-	private final WebClient webClient;
+	private WebClient webClient;

 	public WebClientEurekaHttpClient(WebClient webClient) {
 		this.webClient = webClient;
@@ -52,16 +52,18 @@ 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))
+		return webClient.post().uri("apps/" + info.getAppName()).body(BodyInserters.fromValue(info))
 				.header(HttpHeaders.ACCEPT_ENCODING, "gzip")
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchange()
-				.map(response -> eurekaHttpResponse(response)).block();
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatus::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("apps/" + appName + '/' + id).retrieve()
+				.onStatus(HttpStatus::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse)
+				.block();
 	}

 	@Override
@@ -71,14 +73,15 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 				+ "&lastDirtyTimestamp=" + info.getLastDirtyTimestamp().toString()
 				+ (overriddenStatus != null ? "&overriddenstatus=" + overriddenStatus.name() : "");

-		ClientResponse response = webClient.put().uri(urlPath, InstanceInfo.class)
+		ResponseEntity<InstanceInfo> response = webClient.put().uri(urlPath)
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block();
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatus::isError, this::ignoreError).toEntity(InstanceInfo.class).block();

 		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);
@@ -94,9 +97,9 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 		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();
+		return webClient.put().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+				.retrieve().onStatus(HttpStatus::isError, this::ignoreError).toBodilessEntity()
+				.map(this::eurekaHttpResponse).block();
 	}

 	@Override
@@ -104,9 +107,9 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 		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();
+		return webClient.delete().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+				.retrieve().onStatus(HttpStatus::isError, this::ignoreError).toBodilessEntity()
+				.map(this::eurekaHttpResponse).block();
 	}

 	@Override
@@ -121,13 +124,14 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 			url = url + (urlPath.contains("?") ? "&" : "?") + "regions=" + StringUtil.join(regions);
 		}

-		ClientResponse response = webClient.get().uri(url, Applications.class)
+		ResponseEntity<Applications> response = webClient.get().uri(url)
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block();
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatus::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();
@@ -151,11 +155,12 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 	@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("apps/" + appName)
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatus::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;

@@ -173,11 +178,12 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 	}

 	private EurekaHttpResponse<InstanceInfo> getInstanceInternal(String urlPath) {
-		ClientResponse response = webClient.get().uri(urlPath, InstanceInfo.class)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block();
+		ResponseEntity<InstanceInfo> response = webClient.get().uri(urlPath)
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatus::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();
@@ -192,25 +198,19 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 		return this.webClient;
 	}

-	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().forEach(entry -> entry.getValue().forEach(v -> headers.put(entry.getKey(), v)));
-		return headers;
+	private Mono<? extends Throwable> ignoreError(ClientResponse response) {
+		return Mono.empty();
 	}

-	private int statusCodeValueOf(ClientResponse response) {
-		return response.statusCode().value();
+	private static Map<String, String> headersOf(ResponseEntity<?> response) {
+		return response.getHeaders().toSingleValueMap();
 	}

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

@@ -26,6 +26,7 @@ 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;
@@ -42,6 +43,12 @@ public class WebClientTransportClientFactories implements TransportClientFactori
 		this.builder = builder;
 	}

+	@Override
+	public TransportClientFactory newTransportClientFactory(Collection<Void> additionalFilters,
+			EurekaJerseyClient providedJerseyClient) {
+		throw new UnsupportedOperationException();
+	}
+
 	@Override
 	public TransportClientFactory newTransportClientFactory(EurekaClientConfig clientConfig,
 			Collection<Void> additionalFilters, InstanceInfo myInstanceInfo) {
@@ -24,7 +24,7 @@ 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.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -122,13 +122,13 @@ public class WebClientTransportClientFactory implements TransportClientFactory {
 	 * serialized or deserialized. Achieved with
 	 * {@link SerializationFeature#WRAP_ROOT_VALUE} and
 	 * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}.
-	 * {@link PropertyNamingStrategies.SnakeCaseStrategy} is applied to the underlying
+	 * {@link PropertyNamingStrategy.SnakeCaseStrategy} is applied to the underlying
 	 * {@link ObjectMapper}.
 	 * @return a {@link ObjectMapper} object
 	 */
 	private ObjectMapper objectMapper() {
 		ObjectMapper objectMapper = new ObjectMapper();
-		objectMapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
+		objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);

 		SimpleModule jsonModule = new SimpleModule();
 		jsonModule.setSerializerModifier(createJsonSerializerModifier());
@@ -147,7 +147,7 @@ public class WebClientTransportClientFactory implements TransportClientFactory {
 		return ExchangeFilterFunction.ofResponseProcessor(clientResponse -> {
 			// literally 400 pass the tests, not 4xxClientError
 			if (clientResponse.statusCode().value() == 400) {
-				ClientResponse newResponse = clientResponse.mutate().statusCode(HttpStatus.OK).build();
+				ClientResponse newResponse = ClientResponse.from(clientResponse).statusCode(HttpStatus.OK).build();
 				newResponse.body((clientHttpResponse, context) -> clientHttpResponse.getBody());
 				return Mono.just(newResponse);
 			}
@@ -16,9 +16,10 @@

 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;

@@ -65,11 +66,11 @@ public class EurekaLoadBalancerClientConfiguration {

 	@PostConstruct
 	public void postprocess() {
-		if (StringUtils.hasText(zoneConfig.getZone())) {
+		if (!StringUtils.isEmpty(zoneConfig.getZone())) {
 			return;
 		}
 		String zone = getZoneFromEureka();
-		if (StringUtils.hasText(zone)) {
+		if (!StringUtils.isEmpty(zone)) {
 			if (LOG.isDebugEnabled()) {
 				LOG.debug("Setting the value of '" + LOADBALANCER_ZONE + "' to " + zone);
 			}
@@ -85,7 +86,7 @@ public class EurekaLoadBalancerClientConfiguration {
 		}
 		else {
 			zone = eurekaConfig == null ? null : eurekaConfig.getMetadataMap().get("zone");
-			if (!StringUtils.hasText(zone) && clientConfig != null) {
+			if (StringUtils.isEmpty(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;
@@ -44,17 +44,17 @@ public class EurekaAutoServiceRegistration

 	private static final Log log = LogFactory.getLog(EurekaAutoServiceRegistration.class);

-	private final AtomicBoolean running = new AtomicBoolean(false);
+	private AtomicBoolean running = new AtomicBoolean(false);

-	private final int order = 0;
+	private int order = 0;

-	private final AtomicInteger port = new AtomicInteger(0);
+	private AtomicInteger port = new AtomicInteger(0);

-	private final ApplicationContext context;
+	private ApplicationContext context;

-	private final EurekaServiceRegistry serviceRegistry;
+	private EurekaServiceRegistry serviceRegistry;

-	private final EurekaRegistration registration;
+	private EurekaRegistration registration;

 	public EurekaAutoServiceRegistration(ApplicationContext context, EurekaServiceRegistry serviceRegistry,
 			EurekaRegistration registration) {
@@ -25,7 +25,6 @@ import com.netflix.appinfo.HealthCheckHandler;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -60,7 +59,7 @@ public class EurekaRegistration implements Registration {

 	private ObjectProvider<HealthCheckHandler> healthCheckHandler;

-	public EurekaRegistration(CloudEurekaInstanceConfig instanceConfig, EurekaClient eurekaClient,
+	private EurekaRegistration(CloudEurekaInstanceConfig instanceConfig, EurekaClient eurekaClient,
 			ApplicationInfoManager applicationInfoManager, ObjectProvider<HealthCheckHandler> healthCheckHandler) {
 		this.eurekaClient = eurekaClient;
 		this.instanceConfig = instanceConfig;
@@ -182,8 +181,6 @@ public class EurekaRegistration implements Registration {

 		private ApplicationEventPublisher publisher;

-		private TransportClientFactories<?> transportClientFactories;
-
 		Builder(CloudEurekaInstanceConfig instanceConfig) {
 			this.instanceConfig = instanceConfig;
 		}
@@ -203,11 +200,6 @@ public class EurekaRegistration implements Registration {
 			return this;
 		}

-		public Builder with(TransportClientFactories<?> transportClientFactories) {
-			this.transportClientFactories = transportClientFactories;
-			return this;
-		}
-
 		public Builder with(EurekaClientConfig clientConfig, ApplicationEventPublisher publisher) {
 			this.clientConfig = clientConfig;
 			this.publisher = publisher;
@@ -224,11 +216,9 @@ public class EurekaRegistration implements Registration {
 			if (this.eurekaClient == null) {
 				Assert.notNull(this.clientConfig, "if eurekaClient is null, EurekaClientConfig may not be null");
 				Assert.notNull(this.publisher, "if eurekaClient is null, ApplicationEventPublisher may not be null");
-				Assert.notNull(this.transportClientFactories,
-						"if eurekaClient is null, TransportClientFactories may not be null");

 				this.eurekaClient = new CloudEurekaClient(this.applicationInfoManager, this.clientConfig,
-						this.transportClientFactories, this.publisher);
+						this.publisher);
 			}
 			return new EurekaRegistration(instanceConfig, eurekaClient, applicationInfoManager, healthCheckHandler);
 		}
@@ -86,7 +86,6 @@ public class EurekaServiceRegistry implements ServiceRegistry<EurekaRegistration
 		registration.getEurekaClient().setStatus(newStatus, info);
 	}

-	@SuppressWarnings("unchecked")
 	@Override
 	public Object getStatus(EurekaRegistration registration) {
 		String appname = registration.getApplicationInfoManager().getInfo().getAppName();
@@ -12,24 +12,11 @@
      "description": "Determines whether the EurekaClient instance can be refreshed or not(If disabled none of the Eureka client properties will be refreshable).",
      "type": "java.lang.Boolean"
    },
-    {
-      "defaultValue": true,
-      "name": "ribbon.eureka.enabled",
-      "description": "Enables the use of Eureka with Ribbon.",
-      "type": "java.lang.Boolean"
-    },
    {
      "defaultValue": false,
      "name": "eureka.client.webclient.enabled",
      "description": "Enables the use of WebClient for Eureka HTTP Client.",
      "type": "java.lang.Boolean"
-    },
-    {
-      "defaultValue": 1,
-      "name": "eureka.instance.metadata-map.weight",
-      "description": "The weight of service instance for weighted load balancing.",
-      "type": "java.lang.Integer",
-      "sourceType": "org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean"
    }
  ]
 }
@@ -1,3 +1,11 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.netflix.eureka.config.EurekaClientConfigServerAutoConfiguration,\
+org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration,\
+org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration,\
+org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration,\
+org.springframework.cloud.netflix.eureka.reactive.EurekaReactiveDiscoveryClientConfiguration,\
+org.springframework.cloud.netflix.eureka.loadbalancer.LoadBalancerEurekaAutoConfiguration
+
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.netflix.eureka.config.EurekaConfigServerBootstrapConfiguration

@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.cloud.netflix.eureka.EurekaClientHints
@@ -1,6 +0,0 @@
-org.springframework.cloud.netflix.eureka.config.EurekaClientConfigServerAutoConfiguration
-org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration
-org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration
-org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration
-org.springframework.cloud.netflix.eureka.reactive.EurekaReactiveDiscoveryClientConfiguration
-org.springframework.cloud.netflix.eureka.loadbalancer.LoadBalancerEurekaAutoConfiguration
@@ -23,10 +23,10 @@ import java.util.concurrent.atomic.AtomicBoolean;

 import com.netflix.appinfo.ApplicationInfoManager;
 import com.netflix.appinfo.HealthCheckHandler;
-import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
+import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClient;
+import com.sun.jersey.client.apache4.ApacheHttpClient4;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -74,7 +74,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.fail;
 */
 class EurekaClientAutoConfigurationTests {

-	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

 	@AfterEach
 	void after() {
@@ -95,7 +95,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void shouldSetManagementPortInMetadataMapIfEqualToServerPort() {
+	void shouldSetManagementPortInMetadataMapIfEqualToServerPort() throws Exception {
 		TestPropertyValues.of("server.port=8989").applyTo(this.context);
 		setupContext(RefreshAutoConfiguration.class);

@@ -105,7 +105,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void shouldNotSetManagementAndJmxPortsInMetadataMap() {
+	void shouldNotSetManagementAndJmxPortsInMetadataMap() throws Exception {
 		TestPropertyValues.of("server.port=8989", "management.server.port=0").applyTo(this.context);
 		setupContext(RefreshAutoConfiguration.class);

@@ -116,7 +116,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void shouldSetManagementAndJmxPortsInMetadataMap() {
+	void shouldSetManagementAndJmxPortsInMetadataMap() throws Exception {
 		TestPropertyValues.of("management.server.port=9999", "com.sun.management.jmxremote.port=6789")
 				.applyTo(this.context);
 		setupContext(RefreshAutoConfiguration.class);
@@ -127,7 +127,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void shouldNotResetManagementAndJmxPortsInMetadataMap() {
+	void shouldNotResetManagementAndJmxPortsInMetadataMap() throws Exception {
 		TestPropertyValues.of("management.server.port=9999", "eureka.instance.metadata-map.jmx.port=9898",
 				"eureka.instance.metadata-map.management.port=7878").applyTo(this.context);
 		setupContext(RefreshAutoConfiguration.class);
@@ -202,7 +202,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_do_not_contain_server_context_path() {
+	void statusPageUrl_and_healthCheckUrl_do_not_contain_server_context_path() throws Exception {
 		TestPropertyValues.of("server.port=8989", "management.server.port=9999", "server.contextPath=/service")
 				.applyTo(this.context);

@@ -215,7 +215,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_contain_management_context_path() {
+	void statusPageUrl_and_healthCheckUrl_contain_management_context_path() throws Exception {
 		TestPropertyValues.of("server.port=8989", "management.server.servlet.context-path=/management")
 				.applyTo(this.context);

@@ -228,7 +228,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_contain_management_context_path_random_port() {
+	void statusPageUrl_and_healthCheckUrl_contain_management_context_path_random_port() throws Exception {
 		TestPropertyValues.of("server.port=0", "management.server.servlet.context-path=/management")
 				.applyTo(this.context);

@@ -287,7 +287,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_contain_management_base_path() {
+	void statusPageUrl_and_healthCheckUrl_contain_management_base_path() throws Exception {
 		TestPropertyValues.of("server.port=8989", "management.server.base-path=/management").applyTo(this.context);

 		setupContext(RefreshAutoConfiguration.class);
@@ -299,7 +299,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_contain_management_base_path_random_port() {
+	void statusPageUrl_and_healthCheckUrl_contain_management_base_path_random_port() throws Exception {
 		TestPropertyValues.of("server.port=0", "management.server.base-path=/management").applyTo(this.context);

 		setupContext(RefreshAutoConfiguration.class);
@@ -511,7 +511,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void testDefaultAppName() {
+	void testDefaultAppName() throws Exception {
 		setupContext();
 		assertThat(getInstanceConfig().getAppname()).isEqualTo("unknown");
 		assertThat(getInstanceConfig().getVirtualHostName()).isEqualTo("unknown");
@@ -519,7 +519,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void testAppName() {
+	void testAppName() throws Exception {
 		TestPropertyValues.of("spring.application.name=mytest").applyTo(this.context);
 		setupContext();
 		assertThat(getInstanceConfig().getAppname()).isEqualTo("mytest");
@@ -528,7 +528,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void testAppNameUpper() {
+	void testAppNameUpper() throws Exception {
 		addSystemEnvironment(this.context.getEnvironment(), "SPRING_APPLICATION_NAME=mytestupper");
 		setupContext();
 		assertThat(getInstanceConfig().getAppname()).isEqualTo("mytestupper");
@@ -570,7 +570,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void testInstanceNamePreferred() {
+	void testInstanceNamePreferred() throws Exception {
 		addSystemEnvironment(this.context.getEnvironment(), "SPRING_APPLICATION_NAME=mytestspringappname");
 		TestPropertyValues.of("eureka.instance.appname=mytesteurekaappname").applyTo(this.context);
 		setupContext();
@@ -616,7 +616,6 @@ class EurekaClientAutoConfigurationTests {
 				});
 	}

-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private void assertBeanNotPresent(Class beanClass) {
 		try {
 			context.getBean(beanClass);
@@ -672,9 +671,8 @@ class EurekaClientAutoConfigurationTests {
 		@Bean(destroyMethod = "shutdown")
 		@ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT)
 		public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config,
-				TransportClientFactories<?> transportClientFactories, ApplicationContext context,
-				AbstractDiscoveryClientOptionalArgs optionalArgs) {
-			return new CloudEurekaClient(manager, config, transportClientFactories, optionalArgs, context) {
+				ApplicationContext context) {
+			return new CloudEurekaClient(manager, config, null, context) {
 				@Override
 				public synchronized void shutdown() {
 					CountDownLatch latch = countDownLatch();
@@ -691,15 +689,17 @@ class EurekaClientAutoConfigurationTests {
 	@Configuration(proxyBeanMethods = false)
 	protected static class MockClientConfiguration {

-		// FIXME: 4.0
-		/*
-		 * @Bean public EurekaJerseyClient jerseyClient() { EurekaJerseyClient mock =
-		 * Mockito.mock(EurekaJerseyClient.class);
-		 * Mockito.when(mock.getClient()).thenReturn(apacheClient()); return mock; }
-		 *
-		 * @Bean public ApacheHttpClient4 apacheClient() { return
-		 * Mockito.mock(ApacheHttpClient4.class); }
-		 */
+		@Bean
+		public EurekaJerseyClient jerseyClient() {
+			EurekaJerseyClient mock = Mockito.mock(EurekaJerseyClient.class);
+			Mockito.when(mock.getClient()).thenReturn(apacheClient());
+			return mock;
+		}
+
+		@Bean
+		public ApacheHttpClient4 apacheClient() {
+			return Mockito.mock(ApacheHttpClient4.class);
+		}

 	}

@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
 class EurekaClientConfigBeanTests {

-	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

 	@AfterEach
 	void init() {
@@ -67,7 +67,7 @@ class EurekaClientConfigBeanTests {
 	void serviceUrlWithCompositePropertySource() {
 		CompositePropertySource source = new CompositePropertySource("composite");
 		this.context.getEnvironment().getPropertySources().addFirst(source);
-		source.addPropertySource(new MapPropertySource("config", Collections.singletonMap(
+		source.addPropertySource(new MapPropertySource("config", Collections.<String, Object>singletonMap(
 				"eureka.client.serviceUrl.defaultZone",
 				"https://example.com,https://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com")));
 		this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
@@ -321,7 +321,7 @@ class EurekaHealthCheckHandlerTests {
 		@Override
 		public Iterator<NamedContributor<HealthContributor>> iterator() {
 			Iterator<Map.Entry<String, HealthContributor>> iterator = contributorMap.entrySet().iterator();
-			return new Iterator<>() {
+			return new Iterator<NamedContributor<HealthContributor>>() {

 				@Override
 				public boolean hasNext() {
@@ -18,9 +18,11 @@ package org.springframework.cloud.netflix.eureka;

 import com.netflix.appinfo.InstanceInfo.InstanceStatus;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -44,14 +46,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
 class EurekaInstanceConfigBeanTests {

-	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

 	private String hostName;

 	private String ipAddress;

 	@BeforeEach
-	void init() {
+	void init() throws Exception {
 		try (InetUtils utils = new InetUtils(new InetUtilsProperties())) {
 			InetUtils.HostInfo hostInfo = utils.findFirstNonLoopbackHostInfo();
 			this.hostName = hostInfo.getHostname();
@@ -156,6 +158,13 @@ class EurekaInstanceConfigBeanTests {
 		assertThat(getInstanceConfig().getInitialStatus()).as("initialStatus wrong").isEqualTo(InstanceStatus.UP);
 	}

+	void testBadInitialStatus() {
+		TestPropertyValues.of("eureka.instance.initial-status:FOO").applyTo(this.context);
+		Assertions.assertThrows(BeanCreationException.class, () -> {
+			setupContext();
+		});
+	}
+
 	@Test
 	void testCustomInitialStatus() {
 		TestPropertyValues.of("eureka.instance.initial-status:STARTING").applyTo(this.context);
@@ -164,7 +173,7 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testPreferIpAddress() {
+	void testPreferIpAddress() throws Exception {
 		TestPropertyValues.of("eureka.instance.preferIpAddress:true").applyTo(this.context);
 		setupContext();
 		EurekaInstanceConfigBean instance = getInstanceConfig();
@@ -174,7 +183,7 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testDefaultVirtualHostName() {
+	void testDefaultVirtualHostName() throws Exception {
 		TestPropertyValues.of("spring.application.name:myapp").applyTo(this.context);
 		setupContext();
 		assertThat(getInstanceConfig().getVirtualHostName()).as("virtualHostName wrong").isEqualTo("myapp");
@@ -183,7 +192,7 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testCustomVirtualHostName() {
+	void testCustomVirtualHostName() throws Exception {
 		TestPropertyValues.of("spring.application.name:myapp", "eureka.instance.virtualHostName=myvirthost",
 				"eureka.instance.secureVirtualHostName=mysecurevirthost").applyTo(this.context);
 		setupContext();
@@ -194,7 +203,7 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testDefaultAppName() {
+	void testDefaultAppName() throws Exception {
 		setupContext();
 		assertThat(getInstanceConfig().getAppname()).as("default app name is wrong").isEqualTo("unknown");
 		assertThat(getInstanceConfig().getVirtualHostName()).as("default virtual hostname is wrong")
@@ -204,21 +213,21 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testCustomInstanceId() {
+	void testCustomInstanceId() throws Exception {
 		TestPropertyValues.of("eureka.instance.instanceId=myinstance").applyTo(this.context);
 		setupContext();
 		assertThat(getInstanceConfig().getInstanceId()).as("instance id is wrong").isEqualTo("myinstance");
 	}

 	@Test
-	void testCustomInstanceIdWithMetadata() {
+	void testCustomInstanceIdWithMetadata() throws Exception {
 		TestPropertyValues.of("eureka.instance.metadataMap.instanceId=myinstance").applyTo(this.context);
 		setupContext();
 		assertThat(getInstanceConfig().getInstanceId()).as("instance id is wrong").isEqualTo("myinstance");
 	}

 	@Test
-	void testDefaultInstanceId() {
+	void testDefaultInstanceId() throws Exception {
 		setupContext();
 		assertThat(getInstanceConfig().getInstanceId()).as("default instance id is wrong").isEqualTo(null);
 	}
@@ -16,6 +16,8 @@

 package org.springframework.cloud.netflix.eureka;

+import java.io.IOException;
+
 import com.netflix.appinfo.InstanceInfo;
 import org.junit.jupiter.api.Test;

@@ -32,10 +34,10 @@ import static org.assertj.core.api.Assertions.assertThat;

 class InstanceInfoFactoryTests {

-	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

 	@Test
-	void instanceIdIsHostNameByDefault() {
+	void instanceIdIsHostNameByDefault() throws IOException {
 		InstanceInfo instanceInfo = setupInstance();
 		try (InetUtils utils = new InetUtils(new InetUtilsProperties())) {
 			assertThat(instanceInfo.getId()).isEqualTo(utils.findFirstNonLoopbackHostInfo().getHostname());
@@ -43,7 +45,7 @@ class InstanceInfoFactoryTests {
 	}

 	@Test
-	void instanceIdIsIpWhenIpPreferred() {
+	void instanceIdIsIpWhenIpPreferred() throws Exception {
 		InstanceInfo instanceInfo = setupInstance("eureka.instance.preferIpAddress:true");
 		assertThat(instanceInfo.getId().matches("(\\d+\\.){3}\\d+")).isTrue();
 	}
@@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test;

 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.commons.util.UtilAutoConfiguration;
 import org.springframework.cloud.config.server.config.ConfigServerProperties;
 import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;

@@ -36,15 +35,16 @@ class EurekaClientConfigServerAutoConfigurationTests {
 	@Test
 	void offByDefault() {
 		new ApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class))
-				.run(c -> assertThat(c.getBeanNamesForType(EurekaInstanceConfigBean.class).length).isEqualTo(0));
+				.withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class)).run(c -> {
+					assertThat(c.getBeanNamesForType(EurekaInstanceConfigBean.class).length).isEqualTo(0);
+				});
 	}

 	@Test
 	void onWhenRequested() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class,
-						UtilAutoConfiguration.class, ConfigServerProperties.class, EurekaInstanceConfigBean.class))
+						ConfigServerProperties.class, EurekaInstanceConfigBean.class))
 				.withPropertyValues("spring.cloud.config.server.prefix=/config").run(c -> {
 					assertThat(c.getBeanNamesForType(EurekaInstanceConfig.class).length).isEqualTo(1);
 					EurekaInstanceConfig instance = c.getBean(EurekaInstanceConfig.class);
@@ -56,7 +56,7 @@ class EurekaClientConfigServerAutoConfigurationTests {
 	void notOverridingMetamapSettings() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class,
-						UtilAutoConfiguration.class, ConfigServerProperties.class, EurekaInstanceConfigBean.class))
+						ConfigServerProperties.class, EurekaInstanceConfigBean.class))
 				.withPropertyValues("spring.cloud.config.server.prefix=/config")
 				.withPropertyValues("eureka.instance.metadataMap.configPath=/differentpath").run(c -> {
 					assertThat(c.getBeanNamesForType(EurekaInstanceConfig.class).length).isEqualTo(1);
@@ -63,50 +63,63 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 	public void offByDefault() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.run(this::assertEurekaBeansNotPresent);
+				.run(context -> {
+					assertEurekaBeansNotPresent(context);
+				});
 	}

 	@Test
 	public void properBeansCreatedWhenDiscoveryEnabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("spring.cloud.config.discovery.enabled=true").run(this::assertEurekaBeansPresent);
+				.withPropertyValues("spring.cloud.config.discovery.enabled=true").run(context -> {
+					assertEurekaBeansPresent(context);
+				});
 	}

 	@Test
 	public void beansNotCreatedWhenDiscoveryNotEnabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("spring.cloud.config.discovery.enabled=false")
-				.run(this::assertEurekaBeansNotPresent);
+				.withPropertyValues("spring.cloud.config.discovery.enabled=false").run(context -> {
+					assertEurekaBeansNotPresent(context);
+				});
 	}

 	@Test
 	public void beansNotCreatedWhenDiscoveryDisabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("spring.cloud.config.discovery.disabled").run(this::assertEurekaBeansNotPresent);
+				.withPropertyValues("spring.cloud.config.discovery.disabled").run(context -> {
+					assertEurekaBeansNotPresent(context);
+				});
 	}

 	@Test
 	public void beansNotCreatedWhenEurekaClientEnabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("eureka.client.enabled=true").run(this::assertEurekaBeansNotPresent);
+				.withPropertyValues("eureka.client.enabled=true").run(context -> {
+					assertEurekaBeansNotPresent(context);
+				});
 	}

 	@Test
 	public void beansNotCreatedWhenEurekaClientNotEnabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("eureka.client.enabled=false").run(this::assertEurekaBeansNotPresent);
+				.withPropertyValues("eureka.client.enabled=false").run(context -> {
+					assertEurekaBeansNotPresent(context);
+				});
 	}

 	@Test
 	public void beansNotCreatedWhenEurekaClientDisabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("eureka.client.disabled").run(this::assertEurekaBeansNotPresent);
+				.withPropertyValues("eureka.client.disabled").run(context -> {
+					assertEurekaBeansNotPresent(context);
+				});
 	}

 	@Test
@@ -114,7 +127,9 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
 				.withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true")
-				.run(this::assertEurekaBeansPresent);
+				.run(context -> {
+					assertEurekaBeansPresent(context);
+				});
 	}

 	@Test
@@ -122,7 +137,9 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
 				.withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=false")
-				.run(this::assertEurekaBeansNotPresent);
+				.run(context -> {
+					assertEurekaBeansNotPresent(context);
+				});
 	}

 	@Test
@@ -130,7 +147,9 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
 				.withPropertyValues("spring.cloud.config.discovery.enabled=false", "eureka.client.enabled=true")
-				.run(this::assertEurekaBeansNotPresent);
+				.run(context -> {
+					assertEurekaBeansNotPresent(context);
+				});
 	}

 	@Test
@@ -138,7 +157,9 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
 				.withPropertyValues("spring.cloud.config.discovery.enabled=false", "eureka.client.enabled=false")
-				.run(this::assertEurekaBeansNotPresent);
+				.run(context -> {
+					assertEurekaBeansNotPresent(context);
+				});
 	}

 	@Test
@@ -150,8 +171,9 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 						"eureka.client.use-dns-for-fetching-service-urls=true",
 						"eureka.client.eureka-server-d-n-s-name=myeurekahost",
 						"eureka.client.eureka-server-u-r-l-context=eureka", "eureka.client.eureka-server-port=30000")
-				.run(context -> assertThat(output)
-						.contains("Cannot get cnames bound to the region:txt.us-east-1.myeurekahost"));
+				.run(context -> {
+					assertThat(output).contains("Cannot get cnames bound to the region:txt.us-east-1.myeurekahost");
+				});
 	}

 	@Test
@@ -22,12 +22,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.netflix.eureka.http.WebClientEurekaHttpClient;
-import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.reactive.function.client.ClientResponse;
@@ -62,17 +61,20 @@ class EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests {
 	@SpringBootConfiguration
 	@EnableAutoConfiguration
 	@RestController
-	static class WebClientController {
+	static class WebClientController extends WebSecurityConfigurerAdapter {

-		@GetMapping("/")
+		@GetMapping
 		public String hello() {
-			return ".".repeat(300000);
+			StringBuilder s = new StringBuilder();
+			for (int i = 0; i < 300000; i++) {
+				s.append(".");
+			}
+			return s.toString();
 		}

-		@Bean
-		public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-			http.authorizeHttpRequests().anyRequest().permitAll().and().csrf().disable();
-			return http.build();
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http.authorizeRequests().anyRequest().permitAll().and().csrf().disable();
 		}

 	}
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2013-2023 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.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
+import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.discovery.converters.jackson.serializer.InstanceInfoJsonBeanSerializer;
+import com.netflix.discovery.shared.Application;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockserver.client.MockServerClient;
+import org.testcontainers.containers.MockServerContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.config.environment.Environment;
+import org.springframework.cloud.config.environment.PropertySource;
+import org.springframework.cloud.netflix.eureka.http.EurekaApplications;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+/**
+ * @author Ryan Baxter
+ */
+@Testcontainers
+public class EurekaConfigServerBootstrapperIT {
+
+	public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse("mockserver/mockserver")
+			.withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
+
+	@Container
+	static MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
+
+	private ConfigurableApplicationContext context;
+
+	@BeforeEach
+	void before() {
+
+	}
+
+	@AfterEach
+	void after() {
+		this.context.close();
+	}
+
+	@Test
+	public void contextLoads() throws JsonProcessingException {
+		Environment environment = new Environment("test", "default");
+		Map<String, Object> properties = new HashMap<>();
+		properties.put("hello", "world");
+		PropertySource p = new PropertySource("p1", properties);
+		environment.add(p);
+		ObjectMapper objectMapper = new ObjectMapper();
+		SimpleModule jsonModule = new SimpleModule();
+		jsonModule.setSerializerModifier(createJsonSerializerModifier());
+		objectMapper.registerModule(jsonModule);
+		try (MockServerClient mockServerClient = new MockServerClient(mockServer.getHost(),
+				mockServer.getMappedPort(MockServerContainer.PORT))) {
+			mockServerClient.when(request().withPath("/application/default"))
+					.respond(response().withBody(objectMapper.writeValueAsString(environment))
+							.withHeader("content-type", "application/json"));
+			InstanceInfo configServerInstanceInfo = InstanceInfo.Builder.newBuilder()
+					.setVIPAddress("eureka-configserver").setInstanceId("eureka-configserver")
+					.setAppName("eureka-configserver").setStatus(InstanceInfo.InstanceStatus.UP)
+					.enablePort(InstanceInfo.PortType.UNSECURE, true).setHostName("localhost")
+					.setPort(mockServer.getMappedPort(MockServerContainer.PORT)).build();
+			Application configServer = new Application("eureka-configserver",
+					Collections.singletonList(configServerInstanceInfo));
+			EurekaApplications eurekaApplications = new EurekaApplications("hashcode", 0L,
+					Collections.singletonList(configServer));
+			mockServerClient.when(request().withPath("/apps/"))
+					.respond(response()
+							.withBody("{\"applications\":" + objectMapper.writeValueAsString(eurekaApplications) + "}")
+							.withHeader("content-type", "application/json"));
+			this.context = setup().run();
+			assertThat(this.context.getEnvironment().getProperty("hello")).isEqualTo("world");
+		}
+
+	}
+
+	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;
+			}
+		};
+	}
+
+	SpringApplicationBuilder setup(String... env) {
+		SpringApplicationBuilder builder = new SpringApplicationBuilder(TestConfig.class)
+				.properties(addDefaultEnv(env));
+		return builder;
+	}
+
+	private String[] addDefaultEnv(String[] env) {
+		Set<String> set = new LinkedHashSet<>();
+		if (env != null && env.length > 0) {
+			set.addAll(Arrays.asList(env));
+		}
+		set.add("spring.config.import=classpath:bootstrapper.yaml");
+		set.add("spring.cloud.config.enabled=true");
+		set.add("spring.cloud.service-registry.auto-registration.enabled=false");
+		set.add("eureka.client.serviceUrl.defaultZone=http://" + mockServer.getHost() + ":"
+				+ mockServer.getMappedPort(MockServerContainer.PORT));
+		return set.toArray(new String[0]);
+	}
+
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	static class TestConfig {
+
+	}
+
+}
@@ -16,16 +16,21 @@

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

+import org.apache.commons.logging.Log;
 import org.junit.jupiter.api.Test;

 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+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.ConfigServerInstanceProvider;
 import org.springframework.web.client.ResourceAccessException;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.mockito.Mockito.mock;

 class EurekaConfigServerBootstrapperTests {

@@ -48,7 +53,10 @@ class EurekaConfigServerBootstrapperTests {
 				.addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> {
 					ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext()
 							.get(ConfigServerInstanceProvider.Function.class);
-					assertThat(providerFn.apply("id")).as("Should return empty list").isEmpty();
+					Binder binder = event.getBootstrapContext().get(Binder.class);
+					BindHandler bindHandler = event.getBootstrapContext().get(BindHandler.class);
+					assertThat(providerFn.apply("id", binder, bindHandler, mock(Log.class)))
+							.as("Should return empty list").isEmpty();
 				})).run().close();
 	}

@@ -60,19 +68,25 @@ class EurekaConfigServerBootstrapperTests {
 				.addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> {
 					ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext()
 							.get(ConfigServerInstanceProvider.Function.class);
-					assertThat(providerFn.apply("id")).as("Should return empty list").isEmpty();
+					Binder binder = event.getBootstrapContext().get(Binder.class);
+					BindHandler bindHandler = event.getBootstrapContext().get(BindHandler.class);
+					assertThat(providerFn.apply("id", binder, bindHandler, mock(Log.class)))
+							.as("Should return empty list").isEmpty();
 				})).run().close();
 	}

 	@Test
 	void enabledAddsInstanceProviderFn() {
 		new SpringApplicationBuilder(TestConfig.class)
-				.properties("spring.cloud.config.discovery.enabled=true",
-						"spring.cloud.service-registry.auto-registration.enabled=false")
+				.properties("spring.config.import: classpath:bootstrapper.yaml",
+						ConfigClientProperties.PREFIX + ".enabled=true")
 				.addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> {
 					ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext()
 							.get(ConfigServerInstanceProvider.Function.class);
-					assertThatThrownBy(() -> providerFn.apply("id")).isInstanceOf(ResourceAccessException.class)
+					Binder binder = event.getBootstrapContext().get(Binder.class);
+					BindHandler bindHandler = event.getBootstrapContext().get(BindHandler.class);
+					assertThatThrownBy(() -> providerFn.apply("id", binder, bindHandler, mock(Log.class)))
+							.isInstanceOf(ResourceAccessException.class)
 							.hasMessageContaining("I/O error on GET request for \"http://localhost:8761/eureka/apps/\"")
 							.as("Should have tried to connect to Eureka to fetch instances.");
 				})).run().close();
@@ -40,6 +40,7 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 public class EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest {

 	@Test
+	@SuppressWarnings("unchecked")
 	public void contextFailsWithoutWebClient() {

 		ConfigurableApplicationContext ctx = null;
@@ -51,7 +52,7 @@ public class EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest {
 		}
 		catch (Exception e) {
 			// this is the desired state
-			assertThat(e).hasStackTraceContaining("WebClient is not on the classpath");
+			assertThat(e).hasMessageContaining("WebClient is not on the classpath");
 		}
 		if (ctx != null) {
 			ctx.close();
@@ -16,14 +16,17 @@

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

-import org.junit.jupiter.api.Disabled;
+import com.netflix.discovery.DiscoveryClient.DiscoveryClientOptionalArgs;
 import org.junit.jupiter.api.Test;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.netflix.eureka.sample.EurekaSampleApplication;
 import org.springframework.test.annotation.DirtiesContext;

+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
 * @author Daniel Lavoie
 */
@@ -31,13 +34,12 @@ import org.springframework.test.annotation.DirtiesContext;
@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
 class JerseyOptionalArgsConfigurationTest {

-	// @Autowired
-	// private DiscoveryClientOptionalArgs optionalArgs;
+	@Autowired
+	private DiscoveryClientOptionalArgs optionalArgs;

 	@Test
-	@Disabled // FIXME: 4.0.0
 	void contextLoads() {
-		// assertThat(optionalArgs).isNotNull();
+		assertThat(optionalArgs).isNotNull();
 	}

 }
@@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
 * @author Haytham Mohamed
 **/
-abstract class AbstractEurekaHttpClientTests {
+abstract class AbstractEurekaHttpClientTest {

 	protected EurekaHttpClient eurekaHttpClient;

@@ -35,17 +35,16 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
-import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
@@ -61,7 +60,6 @@ import static org.springframework.util.Assert.isTrue;
 */
@Configuration(proxyBeanMethods = false)
@RestController
-@RequestMapping("/eureka")
@SpringBootApplication
 public class EurekaServerMockApplication {

@@ -137,7 +135,7 @@ public class EurekaServerMockApplication {

 	}

-	@GetMapping({ "/apps/", "/apps/delta", "/vips/{address}", "/svips/{address}" })
+	@GetMapping({ "/apps", "/apps/delta", "/vips/{address}", "/svips/{address}" })
 	public Applications getApplications(@PathVariable(required = false) String address,
 			@RequestParam(required = false) String regions) {
 		Applications applications = new Applications();
@@ -157,23 +155,23 @@ public class EurekaServerMockApplication {

 	@Configuration(proxyBeanMethods = false)
 	@Order(Ordered.HIGHEST_PRECEDENCE)
-	protected static class TestSecurityConfiguration {
+	protected static class TestSecurityConfiguration extends WebSecurityConfigurerAdapter {

-		@Bean
-		public InMemoryUserDetailsManager userDetailsService() {
-			UserDetails user = User.withDefaultPasswordEncoder().username("test").password("test").roles("USER")
-					.build();
-			return new InMemoryUserDetailsManager(user);
+		TestSecurityConfiguration() {
+			super(true);
 		}

 		@Bean
-		public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-			// @formatter:off
-			http
-					.securityMatcher("/v2/apps/**")
-					.httpBasic();
-			// @formatter:on
-			return http.build();
+		public UserDetailsService userDetailsService() {
+			InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
+			manager.createUser(User.withUsername("test").password("{noop}test").roles("USER").build());
+			return manager;
+		}
+
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			// super.configure(http);
+			http.antMatcher("/apps/**").httpBasic();
 		}

 	}
@@ -32,16 +32,14 @@ import org.springframework.test.annotation.DirtiesContext;
 * @author Daniel Lavoie
 */
@SpringBootTest(classes = EurekaServerMockApplication.class,
-		properties = { "debug=true", "security.basic.enabled=true", "eureka.client.fetch-registry=false",
-				"eureka.client.register-with-eureka=false", "logging.level.org.springframework=INFO" },
-		webEnvironment = WebEnvironment.RANDOM_PORT)
+		properties = { "debug=true", "security.basic.enabled=true" }, webEnvironment = WebEnvironment.RANDOM_PORT)
@DirtiesContext
-class RestTemplateEurekaHttpClientTests extends AbstractEurekaHttpClientTests {
+class RestTemplateEurekaHttpClientTest extends AbstractEurekaHttpClientTest {

 	@Autowired
 	private InetUtils inetUtils;

-	@Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}/eureka")
+	@Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}")
 	private String serviceUrl;

 	@BeforeEach
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ * 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 org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Daniel Lavoie
+ */
+class RestTemplateTransportClientFactoriesTest {
+
+	@Test
+	void testJerseyIsUnsupported() {
+		Assertions.assertThrows(UnsupportedOperationException.class, () -> {
+			new RestTemplateTransportClientFactories(new RestTemplateDiscoveryClientOptionalArgs(null))
+					.newTransportClientFactory(null, null);
+		});
+	}
+
+}
@@ -33,16 +33,15 @@ import org.springframework.web.reactive.function.client.WebClient;
 * @author Daniel Lavoie
 */
@SpringBootTest(classes = EurekaServerMockApplication.class,
-		properties = { "debug=true", "security.basic.enabled=true", "eureka.client.webclient.enabled=true",
-				"eureka.client.fetch-registry=false", "eureka.client.register-with-eureka=false" },
+		properties = { "debug=true", "security.basic.enabled=true", "eureka.client.webclient.enabled=true" },
 		webEnvironment = WebEnvironment.RANDOM_PORT)
@DirtiesContext
-class WebClientEurekaHttpClientTests extends AbstractEurekaHttpClientTests {
+class WebClientEurekaHttpClientTest extends AbstractEurekaHttpClientTest {

 	@Autowired
 	private InetUtils inetUtils;

-	@Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}/eureka/")
+	@Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}")
 	private String serviceUrl;

 	@BeforeEach
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ * 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 org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.web.reactive.function.client.WebClient;
+
+/**
+ * @author Daniel Lavoie
+ */
+class WebClientTransportClientFactoriesTest {
+
+	@Test
+	void testJerseyIsUnsupported() {
+		Assertions.assertThrows(UnsupportedOperationException.class, () -> {
+			new WebClientTransportClientFactories(WebClient::builder).newTransportClientFactory(null, null);
+		});
+
+	}
+
+}
@@ -35,16 +35,16 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
 class EurekaLoadBalancerClientConfigurationTests {

-	private final EurekaClientConfigBean eurekaClientConfig = new EurekaClientConfigBean();
+	private EurekaClientConfigBean eurekaClientConfig = new EurekaClientConfigBean();

-	private final EurekaInstanceConfigBean eurekaInstanceConfig = new EurekaInstanceConfigBean(
+	private EurekaInstanceConfigBean eurekaInstanceConfig = new EurekaInstanceConfigBean(
 			new InetUtils(new InetUtilsProperties()));

-	private final LoadBalancerZoneConfig zoneConfig = new LoadBalancerZoneConfig(null);
+	private LoadBalancerZoneConfig zoneConfig = new LoadBalancerZoneConfig(null);

-	private final EurekaLoadBalancerProperties eurekaLoadBalancerProperties = new EurekaLoadBalancerProperties();
+	private EurekaLoadBalancerProperties eurekaLoadBalancerProperties = new EurekaLoadBalancerProperties();

-	private final EurekaLoadBalancerClientConfiguration postprocessor = new EurekaLoadBalancerClientConfiguration(
+	private EurekaLoadBalancerClientConfiguration postprocessor = new EurekaLoadBalancerClientConfiguration(
 			eurekaClientConfig, eurekaInstanceConfig, zoneConfig, eurekaLoadBalancerProperties);

 	@Test
@@ -33,7 +33,7 @@ class DefaultManagementMetadataProviderTest {
 	private final ManagementMetadataProvider provider = new DefaultManagementMetadataProvider();

 	@BeforeEach
-	void setUp() {
+	void setUp() throws Exception {
 		when(INSTANCE.getHostname()).thenReturn("host");
 		when(INSTANCE.getHealthCheckUrlPath()).thenReturn("health");
 		when(INSTANCE.getStatusPageUrlPath()).thenReturn("info");
@@ -41,7 +41,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortIsRandomAndManagementPortIsNull() {
+	void serverPortIsRandomAndManagementPortIsNull() throws Exception {
 		int serverPort = 0;
 		String serverContextPath = "/";
 		String managementContextPath = null;
@@ -53,7 +53,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void managementPortIsRandom() {
+	void managementPortIsRandom() throws Exception {
 		int serverPort = 0;
 		String serverContextPath = "/";
 		String managementContextPath = null;
@@ -65,7 +65,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPort() {
+	void serverPort() throws Exception {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = null;
@@ -80,7 +80,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementPort() {
+	void serverPortManagementPort() throws Exception {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = null;
@@ -95,7 +95,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementPortServerContextPath() {
+	void serverPortManagementPortServerContextPath() throws Exception {
 		int serverPort = 7777;
 		String serverContextPath = "/Server";
 		String managementContextPath = null;
@@ -110,7 +110,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementPortServerContextPathManagementContextPath() {
+	void serverPortManagementPortServerContextPathManagementContextPath() throws Exception {
 		int serverPort = 7777;
 		String serverContextPath = "/Server";
 		String managementContextPath = "/Management";
@@ -125,7 +125,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortServerContextPathManagementContextPath() {
+	void serverPortServerContextPathManagementContextPath() throws Exception {
 		int serverPort = 7777;
 		String serverContextPath = "/Server";
 		String managementContextPath = "/Management";
@@ -140,7 +140,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementContextPath() {
+	void serverPortManagementContextPath() throws Exception {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = "/Management";
@@ -155,7 +155,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortServerContextPath() {
+	void serverPortServerContextPath() throws Exception {
 		int serverPort = 7777;
 		String serverContextPath = "/Server";
 		String managementContextPath = null;
@@ -170,7 +170,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementPortManagementContextPath() {
+	void serverPortManagementPortManagementContextPath() throws Exception {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = "/Management";
@@ -186,7 +186,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void setSecureHealthCheckUrl() {
+	void setSecureHealthCheckUrl() throws Exception {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = "/Management";
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
 class EurekaReactiveDiscoveryClientConfigurationTests {

-	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class,
 					ReactiveCommonsClientAutoConfiguration.class, EurekaClientAutoConfiguration.class,
 					DiscoveryClientOptionalArgsConfiguration.class, EurekaReactiveDiscoveryClientConfiguration.class));
@@ -18,6 +18,7 @@ package org.springframework.cloud.netflix.eureka.reactive;

 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
+import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.Application;
 import com.netflix.discovery.shared.Applications;
 import org.junit.jupiter.api.Test;
@@ -46,6 +47,9 @@ class EurekaReactiveDiscoveryClientTests {
 	@Mock
 	private EurekaClient eurekaClient;

+	@Mock
+	private EurekaClientConfig clientConfig;
+
 	@InjectMocks
 	private EurekaReactiveDiscoveryClient client;

@@ -17,6 +17,7 @@
 package org.springframework.cloud.netflix.eureka.sample;

 import java.io.Closeable;
+import java.io.IOException;

 import com.netflix.appinfo.HealthCheckHandler;
 import com.netflix.appinfo.InstanceInfo;
@@ -102,7 +103,7 @@ public class EurekaSampleApplication implements ApplicationContextAware, Closeab
 	}

 	@Override
-	public void close() {
+	public void close() throws IOException {
 		deregister();
 	}

@@ -62,7 +62,6 @@ class EurekaServiceRegistryTests {
 		verifyNoInteractions(eurekaClient);
 	}

-	@SuppressWarnings("unchecked")
 	@Test
 	void eurekaClientGetStatus() {
 		EurekaServiceRegistry registry = new EurekaServiceRegistry();
@@ -99,7 +98,6 @@ class EurekaServiceRegistryTests {
 				OUT_OF_SERVICE.toString());
 	}

-	@SuppressWarnings("unchecked")
 	@Test
 	void eurekaClientGetStatusNoInstance() {
 		EurekaServiceRegistry registry = new EurekaServiceRegistry();
@@ -1,9 +1,4 @@
-# for EurekaRibbonClientPropertyOverrideIntegrationTests
-foo3:
-  ribbon:
-    NFLoadBalancerPingClassName: com.netflix.loadbalancer.DummyPing
-    NIWSServerListClassName: com.netflix.loadbalancer.ConfigurationBasedServerList
-    
+
 security:
  basic:
    enabled: false
@@ -0,0 +1,12 @@
+spring:
+  config:
+    import: "optional:configserver:"
+  cloud:
+    config:
+      enabled: true
+      discovery:
+        service-id: eureka-configserver
+        enabled: true
+    service-registry:
+      auto-registration:
+        enabled: false
@@ -5,17 +5,15 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-RC3</version>
+		<version>3.1.8</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-server</artifactId>
 	<name>Spring Cloud Netflix Eureka Server</name>
 	<url>https://projects.spring.io/spring-cloud/</url>
 	<properties>
-		<wro4j.version>1.10.1</wro4j.version>
+		<wro4j.version>1.8.0</wro4j.version>
 		<wiremock.version>2.27.2</wiremock.version>
-		<!-- FIXME: 4.0.0 -->
-		<duplicate-finder-maven-plugin.skip>true</duplicate-finder-maven-plugin.skip>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -50,39 +48,39 @@
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.eureka</groupId>
-			<artifactId>eureka-client-jersey3</artifactId>
+			<artifactId>eureka-client</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>aopalliance</groupId>
+					<artifactId>aopalliance</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>com.netflix.eureka</groupId>
-			<artifactId>eureka-core-jersey3</artifactId>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.glassfish.jersey.containers</groupId>
-			<artifactId>jersey-container-servlet</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
+			<groupId>com.sun.jersey</groupId>
 			<artifactId>jersey-server</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
+			<groupId>com.sun.jersey</groupId>
 			<artifactId>jersey-client</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.glassfish.jersey.inject</groupId>
-			<artifactId>jersey-hk2</artifactId>
+			<groupId>com.netflix.eureka</groupId>
+			<artifactId>eureka-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>blitz4j</artifactId>
+					<groupId>com.netflix.blitz4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.glassfish.hk2</groupId>
-			<artifactId>spring-bridge</artifactId>
-			<!-- FIXME: 4.0 -->
-			<version>3.0.3</version>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.inject</groupId>
-			<artifactId>jakarta.inject-api</artifactId>
-			<!-- FIXME: 4.0 -->
-			<version>2.0.1</version>
+			<groupId>javax.inject</groupId>
+			<artifactId>javax.inject</artifactId>
 		</dependency>
 		<!-- Eureka deps that are now optional in eureka -->
 		<dependency>
@@ -178,12 +176,6 @@
 					<contextFolder>${basedir}/src/main/wro</contextFolder>
 				</configuration>
 				<dependencies>
-					<!-- https://github.com/wro4j/wro4j/issues/1129 -->
-					<dependency>
-						<groupId>org.webjars.npm</groupId>
-						<artifactId>glob</artifactId>
-						<version>7.2.0</version>
-					</dependency>
 					<dependency>
 						<groupId>org.webjars.npm</groupId>
 						<artifactId>jquery</artifactId>
@@ -194,6 +186,11 @@
 						<artifactId>bootstrap</artifactId>
 						<version>5.1.3</version>
 					</dependency>
+					<dependency>
+						<groupId>org.mockito</groupId>
+						<artifactId>mockito-core</artifactId>
+						<version>3.6.28</version>
+					</dependency>
 				</dependencies>
 			</plugin>
 			<plugin>
@@ -65,7 +65,7 @@ public class CloudJacksonJson extends LegacyJacksonJson {
 	}

 	@Override
-	public <T> String encode(T object) {
+	public <T> String encode(T object) throws IOException {
 		return this.codec.writeToString(object);
 	}

@@ -24,6 +24,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

+import javax.servlet.http.HttpServletRequest;
+
 import com.netflix.appinfo.AmazonInfo;
 import com.netflix.appinfo.ApplicationInfoManager;
 import com.netflix.appinfo.DataCenterInfo;
@@ -37,7 +39,6 @@ import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
 import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl;
 import com.netflix.eureka.resources.StatusResource;
 import com.netflix.eureka.util.StatusInfo;
-import jakarta.servlet.http.HttpServletRequest;

 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -56,10 +57,19 @@ public class EurekaController {
 	@Value("${eureka.dashboard.path:/}")
 	private String dashboardPath = "";

-	private final ApplicationInfoManager applicationInfoManager;
+	private ApplicationInfoManager applicationInfoManager;

 	private final EurekaProperties eurekaProperties;

+	/**
+	 * @deprecated in favour of
+	 * {@link EurekaController#EurekaController(ApplicationInfoManager, EurekaProperties)}
+	 */
+	@Deprecated
+	public EurekaController(ApplicationInfoManager applicationInfoManager) {
+		this(applicationInfoManager, null);
+	}
+
 	public EurekaController(ApplicationInfoManager applicationInfoManager, EurekaProperties eurekaProperties) {
 		this.applicationInfoManager = applicationInfoManager;
 		this.eurekaProperties = eurekaProperties;
@@ -119,8 +129,14 @@ public class EurekaController {
 	private void populateHeader(Map<String, Object> model) {
 		model.put("currentTime", StatusResource.getCurrentTimeAsString());
 		model.put("upTime", StatusInfo.getUpTime());
-		model.put("environment", eurekaProperties.getEnvironment());
-		model.put("datacenter", eurekaProperties.getDatacenter());
+		if (eurekaProperties != null) {
+			model.put("environment", eurekaProperties.getEnvironment());
+			model.put("datacenter", eurekaProperties.getDatacenter());
+		}
+		else {
+			model.put("environment", "N/A");
+			model.put("datacenter", "N/A");
+		}
 		PeerAwareInstanceRegistry registry = getRegistry();
 		model.put("registry", registry);
 		model.put("isBelowRenewThreshold", registry.isBelowRenewThresold() == 1);
@@ -16,11 +16,16 @@

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

-import java.io.IOException;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
+
+import javax.servlet.Filter;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.ext.Provider;

 import com.netflix.appinfo.ApplicationInfoManager;
 import com.netflix.discovery.EurekaClient;
@@ -28,8 +33,6 @@ import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.converters.EurekaJacksonCodec;
 import com.netflix.discovery.converters.wrappers.CodecWrapper;
 import com.netflix.discovery.converters.wrappers.CodecWrappers;
-import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
-import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories;
 import com.netflix.eureka.DefaultEurekaServerContext;
 import com.netflix.eureka.EurekaServerConfig;
 import com.netflix.eureka.EurekaServerContext;
@@ -38,35 +41,16 @@ import com.netflix.eureka.cluster.PeerEurekaNodes;
 import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
 import com.netflix.eureka.resources.DefaultServerCodecs;
 import com.netflix.eureka.resources.ServerCodecs;
-import com.netflix.eureka.transport.EurekaServerHttpClientFactory;
-import com.netflix.eureka.transport.Jersey3EurekaServerHttpClientFactory;
-import com.netflix.eureka.transport.Jersey3ReplicationClient;
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletRequestWrapper;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.ext.Provider;
-import org.glassfish.hk2.api.ServiceLocator;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spi.Container;
-import org.glassfish.jersey.server.spi.ContainerLifecycleListener;
-import org.glassfish.jersey.servlet.ServletContainer;
-import org.glassfish.jersey.servlet.ServletProperties;
-import org.jvnet.hk2.spring.bridge.api.SpringBridge;
-import org.jvnet.hk2.spring.bridge.api.SpringIntoHK2Bridge;
+import com.netflix.eureka.transport.JerseyReplicationClient;
+import com.sun.jersey.api.core.DefaultResourceConfig;
+import com.sun.jersey.spi.container.servlet.ServletContainer;

-import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.cloud.client.actuator.HasFeatures;
@@ -83,8 +67,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

 /**
@@ -106,11 +88,6 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 	 */
 	private static final String[] EUREKA_PACKAGES = new String[] { "com.netflix.discovery", "com.netflix.eureka" };

-	/**
-	 * Static content pattern for dashboard elements (images, css, etc...).
-	 */
-	private static final String STATIC_CONTENT_PATTERN = "/(fonts|images|css|js)/.*";
-
 	@Autowired
 	private ApplicationInfoManager applicationInfoManager;

@@ -162,7 +139,6 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 		return codec == null ? CodecWrappers.getCodec(CodecWrappers.XStreamXml.class) : codec;
 	}

-	// FIXME: 4.0
 	@Bean
 	@ConditionalOnMissingBean
 	public ReplicationClientAdditionalFilters replicationClientAdditionalFilters() {
@@ -170,23 +146,9 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 	}

 	@Bean
-	@ConditionalOnMissingBean(TransportClientFactories.class)
-	public Jersey3TransportClientFactories jersey3TransportClientFactories() {
-		return Jersey3TransportClientFactories.getInstance();
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Bean
-	public Jersey3EurekaServerHttpClientFactory jersey3EurekaServerHttpClientFactory() {
-		return new Jersey3EurekaServerHttpClientFactory();
-	}
-
-	@Bean
-	public PeerAwareInstanceRegistry peerAwareInstanceRegistry(ServerCodecs serverCodecs,
-			EurekaServerHttpClientFactory eurekaServerHttpClientFactory) {
+	public PeerAwareInstanceRegistry peerAwareInstanceRegistry(ServerCodecs serverCodecs) {
 		this.eurekaClient.getApplications(); // force initialization
 		return new InstanceRegistry(this.eurekaServerConfig, this.eurekaClientConfig, serverCodecs, this.eurekaClient,
-				eurekaServerHttpClientFactory,
 				this.instanceRegistryProperties.getExpectedNumberOfClientsSendingRenews(),
 				this.instanceRegistryProperties.getDefaultOpenForTrafficCount());
 	}
@@ -220,70 +182,24 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 	 * @return a jersey {@link FilterRegistrationBean}
 	 */
 	@Bean
-	public FilterRegistrationBean<?> jerseyFilterRegistration(ResourceConfig eurekaJerseyApp) {
-		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
-		ServletContainer servletContainer = new ServletContainer(eurekaJerseyApp);
-		bean.setFilter(servletContainer);
+	public FilterRegistrationBean<?> jerseyFilterRegistration(javax.ws.rs.core.Application eurekaJerseyApp) {
+		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<Filter>();
+		bean.setFilter(new ServletContainer(eurekaJerseyApp));
 		bean.setOrder(Ordered.LOWEST_PRECEDENCE);
 		bean.setUrlPatterns(Collections.singletonList(EurekaConstants.DEFAULT_PREFIX + "/*"));

 		return bean;
 	}

-	@Bean
-	public FilterRegistrationBean<?> eurekaVersionFilterRegistration(ServerProperties serverProperties) {
-		String contextPath = serverProperties.getServlet().getContextPath();
-		String regex = EurekaConstants.DEFAULT_PREFIX + STATIC_CONTENT_PATTERN;
-		if (StringUtils.hasText(contextPath)) {
-			regex = contextPath + regex;
-		}
-		Pattern staticPattern = Pattern.compile(regex);
-		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
-		bean.setFilter(new OncePerRequestFilter() {
-			@Override
-			protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
-					FilterChain filterChain) throws ServletException, IOException {
-				HttpServletRequest req = request;
-				String requestURI = request.getRequestURI();
-				if (!requestURI.startsWith(EurekaConstants.DEFAULT_PREFIX + "/v2")
-						// don't forward static requests (images, js, etc...) to /v2
-						&& !staticPattern.matcher(requestURI).matches()) {
-
-					String updatedPath = EurekaConstants.DEFAULT_PREFIX + "/v2"
-							+ requestURI.substring(EurekaConstants.DEFAULT_PREFIX.length());
-
-					HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(request) {
-						@Override
-						public String getRequestURI() {
-							return updatedPath;
-						}
-
-						@Override
-						public String getServletPath() {
-							return updatedPath;
-						}
-					};
-					req = wrapper;
-				}
-				filterChain.doFilter(req, response);
-			}
-		});
-		bean.setOrder(0);
-		bean.setUrlPatterns(Collections.singletonList(EurekaConstants.DEFAULT_PREFIX + "/*"));
-
-		return bean;
-	}
-
 	/**
-	 * Construct a Jersey {@link jakarta.ws.rs.core.Application} with all the resources
+	 * Construct a Jersey {@link javax.ws.rs.core.Application} with all the resources
 	 * required by the Eureka server.
 	 * @param environment an {@link Environment} instance to retrieve classpath resources
 	 * @param resourceLoader a {@link ResourceLoader} instance to get classloader from
 	 * @return created {@link Application} object
 	 */
 	@Bean
-	public ResourceConfig jerseyApplication(Environment environment, ResourceLoader resourceLoader,
-			BeanFactory beanFactory) {
+	public javax.ws.rs.core.Application jerseyApplication(Environment environment, ResourceLoader resourceLoader) {

 		ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false,
 				environment);
@@ -304,32 +220,15 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 			}
 		}

-		// https://javaee.github.io/hk2/spring-bridge
-
 		// Construct the Jersey ResourceConfig
-		ResourceConfig rc = new ResourceConfig(classes).property(
+		Map<String, Object> propsAndFeatures = new HashMap<>();
+		propsAndFeatures.put(
 				// Skip static content used by the webapp
-				ServletProperties.FILTER_STATIC_CONTENT_REGEX, EurekaConstants.DEFAULT_PREFIX + STATIC_CONTENT_PATTERN);
+				ServletContainer.PROPERTY_WEB_PAGE_CONTENT_REGEX,
+				EurekaConstants.DEFAULT_PREFIX + "/(fonts|images|css|js)/.*");

-		rc.register(new ContainerLifecycleListener() {
-			@Override
-			public void onStartup(Container container) {
-				ServiceLocator serviceLocator = container.getApplicationHandler().getInjectionManager()
-						.getInstance(ServiceLocator.class);
-				SpringBridge.getSpringBridge().initializeSpringBridge(serviceLocator);
-				serviceLocator.getService(SpringIntoHK2Bridge.class).bridgeSpringBeanFactory(beanFactory);
-			}
-
-			@Override
-			public void onReload(Container container) {
-
-			}
-
-			@Override
-			public void onShutdown(Container container) {
-
-			}
-		});
+		DefaultResourceConfig rc = new DefaultResourceConfig(classes);
+		rc.setPropertiesAndFeatures(propsAndFeatures);

 		return rc;
 	}
@@ -337,7 +236,7 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 	@Bean
 	@ConditionalOnBean(name = "httpTraceFilter")
 	public FilterRegistrationBean<?> traceFilterRegistration(@Qualifier("httpTraceFilter") Filter filter) {
-		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
+		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<Filter>();
 		bean.setFilter(filter);
 		bean.setOrder(Ordered.LOWEST_PRECEDENCE - 10);
 		return bean;
@@ -386,11 +285,10 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {

 		@Override
 		protected PeerEurekaNode createPeerEurekaNode(String peerEurekaNodeUrl) {
-			Jersey3ReplicationClient replicationClient = Jersey3ReplicationClient.createReplicationClient(serverConfig,
+			JerseyReplicationClient replicationClient = JerseyReplicationClient.createReplicationClient(serverConfig,
 					serverCodecs, peerEurekaNodeUrl);

-			// FIXME: 4.0
-			// this.replicationClientAdditionalFilters.getFilters().forEach(replicationClient::addReplicationClientFilter);
+			this.replicationClientAdditionalFilters.getFilters().forEach(replicationClient::addReplicationClientFilter);

 			String targetHost = hostFromUrl(peerEurekaNodeUrl);
 			if (targetHost == null) {
@@ -16,6 +16,8 @@

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

+import javax.servlet.ServletContext;
+
 import com.netflix.appinfo.ApplicationInfoManager;
 import com.netflix.appinfo.DataCenterInfo;
 import com.netflix.appinfo.InstanceInfo;
@@ -31,7 +33,6 @@ import com.netflix.eureka.aws.AwsBinderDelegate;
 import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
 import com.netflix.eureka.util.EurekaMonitors;
 import com.thoughtworks.xstream.XStream;
-import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -1049,11 +1049,11 @@ public class EurekaServerConfigBean implements EurekaServerConfig {
 				registrySyncRetryWaitMs, remoteRegionAppWhitelist, remoteRegionConnectTimeoutMs,
 				remoteRegionConnectionIdleTimeoutSeconds, remoteRegionFetchThreadPoolSize, remoteRegionReadTimeoutMs,
 				remoteRegionRegistryFetchInterval, remoteRegionTotalConnections, remoteRegionTotalConnectionsPerHost,
-				remoteRegionTrustStore, remoteRegionTrustStorePassword, Arrays.hashCode(remoteRegionUrls),
-				remoteRegionUrlsWithName, renewalPercentThreshold, renewalThresholdUpdateIntervalMs,
-				responseCacheAutoExpirationInSeconds, responseCacheUpdateIntervalMs, retentionTimeInMSInDeltaQueue,
-				route53BindRebindRetries, route53BindingRetryIntervalMs, route53DomainTTL, syncWhenTimestampDiffers,
-				useReadOnlyResponseCache, waitTimeInMsWhenSyncEmpty, xmlCodecName, initialCapacityOfResponseCache,
+				remoteRegionTrustStore, remoteRegionTrustStorePassword, remoteRegionUrls, remoteRegionUrlsWithName,
+				renewalPercentThreshold, renewalThresholdUpdateIntervalMs, responseCacheAutoExpirationInSeconds,
+				responseCacheUpdateIntervalMs, retentionTimeInMSInDeltaQueue, route53BindRebindRetries,
+				route53BindingRetryIntervalMs, route53DomainTTL, syncWhenTimestampDiffers, useReadOnlyResponseCache,
+				waitTimeInMsWhenSyncEmpty, xmlCodecName, initialCapacityOfResponseCache,
 				expectedClientRenewalIntervalSeconds, useAwsAsgApi, myUrl);
 	}

@@ -16,8 +16,9 @@

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

+import javax.servlet.ServletContext;
+
 import com.netflix.eureka.EurekaServerConfig;
-import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -52,7 +53,7 @@ public class EurekaServerInitializerConfiguration implements ServletContextAware

 	private boolean running;

-	private final int order = 1;
+	private int order = 1;

 	@Override
 	public void setServletContext(ServletContext servletContext) {
@@ -25,7 +25,6 @@ import com.netflix.eureka.EurekaServerConfig;
 import com.netflix.eureka.lease.Lease;
 import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl;
 import com.netflix.eureka.resources.ServerCodecs;
-import com.netflix.eureka.transport.EurekaServerHttpClientFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -46,12 +45,11 @@ public class InstanceRegistry extends PeerAwareInstanceRegistryImpl implements A

 	private ApplicationContext ctxt;

-	private final int defaultOpenForTrafficCount;
+	private int defaultOpenForTrafficCount;

 	public InstanceRegistry(EurekaServerConfig serverConfig, EurekaClientConfig clientConfig, ServerCodecs serverCodecs,
-			EurekaClient eurekaClient, EurekaServerHttpClientFactory eurekaServerHttpClientFactory,
-			int expectedNumberOfClientsSendingRenews, int defaultOpenForTrafficCount) {
-		super(serverConfig, clientConfig, serverCodecs, eurekaClient, eurekaServerHttpClientFactory);
+			EurekaClient eurekaClient, int expectedNumberOfClientsSendingRenews, int defaultOpenForTrafficCount) {
+		super(serverConfig, clientConfig, serverCodecs, eurekaClient);

 		this.expectedNumberOfClientsSendingRenews = expectedNumberOfClientsSendingRenews;
 		this.defaultOpenForTrafficCount = defaultOpenForTrafficCount;
@@ -19,21 +19,20 @@ package org.springframework.cloud.netflix.eureka.server;
 import java.util.Collection;
 import java.util.LinkedHashSet;

-// FIXME: 4.0
-//import com.sun.jersey.api.client.filter.ClientFilter;
+import com.sun.jersey.api.client.filter.ClientFilter;

 /**
 * @author Yuxin Bai
 */
 public class ReplicationClientAdditionalFilters {

-	private final Collection<?> filters;
+	private Collection<ClientFilter> filters;

-	public ReplicationClientAdditionalFilters(Collection<?> filters) {
+	public ReplicationClientAdditionalFilters(Collection<ClientFilter> filters) {
 		this.filters = new LinkedHashSet<>(filters);
 	}

-	public Collection<?> getFilters() {
+	public Collection<ClientFilter> getFilters() {
 		return this.filters;
 	}

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  org.springframework.cloud.netflix.eureka.server.EurekaServerAutoConfiguration
@@ -1 +0,0 @@
-org.springframework.cloud.netflix.eureka.server.EurekaServerAutoConfiguration
@@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.netflix.eureka.server.ApplicationContextTests.Application;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpEntity;
@@ -25,7 +25,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointPr
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.netflix.eureka.server.ApplicationServletPathTests.Application;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpEntity;
@@ -22,7 +22,6 @@ import java.util.Map;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.converters.wrappers.CodecWrapper;
 import com.netflix.eureka.resources.ServerCodecs;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +29,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointPr
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.netflix.eureka.server.ApplicationTests.Application;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpEntity;
@@ -86,7 +85,6 @@ class ApplicationTests {
 	}

 	@Test
-	@Disabled // FIXME 4.0
 	void cssParsedByLess() {
 		String basePath = "http://localhost:" + this.port + "/eureka/css/wro.css";
 		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(basePath, String.class);
@@ -52,7 +52,7 @@ class EurekaControllerReplicasTests {

 	String totalNoAutoList = combinationNoAuthList1 + "," + combinationNoAuthList2;

-	String empty = "";
+	String empty = new String();

 	private ApplicationInfoManager original;

@@ -72,12 +72,12 @@ class EurekaControllerReplicasTests {
 	}

 	@Test
-	void testFilterReplicasNoAuth() {
+	void testFilterReplicasNoAuth() throws Exception {
 		Map<String, Object> model = new HashMap<>();
 		StatusInfo statusInfo = StatusInfo.Builder.newBuilder().add("registered-replicas", empty)
 				.add("available-replicas", noAuthList1).add("unavailable-replicas", noAuthList2)
 				.withInstanceInfo(this.instanceInfo).build();
-		EurekaController controller = new EurekaController(null, new EurekaProperties());
+		EurekaController controller = new EurekaController(null);

 		controller.filterReplicas(model, statusInfo);

@@ -90,12 +90,12 @@ class EurekaControllerReplicasTests {
 	}

 	@Test
-	void testFilterReplicasAuth() {
+	void testFilterReplicasAuth() throws Exception {
 		Map<String, Object> model = new HashMap<>();
 		StatusInfo statusInfo = StatusInfo.Builder.newBuilder().add("registered-replicas", authList2)
 				.add("available-replicas", authList1).add("unavailable-replicas", empty).withInstanceInfo(instanceInfo)
 				.build();
-		EurekaController controller = new EurekaController(null, new EurekaProperties());
+		EurekaController controller = new EurekaController(null);

 		controller.filterReplicas(model, statusInfo);

@@ -108,12 +108,12 @@ class EurekaControllerReplicasTests {
 	}

 	@Test
-	void testFilterReplicasAuthWithCombinationList() {
+	void testFilterReplicasAuthWithCombinationList() throws Exception {
 		Map<String, Object> model = new HashMap<>();
 		StatusInfo statusInfo = StatusInfo.Builder.newBuilder().add("registered-replicas", totalAutoList)
 				.add("available-replicas", combinationAuthList1).add("unavailable-replicas", combinationAuthList2)
 				.withInstanceInfo(instanceInfo).build();
-		EurekaController controller = new EurekaController(null, new EurekaProperties());
+		EurekaController controller = new EurekaController(null);

 		controller.filterReplicas(model, statusInfo);

@@ -93,7 +93,7 @@ class EurekaControllerTests {
 	}

 	@Test
-	void testStatus() {
+	void testStatus() throws Exception {
 		Map<String, Object> model = new HashMap<>();

 		EurekaController controller = new EurekaController(infoManager, new EurekaProperties());
@@ -19,12 +19,10 @@ package org.springframework.cloud.netflix.eureka.server;
 import com.netflix.appinfo.ApplicationInfoManager;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.eureka.EurekaServerConfig;
-import com.netflix.eureka.cluster.PeerEurekaNode;
 import com.netflix.eureka.cluster.PeerEurekaNodes;
 import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
 import com.netflix.eureka.resources.ServerCodecs;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -71,11 +69,6 @@ class EurekaCustomPeerNodesTests {
 			super(registry, serverConfig, clientConfig, serverCodecs, applicationInfoManager);
 		}

-		@Override
-		protected PeerEurekaNode createPeerEurekaNode(String peerEurekaNodeUrl) {
-			return Mockito.mock(PeerEurekaNode.class);
-		}
-
 	}

 }
@@ -71,7 +71,7 @@ class InstanceRegistryTests {
 	private TestEvents testEvents;

 	@Test
-	void testRegister() {
+	void testRegister() throws Exception {
 		// creating instance info
 		final LeaseInfo leaseInfo = getLeaseInfo();
 		final InstanceInfo instanceInfo = getInstanceInfo(APP_NAME, HOST_NAME, INSTANCE_ID, PORT, leaseInfo);
@@ -90,7 +90,7 @@ class InstanceRegistryTests {
 	}

 	@Test
-	void testDefaultLeaseDurationRegisterEvent() {
+	void testDefaultLeaseDurationRegisterEvent() throws Exception {
 		// creating instance info
 		final InstanceInfo instanceInfo = getInstanceInfo(APP_NAME, HOST_NAME, INSTANCE_ID, PORT, null);
 		// calling tested method
@@ -102,7 +102,7 @@ class InstanceRegistryTests {
 	}

 	@Test
-	void testInternalCancel() {
+	void testInternalCancel() throws Exception {
 		// calling tested method
 		instanceRegistry.internalCancel(APP_NAME, HOST_NAME, false);
 		// event of proper type is registered
@@ -118,7 +118,7 @@ class InstanceRegistryTests {
 	}

 	@Test
-	void testRenew() {
+	void testRenew() throws Exception {
 		// Creating two instances of the app
 		final InstanceInfo instanceInfo1 = getInstanceInfo(APP_NAME, HOST_NAME, INSTANCE_ID, PORT, null);
 		final InstanceInfo instanceInfo2 = getInstanceInfo(APP_NAME, HOST_NAME, "my-host-name:8009", 8009, null);
@@ -17,15 +17,20 @@
 package org.springframework.cloud.netflix.eureka.server;

 import java.lang.reflect.Field;
+import java.util.Collections;

 import com.netflix.eureka.cluster.PeerEurekaNodes;
-import org.junit.jupiter.api.Disabled;
+import com.sun.jersey.api.client.ClientHandlerException;
+import com.sun.jersey.api.client.ClientRequest;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.filter.ClientFilter;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.netflix.eureka.server.EurekaServerAutoConfiguration.RefreshablePeerEurekaNodes;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ReflectionUtils;

@@ -34,7 +39,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
 * @author Yuxin Bai
 */
-@Disabled // FIXME: 4.0
@SpringBootTest(classes = RefreshablePeerEurekaNodesWithCustomFiltersTests.Application.class,
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, value = { "spring.application.name=eureka",
 				"server.contextPath=/context", "management.security.enabled=false" })
@@ -48,17 +52,12 @@ class RefreshablePeerEurekaNodesWithCustomFiltersTests {
 		assertThat(peerEurekaNodes instanceof RefreshablePeerEurekaNodes)
 				.as("PeerEurekaNodes should be an instance of RefreshablePeerEurekaNodes").isTrue();

-		// ReplicationClientAdditionalFilters filters =
-		// getField(RefreshablePeerEurekaNodes.class,
-		// (RefreshablePeerEurekaNodes) peerEurekaNodes,
-		// "replicationClientAdditionalFilters");
-		// assertThat(filters.getFilters())
-		// .as("PeerEurekaNodes'should have only one filter set on
-		// replicationClientAdditionalFilters").hasSize(1);
-		// assertThat(filters.getFilters().iterator().next() instanceof
-		// Application.CustomClientFilter)
-		// .as("The type of the filter should be CustomClientFilter as user declared
-		// so").isTrue();
+		ReplicationClientAdditionalFilters filters = getField(RefreshablePeerEurekaNodes.class,
+				(RefreshablePeerEurekaNodes) peerEurekaNodes, "replicationClientAdditionalFilters");
+		assertThat(filters.getFilters())
+				.as("PeerEurekaNodes'should have only one filter set on replicationClientAdditionalFilters").hasSize(1);
+		assertThat(filters.getFilters().iterator().next() instanceof Application.CustomClientFilter)
+				.as("The type of the filter should be CustomClientFilter as user declared so").isTrue();
 	}

 	private static <T, R> R getField(Class<T> clazz, T target, String fieldName) {
@@ -74,19 +73,19 @@ class RefreshablePeerEurekaNodesWithCustomFiltersTests {
 	@EnableEurekaServer
 	protected static class Application {

-		// FIXME: 4.0
-		/*
-		 * @Bean public ReplicationClientAdditionalFilters customFilters() { return new
-		 * ReplicationClientAdditionalFilters(Collections.singletonList(new
-		 * CustomClientFilter())); }
-		 *
-		 * protected class CustomClientFilter extends ClientFilter {
-		 *
-		 * @Override public ClientResponse handle(ClientRequest cr) throws
-		 * ClientHandlerException { return getNext().handle(cr); }
-		 *
-		 * }
-		 */
+		@Bean
+		public ReplicationClientAdditionalFilters customFilters() {
+			return new ReplicationClientAdditionalFilters(Collections.singletonList(new CustomClientFilter()));
+		}
+
+		protected class CustomClientFilter extends ClientFilter {
+
+			@Override
+			public ClientResponse handle(ClientRequest cr) throws ClientHandlerException {
+				return getNext().handle(cr);
+			}
+
+		}

 	}

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-RC3</version>
+		<version>3.1.8</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 	<name>Spring Cloud Starter Netflix Eureka Client</name>
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-RC3</version>
+		<version>3.1.8</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 	<name>Spring Cloud Starter Netflix Eureka Server</name>
@@ -13,4 +13,5 @@
 <suppress files=".*TestAutoConfiguration\.java" checks="JavadocStyle"/>
 <suppress files=".*TestAutoConfiguration\.java" checks="JavadocStyle"/>
 <suppress files=".*Tests\.java" checks="JavadocVariable"/>
+<suppress files=".*EurekaConfigServerBootstrapperIT\.java" checks="JavadocVariable"/>
 </suppressions>
Author	SHA1	Message	Date
buildmaster	554299750a	Update SNAPSHOT to 3.1.8	2023-12-18 23:20:52 +00:00
dependabot[bot]	12554cbd60	Bump actions/setup-java from 3 to 4 (#4231 )	2023-12-04 17:58:13 +01:00
Olga MaciaszekSharma	4112daa5f1	Adjust checkstyle settings.	2023-11-13 14:14:00 +01:00
dependabot[bot]	5c40f13f70	Bump org.mockito:mockito-core from 3.6.0 to 3.6.28 (#4206 )	2023-11-13 14:08:05 +01:00
Olga MaciaszekSharma	564ac7a1a5	Remove Ribbon mentions. Fixes gh-4219.	2023-11-09 18:55:51 +01:00
dependabot[bot]	a76ddd526a	Bump eureka.version from 1.10.17 to 1.10.18 (#4202 )	2023-11-03 14:19:48 +01:00
dependabot[bot]	fdc37f6d54	Bump actions/setup-java from 2 to 3 (#4198 )	2023-11-03 14:19:00 +01:00
dependabot[bot]	28ba6079f0	Bump codecov/codecov-action from 1 to 3 (#4195 )	2023-11-03 14:18:15 +01:00
dependabot[bot]	9a3e622742	Bump actions/checkout from 2 to 4 (#4192 )	2023-11-03 14:16:59 +01:00
Olga MaciaszekSharma	c6ed320cb0	Regenerate docs.	2023-09-26 16:33:00 +02:00
Olga MaciaszekSharma	0053b77e2c	Revert "Update service discovery feature descriptions in documentation" This reverts commit `0e5748f505`. Temporariliy revert change till the CLA is signed by the contributor.	2023-09-26 16:30:24 +02:00
Olga MaciaszekSharma	9a8a542c32	Merge remote-tracking branch 'origin/3.1.x' into 3.1.x	2023-09-26 16:22:03 +02:00
Olga MaciaszekSharma	dd3c86e5ec	Rebuild docs.	2023-09-26 16:21:55 +02:00
Nasser Al-den Ghassan Shareef Khaled	0e5748f505	Update service discovery feature descriptions in documentation	2023-09-26 16:14:58 +02:00
buildmaster	0eb26f03dd	Bumping versions	2023-09-18 14:22:43 +00:00
Olga MaciaszekSharma	23259330c9	Do not fail CI on coverage.	2023-09-18 15:27:59 +02:00
Olga MaciaszekSharma	064197a724	Build with GH actions.	2023-09-18 14:48:06 +02:00
buildmaster	ecfab055f9	Bumping versions	2023-06-30 14:15:10 +00:00
buildmaster	8094476bca	Bumping versions	2023-06-29 14:22:11 +00:00
buildmaster	b5b0f67ada	Bumping versions to 3.1.8-SNAPSHOT after release	2023-06-29 11:24:19 +00:00
buildmaster	209ed2d41c	Going back to snapshots	2023-06-29 11:24:19 +00:00
buildmaster	3d27038710	Update SNAPSHOT to 3.1.7	2023-06-29 11:22:46 +00:00
Ryan BaxterandRyan Baxter	221eb0937c	Implement new apply method in ConfigServerInstanceProvider (#4175 ) Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>	2023-06-13 09:03:36 -04:00
buildmaster	c2dcdacaa2	Bumping versions	2023-04-28 14:22:31 +00:00
buildmaster	7fbf5a51de	Bumping versions to 3.1.7-SNAPSHOT after release	2023-04-27 15:06:45 +00:00
buildmaster	078db236b8	Going back to snapshots	2023-04-27 15:06:45 +00:00
buildmaster	132cf9e4f7	Update SNAPSHOT to 3.1.6	2023-04-27 15:04:15 +00:00
spencergibb	147d50f2c2	Migrates from WebClient.exchange() to retrieve() retrieve() should clean up resources automatically while exchange() requires explicit handling that wasn't being done. Fixes gh-3862	2023-03-03 17:47:27 -05:00
spencergibb	ded713ecc1	Removes comments	2023-03-03 17:44:24 -05:00
buildmaster	890f1ef4d6	Bumping versions to 3.1.6-SNAPSHOT after release	2023-02-23 23:14:31 +00:00
buildmaster	25796a27f0	Going back to snapshots	2023-02-23 23:14:31 +00:00
buildmaster	327b126207	Update SNAPSHOT to 3.1.5	2023-02-23 23:12:59 +00:00
spencergibb	5298970764	skip deploy of test module	2022-12-19 13:05:01 -05:00
Olga Maciaszek-Sharma	6fef357742	Fix javadocs. Add deprecation.	2022-12-13 12:31:22 +01:00
G1	5844550f9a	feat: Adds RestTemplate default ConnectTimeout / ConnectRequestTimeout (#4148 )	2022-12-13 12:21:57 +01:00
buildmaster	c44426f579	Bumping versions	2022-11-29 14:26:47 +00:00
buildmaster	b467a2f462	Going back to snapshots	2022-09-06 20:18:20 +00:00
buildmaster	97ee8144be	Update SNAPSHOT to 3.1.4	2022-09-06 20:16:46 +00:00
buildmaster	4ba8c4ae53	Bumping versions to 3.1.5-SNAPSHOT after release	2022-09-02 23:42:42 +00:00
buildmaster	695787a326	Going back to snapshots	2022-09-02 23:42:41 +00:00
buildmaster	e32db575b8	Update SNAPSHOT to 3.1.4	2022-09-02 23:40:48 +00:00
				`@@ -1 +0,0 @@`
				`org.springframework.cloud.netflix.eureka.server.EurekaServerAutoConfiguration`