Chore/migrate to spring boot 4 (#1550)

* chore: migrate to spring boot 4 (wip)

* chore: migrate to spring boot 4 (wip) - back to jackson 2

* chore: upgrade libraries to spring boot 4

sqs is not supported yet. requires update to io-awspring-cloud

* chore: cleanup

* chore: update library version management

* chore: update dependencies

* chore(sqs): disable plugin while no update is available

* chore(jms): update broker configuration

* fix(core): fix MessageDto after rebase

* fix(core): fix HeaderValueSerializer

* chore: resolve deprecations for org.springframework.lang.Nullable

* chore: resolve deprecations for jspecify

Author: timonback

.github/workflows/springwolf-plugins.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        plugin: [ "amqp", "cloud-stream", "jms", "kafka", "sns", "sqs", "stomp" ]
+        plugin: [ "amqp", "cloud-stream", "jms", "kafka", "sns", "stomp" ] # "sqs" , re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
 
     env:
       plugin: springwolf-plugins/springwolf-${{ matrix.plugin }}-plugin

build.gradle

@@ -32,7 +32,7 @@ var plugins = [
         'springwolf-jms',
         'springwolf-kafka',
         'springwolf-sns',
-        'springwolf-sqs',
+//        'springwolf-sqs', re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
         'springwolf-stomp'
 ]
 
@@ -106,7 +106,7 @@ allprojects {
 
         useJUnitPlatform()
         testLogging {
-            showStandardStreams = true
+            // showStandardStreams = true
 
             events "skipped", "failed"
             exceptionFormat = 'full'

gradle/libs.versions.toml

@@ -21,29 +21,35 @@ owasp-dependencycheck = "12.1.9"
 protobuf = "4.33.1"
 protobuf-plugin =  "0.9.5"
 spotless = "8.0.0"
-spring-boot-plugin = "3.5.7"
+spring-boot-plugin = "4.0.0"
 spring-cloud = "2025.1.0" # not managed by spring-boot-dependencies
-spring-cloud-stream = "4.3.0" # not managed by spring-boot-dependencies
+spring-cloud-stream = "5.0.0" # not managed by spring-boot-dependencies
 
 [libraries]
 activemq-broker = { module = "org.apache.activemq:activemq-broker", version.ref = "activemq" }
 amqp-client = "com.rabbitmq:amqp-client:5.27.1"
 assertj-core = "org.assertj:assertj-core:3.27.6"
 avro = "org.apache.avro:avro:1.12.1"
 awaitility = "org.awaitility:awaitility:4.3.0"
+commons-io = "commons-io:commons-io:2.20.0"
 commons-lang3 = "org.apache.commons:commons-lang3:3.20.0"
+commons-logging = "commons-logging:commons-logging:1.3.5"
 jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.20"
 jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson-core" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson-core" }
 jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson-core" }
 jackson-datatype-protobuf = "com.hubspot.jackson:jackson-datatype-protobuf:0.9.18"
 jakarta-annotation-api = "jakarta.annotation:jakarta.annotation-api:3.0.0"
 jakarta-jms-api = "jakarta.jms:jakarta.jms-api:3.1.0"
+jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:6.1.0"
 jakarta-validation-api = "jakarta.validation:jakarta.validation-api:3.1.1"
+jakarta-websocket-api = "jakarta.websocket:jakarta.websocket-api:2.2.0"
+jakarta-websocket-client-api = "jakarta.websocket:jakarta.websocket-client-api:2.2.0"
 jakarta-xml-bind-api = "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
 jetbrains-annotations = "org.jetbrains:annotations:26.0.2"
 json-schema-validator = "com.networknt:json-schema-validator:1.5.9"
 json-unit-assertj = "net.javacrumbs.json-unit:json-unit-assertj:5.1.0"
+jspecify = "org.jspecify:jspecify:1.0.0"
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "org-junit-jupiter" }
 junit-plattform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "org-junit-plattform" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit-jupiter" }
@@ -70,27 +76,30 @@ spring-cloud-aws-starter-sqs = { module = "io.awspring.cloud:spring-cloud-aws-st
 spring-amqp = { module = "org.springframework.amqp:spring-amqp" }
 spring-rabbit = { module = "org.springframework.amqp:spring-rabbit" }
 spring-boot = { module = "org.springframework.boot:spring-boot" }
-spring-boot-actuator = { module = "org.springframework.boot:spring-boot-actuator" }
+spring-boot-artemis = { module = "org.springframework.boot:spring-boot-artemis" }
 spring-boot-autoconfigure = { module = "org.springframework.boot:spring-boot-autoconfigure" }
 spring-boot-configuration-processor = { module = "org.springframework.boot:spring-boot-configuration-processor" }
+spring-boot-jackson2 = { module = "org.springframework.boot:spring-boot-jackson2", version.ref = "spring-boot-plugin" }
+spring-boot-jms = { module = "org.springframework.boot:spring-boot-jms" }
+spring-boot-kafka = { module = "org.springframework.boot:spring-boot-kafka" }
+spring-boot-restclient-test = { module = "org.springframework.boot:spring-boot-resttestclient" }
 spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator" }
-spring-boot-starter-artemis = { module = "org.springframework.boot:spring-boot-starter-artemis" }
-spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web" }
-spring-boot-starter-websocket = { module = "org.springframework.boot:spring-boot-starter-websocket" }
+spring-boot-starter-amqp = { module = "org.springframework.boot:spring-boot-starter-amqp" }
+spring-boot-starter-webmvc = { module = "org.springframework.boot:spring-boot-starter-webmvc" }
 spring-boot-test = { module = "org.springframework.boot:spring-boot-test" }
-spring-boot-test-autoconfigure = { module = "org.springframework.boot:spring-boot-test-autoconfigure" }
+spring-boot-webmvc = { module = "org.springframework.boot:spring-boot-webmvc" }
+spring-boot-webmvc-test = { module = "org.springframework.boot:spring-boot-webmvc-test" }
 spring-cloud-dependencies = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "spring-cloud" }
 spring-cloud-starter-stream-kafka = { module = "org.springframework.cloud:spring-cloud-starter-stream-kafka", version.ref = "spring-cloud-stream" }
 spring-cloud-stream = { module = "org.springframework.cloud:spring-cloud-stream", version.ref = "spring-cloud-stream" }
-spring-kafka = { module = "org.springframework.kafka:spring-kafka" }
-spring-kafka-test = { module = "org.springframework.kafka:spring-kafka-test" }
 spring-security-config = { module = "org.springframework.security:spring-security-config" }
 spring-security-web = { module = "org.springframework.security:spring-security-web" }
 spring-beans = { module = "org.springframework:spring-beans" }
 spring-context = { module = "org.springframework:spring-context" }
 spring-core = { module = "org.springframework:spring-core" }
-spring-jcl = { module = "org.springframework:spring-jcl" }
 spring-jms = { module = "org.springframework:spring-jms" }
+spring-kafka = { module = "org.springframework.kafka:spring-kafka" }
+spring-kafka-test = { module = "org.springframework.kafka:spring-kafka-test" }
 spring-messaging = { module = "org.springframework:spring-messaging" }
 spring-test = { module = "org.springframework:spring-test" }
 spring-web = { module = "org.springframework:spring-web" }

settings.gradle

@@ -8,15 +8,15 @@ include(
         'springwolf-plugins:springwolf-jms-plugin',
         'springwolf-plugins:springwolf-kafka-plugin',
         'springwolf-plugins:springwolf-sns-plugin',
-        'springwolf-plugins:springwolf-sqs-plugin',
+//        'springwolf-plugins:springwolf-sqs-plugin', re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
         'springwolf-plugins:springwolf-stomp-plugin',
         'springwolf-examples:e2e',
         'springwolf-examples:springwolf-amqp-example',
         'springwolf-examples:springwolf-cloud-stream-example',
         'springwolf-examples:springwolf-jms-example',
         'springwolf-examples:springwolf-kafka-example',
         'springwolf-examples:springwolf-sns-example',
-        'springwolf-examples:springwolf-sqs-example',
+//        'springwolf-examples:springwolf-sqs-example', re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
         'springwolf-examples:springwolf-stomp-example',
         'springwolf-bindings:springwolf-amqp-binding',
         'springwolf-bindings:springwolf-googlepubsub-binding',
@@ -37,6 +37,6 @@ project(':springwolf-plugins:springwolf-cloud-stream-plugin').name = 'springwolf
 project(':springwolf-plugins:springwolf-jms-plugin').name = 'springwolf-jms'
 project(':springwolf-plugins:springwolf-kafka-plugin').name = 'springwolf-kafka'
 project(':springwolf-plugins:springwolf-sns-plugin').name = 'springwolf-sns'
-project(':springwolf-plugins:springwolf-sqs-plugin').name = 'springwolf-sqs'
+//project(':springwolf-plugins:springwolf-sqs-plugin').name = 'springwolf-sqs', re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
 project(':springwolf-plugins:springwolf-stomp-plugin').name = 'springwolf-stomp'
 

springwolf-add-ons/springwolf-json-schema/build.gradle

@@ -11,11 +11,11 @@ dependencies {
     api project(":springwolf-core")
     api project(":springwolf-asyncapi")
 
+    implementation libs.jakarta.annotation.api
+
     implementation libs.jackson.core
     implementation libs.jackson.databind
-    implementation libs.spring.core
 
-    testImplementation libs.swagger.core.jakarta
     testImplementation libs.swagger.models.jakarta
 
     implementation libs.slf4j.api

springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/JsonSchemaGenerator.java

@@ -1,33 +1,33 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.addons.json_schema;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.github.springwolf.asyncapi.v3.model.ReferenceUtil;
 import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
 import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
-import org.springframework.lang.Nullable;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
 @RequiredArgsConstructor
 public class JsonSchemaGenerator {
-    private static final ObjectMapper objectMapper = new ObjectMapper();
+    private static final ObjectMapper jsonMapper = JsonMapper.builder().build();
 
-    public Object fromSchema(ComponentSchema schema, Map<String, ComponentSchema> definitions)
-            throws JsonProcessingException {
+    public Object fromSchema(ComponentSchema schema, Map<String, ComponentSchema> definitions) throws JacksonException {
         ObjectNode node = fromSchemaInternal(schema, definitions, new HashSet<>());
         node.put("$schema", "https://json-schema.org/draft-04/schema#");
 
-        return objectMapper.readValue(node.toString(), Object.class);
+        return jsonMapper.readValue(node.toString(), Object.class);
     }
 
     private ObjectNode fromSchemaInternal(
@@ -37,28 +37,28 @@ private ObjectNode fromSchemaInternal(
 
             return mapToJsonSchema(schema, definitions, visited);
         }
-        return objectMapper.createObjectNode();
+        return jsonMapper.createObjectNode();
     }
 
     private ObjectNode mapToJsonSchema(
             ComponentSchema componentSchema, Map<String, ComponentSchema> definitions, Set<ComponentSchema> visited) {
-        ObjectNode node = objectMapper.createObjectNode();
+        ObjectNode node = jsonMapper.createObjectNode();
 
         SchemaObject schema = getSchemaObject(componentSchema, definitions);
         if (schema == null) {
             return node;
         }
 
         if (schema.getAnyOf() != null) {
-            ArrayNode arrayNode = objectMapper.createArrayNode();
+            ArrayNode arrayNode = jsonMapper.createArrayNode();
             for (ComponentSchema ofSchema : schema.getAnyOf()) {
                 ComponentSchema resolvedSchemaObject = resolveSchemaRef(ofSchema, definitions);
                 arrayNode.add(fromSchemaInternal(resolvedSchemaObject, definitions, visited));
             }
             node.set("anyOf", arrayNode);
         }
         if (schema.getAllOf() != null) {
-            ArrayNode arrayNode = objectMapper.createArrayNode();
+            ArrayNode arrayNode = jsonMapper.createArrayNode();
             for (ComponentSchema allSchema : schema.getAllOf()) {
                 ComponentSchema resolvedSchemaObject = resolveSchemaRef(allSchema, definitions);
                 arrayNode.add(fromSchemaInternal(resolvedSchemaObject, definitions, visited));
@@ -72,7 +72,7 @@ private ObjectNode mapToJsonSchema(
             node.put("description", schema.getDescription());
         }
         if (schema.getEnumValues() != null) {
-            ArrayNode arrayNode = objectMapper.createArrayNode();
+            ArrayNode arrayNode = jsonMapper.createArrayNode();
             for (Object property : schema.getEnumValues()) {
                 arrayNode.add(property == null ? null : property.toString());
             }
@@ -117,7 +117,7 @@ private ObjectNode mapToJsonSchema(
             node.set("not", fromSchemaInternal(resolvedSchemaObject, definitions, visited));
         }
         if (schema.getOneOf() != null) {
-            ArrayNode arrayNode = objectMapper.createArrayNode();
+            ArrayNode arrayNode = jsonMapper.createArrayNode();
             for (ComponentSchema ofSchema : schema.getOneOf()) {
                 ComponentSchema resolvedSchemaObject = resolveSchemaRef(ofSchema, definitions);
                 arrayNode.add(fromSchemaInternal(resolvedSchemaObject, definitions, visited));
@@ -131,7 +131,7 @@ private ObjectNode mapToJsonSchema(
             node.set("properties", buildProperties(schema, definitions, visited));
         }
         if (schema.getRequired() != null) {
-            ArrayNode arrayNode = objectMapper.createArrayNode();
+            ArrayNode arrayNode = jsonMapper.createArrayNode();
             for (String property : schema.getRequired()) {
                 arrayNode.add(property);
             }
@@ -144,7 +144,7 @@ private ObjectNode mapToJsonSchema(
             if (schema.getType().size() == 1) {
                 node.put("type", schema.getType().iterator().next());
             } else if (schema.getType().size() > 1) {
-                ArrayNode arrayNode = objectMapper.createArrayNode();
+                ArrayNode arrayNode = jsonMapper.createArrayNode();
                 schema.getType().forEach(arrayNode::add);
                 node.set("type", arrayNode);
             }
@@ -158,7 +158,7 @@ private ObjectNode mapToJsonSchema(
 
     private JsonNode buildProperties(
             SchemaObject schema, Map<String, ComponentSchema> definitions, Set<ComponentSchema> visited) {
-        ObjectNode node = objectMapper.createObjectNode();
+        ObjectNode node = jsonMapper.createObjectNode();
 
         for (Map.Entry<String, Object> propertySchemaSet :
                 schema.getProperties().entrySet()) {

springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/springwolf/addons/json_schema/JsonSchemaGeneratorTest.java

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.addons.json_schema;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.SpecVersionDetector;
 import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
@@ -12,7 +12,6 @@
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaType;
 import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaMapper;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
-import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.BooleanSchema;
 import io.swagger.v3.oas.models.media.EmailSchema;
@@ -35,7 +34,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 class JsonSchemaGeneratorTest {
-    private final ObjectMapper mapper = Json.mapper();
+    private final JsonMapper mapper = JsonMapper.builder().build();
     private final SwaggerSchemaMapper swaggerSchemaMapper = new SwaggerSchemaMapper(new SpringwolfConfigProperties());
     private final JsonSchemaGenerator jsonSchemaGenerator = new JsonSchemaGenerator();
 
@@ -278,7 +277,9 @@ public static Stream<Arguments> validateJsonSchemaTest() {
                 );
     }
 
-    private void verifyValidJsonSchema(String content) throws JsonProcessingException {
+    private void verifyValidJsonSchema(String content) throws JacksonException {
+        // not supported in jackson 3 yet: https://github.com/networknt/json-schema-validator/issues/1207
+
         JsonNode jsonNode = mapper.readTree(content);
         JsonSchemaFactory.getInstance(SpecVersionDetector.detect(jsonNode));
     }

springwolf-add-ons/springwolf-kotlinx-serialization-model-converter/src/test/java/io/github/springwolf/addons/kotlinx_serialization_model_converter/converter/KotlinxSerializationTypeConverterTest.java

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.addons.kotlinx_serialization_model_converter.converter;
 
-import com.fasterxml.jackson.core.PrettyPrinter;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.core.converter.AnnotatedType;
 import io.swagger.v3.core.converter.ModelConverters;
@@ -17,8 +15,7 @@
 
 class KotlinxSerializationTypeConverterTest {
 
-    ObjectMapper jsonMapper = ObjectMapperFactory.createJson31();
-    private final PrettyPrinter printer = new DefaultPrettyPrinter();
+    private static final ObjectMapper jsonMapper = ObjectMapperFactory.createJson31();
 
     private ModelConverters modelConverters;
 
@@ -37,7 +34,8 @@ void validateGeneratedJson() throws Exception {
         var media = converters.readAll(new AnnotatedType(SampleEvent.class));
 
         String example = ClasspathUtil.readAsString("/simple.json");
-        assertThatJson(jsonMapper.writer(printer).writeValueAsString(media)).isEqualTo(example);
+        assertThatJson(jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(media))
+                .isEqualTo(example);
     }
 
     @Test
@@ -49,7 +47,8 @@ void validateGeneratedFqnJson() throws Exception {
         var media = converters.readAll(new AnnotatedType(SampleEvent.class));
 
         String example = ClasspathUtil.readAsString("/fqn.json");
-        assertThatJson(jsonMapper.writer(printer).writeValueAsString(media)).isEqualTo(example);
+        assertThatJson(jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(media))
+                .isEqualTo(example);
     }
 
     @Nested

springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/AsyncApiSerializerService.java

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.asyncapi.v3.jackson;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JacksonException;
 
 public interface AsyncApiSerializerService {
 
-    String toJsonString(Object asyncAPI) throws JsonProcessingException;
+    String toJsonString(Object asyncAPI) throws JacksonException;
 
-    String toYaml(Object asyncAPI) throws JsonProcessingException;
+    String toYaml(Object asyncAPI) throws JacksonException;
 }