Compare commits

...
Author SHA1 Message Date
Olga Maciaszek-Sharma a9f0d4bf2a Use Jackson 2.20.0 in Client.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-09-17 20:03:56 +02:00
Olga Maciaszek-Sharma 595a101487 Revert "Disables WebClientEurekaHttpClientTests"
This reverts commit ad30b66f94.

Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-09-17 20:03:56 +02:00
4 changed files with 30 additions and 8 deletions
@@ -15,6 +15,7 @@
<description>Spring Cloud Netflix Dependencies</description>
<properties>
<eureka.version>2.0.5</eureka.version>
<jackson.version>2.20.0</jackson.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -144,6 +145,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId> com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>
@@ -66,6 +66,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<exclusions>
<exclusion>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency>
@@ -42,10 +42,22 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<exclusions>
<exclusion>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency>
@@ -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