Bump org.springframework.boot:spring-boot-starter-parent from 3.5.7 to 4.0.0

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.5.7</version>
+    <version>4.0.0</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
   <groupId>dev.learning.xapi</groupId>
@@ -272,6 +272,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-jackson2</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>dev.learning.xapi</groupId>
         <artifactId>xapi-model</artifactId>

samples/xapi-server/pom.xml

@@ -24,13 +24,18 @@
     </dependency>
     <dependency>
       <groupId>io.hypersistence</groupId>
-      <artifactId>hypersistence-utils-hibernate-60</artifactId>
-      <version>3.8.3</version>
+      <artifactId>hypersistence-utils-hibernate-70</artifactId>
+      <version>3.12.0</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-devtools</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java

@@ -11,7 +11,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
@@ -25,7 +25,7 @@
  */
 @WebMvcTest(
     value = {StatementController.class},
-    properties = "spring.jackson.deserialization.ACCEPT_SINGLE_VALUE_AS_ARRAY = true")
+    properties = "spring.jackson2.deserialization.ACCEPT_SINGLE_VALUE_AS_ARRAY = true")
 class StatementControllerTest {
 
   @Autowired private MockMvc mvc;

xapi-client/pom.xml

@@ -16,6 +16,16 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-webflux</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-jackson</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-jackson2</artifactId>
     </dependency>
     <dependency>
       <groupId>dev.learning.xapi</groupId>

xapi-client/src/test/java/dev/learning/xapi/client/configuration/WebClientTestConfiguration.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
+ */
+
+package dev.learning.xapi.client.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.client.WebClient;
+
+/**
+ * Test configuration to provide WebClient.Builder bean for tests.
+ *
+ * <p>In Spring Boot 4.0, WebClient.Builder autoconfiguration was moved/removed. This configuration
+ * provides the bean for testing purposes.
+ */
+@Configuration
+public class WebClientTestConfiguration {
+
+  @Bean
+  public WebClient.Builder webClientBuilder() {
+    return WebClient.builder();
+  }
+}

xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java

@@ -16,8 +16,9 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
+import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration;
+import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration;
+import org.springframework.boot.reactor.autoconfigure.ReactorAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient.Builder;
@@ -31,9 +32,11 @@
 @SpringBootTest(
     classes = {
       XapiClientAutoConfiguration.class,
-      WebClientAutoConfiguration.class,
+      WebClientTestConfiguration.class,
+      CodecsAutoConfiguration.class,
+      ReactorAutoConfiguration.class,
       XapiTestClientConfiguration2.class,
-      JacksonAutoConfiguration.class
+      Jackson2AutoConfiguration.class
     },
     properties = "xapi.client.authorization = bearer 1234")
 class XapiClientAutoConfigurationAuthorizationTest {

xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java

@@ -15,8 +15,9 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
+import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration;
+import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration;
+import org.springframework.boot.reactor.autoconfigure.ReactorAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 
 /**
@@ -28,8 +29,10 @@
 @SpringBootTest(
     classes = {
       XapiClientAutoConfiguration.class,
-      WebClientAutoConfiguration.class,
-      JacksonAutoConfiguration.class
+      WebClientTestConfiguration.class,
+      CodecsAutoConfiguration.class,
+      ReactorAutoConfiguration.class,
+      Jackson2AutoConfiguration.class
     },
     properties = {"xapi.client.baseUrl = http://127.0.0.1:55123/"})
 class XapiClientAutoConfigurationBaseUrlTest {

xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java

@@ -16,8 +16,9 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
+import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration;
+import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration;
+import org.springframework.boot.reactor.autoconfigure.ReactorAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient.Builder;
@@ -31,9 +32,11 @@
 @SpringBootTest(
     classes = {
       XapiClientAutoConfiguration.class,
-      WebClientAutoConfiguration.class,
+      WebClientTestConfiguration.class,
+      CodecsAutoConfiguration.class,
+      ReactorAutoConfiguration.class,
       XapiTestClientConfiguration.class,
-      JacksonAutoConfiguration.class
+      Jackson2AutoConfiguration.class
     },
     properties = {"xapi.client.username = username", "xapi.client.password = password"})
 class XapiClientAutoConfigurationUsernamePasswordTest {

xapi-model-spring-boot-starter/pom.xml

@@ -14,6 +14,16 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-jackson</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-jackson2</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java

@@ -29,8 +29,8 @@
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
+import org.springframework.boot.jackson2.autoconfigure.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.boot.jackson2.autoconfigure.Jackson2Properties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -40,7 +40,7 @@
  * @author István Rátkai (Selindek)
  */
 @Configuration
-@AutoConfigureBefore(JacksonProperties.class)
+@AutoConfigureBefore(Jackson2Properties.class)
 public class XapiModelAutoConfiguration {
 
   /**
@@ -49,7 +49,7 @@
    * @return the customizer bean
    */
   @Bean
   public Jackson2ObjectMapperBuilderCustomizer singleValueArrayCustomizer() {
     return builder ->
         builder.postConfigurer(
             objectMapper ->
@@ -66,7 +66,7 @@
       name = "xapi.model.validateObjectType",
       havingValue = "true",
       matchIfMissing = true)
   public Jackson2ObjectMapperBuilderCustomizer validateObjectTypeCustomizer() {
     return builder ->
         builder.postConfigurer(
             objectMapper -> objectMapper.registerModule(new XapiStrictObjectTypeModule()));
@@ -82,7 +82,7 @@
       name = "xapi.model.validateLocale",
       havingValue = "true",
       matchIfMissing = true)
   public Jackson2ObjectMapperBuilderCustomizer validateLocaleCustomizer() {
     return builder ->
         builder.postConfigurer(
             objectMapper -> objectMapper.registerModule(new XapiStrictLocaleModule()));
@@ -98,7 +98,7 @@
       name = "xapi.model.validateTimestamp",
       havingValue = "true",
       matchIfMissing = true)
   public Jackson2ObjectMapperBuilderCustomizer validateTimestampCustomizer() {
     return builder ->
         builder.postConfigurer(
             objectMapper -> objectMapper.registerModule(new XapiStrictTimestampModule()));
@@ -114,7 +114,7 @@
       name = "xapi.model.validateNullValues",
       havingValue = "true",
       matchIfMissing = true)
   public Jackson2ObjectMapperBuilderCustomizer validateNullValuesCustomizer() {
     return builder ->
         builder.postConfigurer(
             objectMapper -> objectMapper.registerModule(new XapiStrictNullValuesModule()));
@@ -130,7 +130,7 @@
       name = "xapi.model.validateProperties",
       havingValue = "true",
       matchIfMissing = true)
   public Jackson2ObjectMapperBuilderCustomizer validatePropertiesCustomizer() {
     return builder ->
         builder.postConfigurer(
             objectMapper ->
@@ -147,7 +147,7 @@
       name = "xapi.model.validateJson",
       havingValue = "true",
       matchIfMissing = true)
   public Jackson2ObjectMapperBuilderCustomizer validateJsonCustomizer() {
     return builder ->
         builder.postConfigurer(
             objectMapper ->
@@ -164,7 +164,7 @@
       name = "xapi.model.validateLiterals",
       havingValue = "true",
       matchIfMissing = true)
   public Jackson2ObjectMapperBuilderCustomizer validateLiteralsCustomizer() {
     return builder ->
         builder.postConfigurer(
             objectMapper -> {