From 12f664ab7681d4038e32a47f863bf823f87abbd6 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 18 Sep 2025 16:08:05 +0200 Subject: [PATCH 1/2] Use Jackson `2.20.0` in Eureka Client (#4496) * Revert "Disables WebClientEurekaHttpClientTests" This reverts commit ad30b66f9422a2d342e0d35360096e76ff395d14. Signed-off-by: Olga Maciaszek-Sharma * Use Jackson `2.20.0` in Client. Signed-off-by: Olga Maciaszek-Sharma --------- Signed-off-by: Olga Maciaszek-Sharma --- spring-cloud-netflix-dependencies/pom.xml | 6 ++++++ .../pom.xml | 6 ++++++ spring-cloud-netflix-eureka-client/pom.xml | 12 ++++++++++++ .../http/WebClientEurekaHttpClientTests.java | 14 ++++++-------- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 844838a81..8009d31a9 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -15,6 +15,7 @@ Spring Cloud Netflix Dependencies 2.0.5 + 2.20.0 @@ -144,6 +145,11 @@ + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index f407c2331..e740225c3 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -66,6 +66,12 @@ org.springframework.boot spring-boot-starter-actuator + + + tools.jackson.core + jackson-databind + + true diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index e7bee89c9..7ae1c4728 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -42,10 +42,22 @@ org.springframework.boot spring-boot-starter-actuator true + + + tools.jackson.core + jackson-databind + + org.springframework.boot spring-boot-starter-webflux + + + tools.jackson.core + jackson-databind + + true diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java index 7ec53f509..49e409575 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java @@ -19,10 +19,11 @@ package org.springframework.cloud.netflix.eureka.http; import com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider; import com.netflix.discovery.shared.resolver.DefaultEndpoint; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean; import org.springframework.test.annotation.DirtiesContext; @@ -31,14 +32,11 @@ 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" }, -// webEnvironment = WebEnvironment.RANDOM_PORT) -// +@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" }, + webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext -@Disabled("https://github.com/spring-cloud/spring-cloud-netflix/issues/4495") class WebClientEurekaHttpClientTests extends AbstractEurekaHttpClientTests { @Autowired From 224e06856b732077f97c6abce4139be903ad14da Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 18 Sep 2025 14:55:33 -0400 Subject: [PATCH 2/2] Fixing new Bootstrap changes --- .../eureka/config/EurekaConfigServerBootstrapper.java | 6 +++--- .../src/main/resources/META-INF/spring.factories | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java index e5d07360f..1366b9eb7 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java @@ -20,9 +20,9 @@ import java.util.Collections; import com.netflix.discovery.shared.transport.EurekaHttpClient; -import org.springframework.boot.BootstrapContext; -import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.BootstrapRegistryInitializer; +import org.springframework.boot.bootstrap.BootstrapContext; +import org.springframework.boot.bootstrap.BootstrapRegistry; +import org.springframework.boot.bootstrap.BootstrapRegistryInitializer; import org.springframework.boot.context.properties.bind.BindHandler; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.cloud.config.client.ConfigClientProperties; diff --git a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring.factories b/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring.factories index c2189497a..e422b797c 100644 --- a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.netflix.eureka.config.EurekaConfigServerBootstrapConfiguration -org.springframework.boot.BootstrapRegistryInitializer=\ +org.springframework.boot.bootstrap.BootstrapRegistryInitializer=\ org.springframework.cloud.netflix.eureka.config.EurekaConfigServerBootstrapper