spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-17 07:43:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2025-09-19 12:00:53 +02:00
parent 4f9d969a78 224e06856b
commit 9274d7cebe
5 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud-netflix-dependencies/pom.xml
+6
View File
@@ -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>
spring-cloud-netflix-eureka-client-tls-tests/pom.xml
+6
View File
@@ -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>
spring-cloud-netflix-eureka-client/pom.xml
+12
View File
@@ -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>
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java
+3 -3
View File
@@ -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;
spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring.factories
+1 -1
View File
@@ -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