Update to use Spring Boot 4.0.0 without updating to Jackson 3 (#266)

Author: bmatthews68

pom.xml

@@ -52,7 +52,7 @@
     <maven.compiler.release>17</maven.compiler.release>
     <spotless.version>3.1.0</spotless.version>
     <josdk.version>5.2.0</josdk.version>
-    <spring-boot.version>3.5.8</spring-boot.version>
+    <spring-boot.version>4.0.0</spring-boot.version>
     <surefire.version>3.5.4</surefire.version>
     <fabric8-client.version>7.3.1</fabric8-client.version>
     <jenvtest.version>0.9.7</jenvtest.version>

starter-test/pom.xml

@@ -82,6 +82,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/EnableMockOperator.java

@@ -3,7 +3,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import org.springframework.boot.test.autoconfigure.properties.PropertyMapping;
+import org.springframework.boot.test.context.PropertyMapping;
 import org.springframework.context.annotation.Import;
 
 @Retention(RetentionPolicy.RUNTIME)

starter-test/src/test/java/io/javaoperatorsdk/operator/springboot/starter/test/HealthIndicatorTest.java

@@ -3,29 +3,29 @@
 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.web.client.TestRestTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
     "management.endpoint.health.enabled=true", "management.endpoint.health.show-details=always"})
 @EnableMockOperator(crdPaths = "classpath:crd.yml")
+@AutoConfigureMockMvc
 class HealthIndicatorTest {
 
   @Autowired
-  private TestRestTemplate restTemplate;
+  private MockMvc mockMvc;
 
   @Test
-  void testOperatorHealthIndicator() {
-    ResponseEntity<String> entity =
-        this.restTemplate.getForEntity("/actuator/health", String.class);
-    assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
-    assertThat(entity.getBody()).contains("\"status\":\"UP\"");
-    assertThat(entity.getBody())
-        .contains(
-            "\"operator\":{\"status\":\"UP\",\"details\":{\"customservicereconciler\":\"OK\"}}");
+  void testOperatorHealthIndicator() throws Exception {
+    mockMvc.perform(get("/actuator/health"))
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("$.status").value("UP"))
+        .andExpect(jsonPath("$.components.operator.status").value("UP"))
+        .andExpect(jsonPath("$.components.operator.details.customservicereconciler").value("OK"));
   }
 
 }

starter/pom.xml

@@ -57,6 +57,16 @@
       <artifactId>spring-boot-actuator-autoconfigure</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-health</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-jackson2</artifactId>
+      <optional>true</optional>
+    </dependency>
     <!-- without this, the app exits after 1 minute  -->
     <dependency>
       <groupId>org.springframework.boot</groupId>

starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorHealthIndicator.java

@@ -2,8 +2,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.health.contributor.AbstractHealthIndicator;
+import org.springframework.boot.health.contributor.Health;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;