Changes for the latest Boot snapshots (#4506)

* Changes for the latest Boot snapshots

* Add Spring Boot Jackson 2 module

Author: ryanjbaxter

spring-cloud-netflix-dependencies/pom.xml

@@ -15,7 +15,6 @@
 	<description>Spring Cloud Netflix Dependencies</description>
 	<properties>
 		<eureka.version>2.0.5</eureka.version>
-		<jackson.version>2.20.0</jackson.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -145,11 +144,6 @@
 					</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/pom.xml

@@ -18,6 +18,10 @@
 		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
 	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-jackson2</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java

@@ -21,12 +21,12 @@
 import com.netflix.discovery.EurekaClientConfig;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.health.SimpleStatusAggregator;
-import org.springframework.boot.actuate.health.StatusAggregator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.health.actuate.endpoint.SimpleStatusAggregator;
+import org.springframework.boot.health.actuate.endpoint.StatusAggregator;
 import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled;
 import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
 import org.springframework.cloud.context.scope.refresh.RefreshScopeRefreshedEvent;

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandler.java

@@ -27,7 +27,7 @@
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.boot.actuate.health.StatusAggregator;
+import org.springframework.boot.health.actuate.endpoint.StatusAggregator;
 import org.springframework.boot.health.contributor.CompositeHealthContributor;
 import org.springframework.boot.health.contributor.CompositeReactiveHealthContributor;
 import org.springframework.boot.health.contributor.Health;

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/EurekaApplications.java

@@ -24,8 +24,8 @@
 import com.netflix.discovery.shared.Applications;
 
 /**
- * A simple wrapper class for {@link Applications} that insure proprer Jackson
- * serialization through the JsonPropert overwrites.
+ * A simple wrapper class for {@link Applications} that insure proper Jackson
+ * serialization through the JsonProperties overwrites.
  *
  * @author Daniel Lavoie
  */

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandlerTests.java

@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
-import org.springframework.boot.actuate.health.SimpleStatusAggregator;
+import org.springframework.boot.health.actuate.endpoint.SimpleStatusAggregator;
 import org.springframework.boot.health.contributor.AbstractHealthIndicator;
 import org.springframework.boot.health.contributor.AbstractReactiveHealthIndicator;
 import org.springframework.boot.health.contributor.CompositeHealthContributor;

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientIntegrationTests.java

@@ -22,7 +22,7 @@
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.cloud.netflix.eureka.http.RestClientEurekaHttpClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests.java

@@ -22,7 +22,7 @@
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.cloud.netflix.eureka.http.WebClientEurekaHttpClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestClientEurekaHttpClientTests.java

@@ -46,7 +46,14 @@
  */
 @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" },
+				"eureka.client.register-with-eureka=false", "logging.level.org.springframework=INFO",
+				// spring.http.converters.preferred-json-mapper=jackson2 is only necessary
+				// to make the
+				// mock Eureka Server used in this test to work
+				// TODO we can likely remove this once this Boot issue is fixed post
+				// 2025.1.0-RC1:
+				// https://github.com/spring-projects/spring-boot/issues/47798
+				"spring.http.converters.preferred-json-mapper=jackson2" },
 		webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 class RestClientEurekaHttpClientTests extends AbstractEurekaHttpClientTests {

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java

@@ -34,7 +34,14 @@
  */
 @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" },
+				"eureka.client.fetch-registry=false", "eureka.client.register-with-eureka=false",
+				// spring.http.converters.preferred-json-mapper=jackson2 is only necessary
+				// to make the
+				// mock Eureka Server used in this test to work
+				// TODO we can likely remove this once this Boot issue is fixed post
+				// 2025.1.0-RC1:
+				// https://github.com/spring-projects/spring-boot/issues/47798
+				"spring.http.converters.preferred-json-mapper=jackson2" },
 		webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 class WebClientEurekaHttpClientTests extends AbstractEurekaHttpClientTests {