#704: Bumped to SpringBoot4, SpringFramework7 and JDK25

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,3 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

amqp/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.cloudevents</groupId>
 		<artifactId>cloudevents-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cloudevents-amqp-proton</artifactId>

api/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.cloudevents</groupId>
         <artifactId>cloudevents-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudevents-api</artifactId>

benchmarks/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.cloudevents</groupId>
         <artifactId>cloudevents-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudevents-benchmarks</artifactId>
@@ -31,7 +31,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>1.23</jmh.version>
-        <javac.target>1.8</javac.target>
+        <javac.target>25</javac.target>
         <!-- Name of the benchmark Uber-JAR to generate. -->
         <uberjar.name>benchmarks</uberjar.name>
         <maven.javadoc.skip>true</maven.javadoc.skip>

bom/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.cloudevents</groupId>
         <artifactId>cloudevents-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudevents-bom</artifactId>

core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.cloudevents</groupId>
         <artifactId>cloudevents-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudevents-core</artifactId>

examples/amqp-proton/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cloudevents-examples</artifactId>
     <groupId>io.cloudevents</groupId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

examples/basic-http/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cloudevents-examples</artifactId>
         <groupId>io.cloudevents</groupId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

examples/kafka/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>cloudevents-examples</artifactId>
         <groupId>io.cloudevents</groupId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

examples/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>cloudevents-parent</artifactId>
         <groupId>io.cloudevents</groupId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

examples/restful-ws-microprofile-liberty/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cloudevents-examples</artifactId>
         <groupId>io.cloudevents</groupId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

examples/restful-ws-quarkus/pom.xml

@@ -5,16 +5,16 @@
     <parent>
         <artifactId>cloudevents-examples</artifactId>
         <groupId>io.cloudevents</groupId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cloudevents-restful-ws-quarkus-example</artifactId>
     <properties>
         <module-name>cloudevents.example.restful.ws.quarkus</module-name>
-        <quarkus-plugin.version>1.10.3.Final</quarkus-plugin.version>
+        <quarkus-plugin.version>3.30.5</quarkus-plugin.version>
         <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-        <quarkus.platform.version>1.10.3.Final</quarkus.platform.version>
+        <quarkus.platform.version>3.30.5</quarkus.platform.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jackson</artifactId>
+            <artifactId>quarkus-rest-jackson</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/client/UserClient.java

@@ -1,8 +1,9 @@
 package io.cloudevents.examples.quarkus.client;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.jackson.JsonFormat;
@@ -11,6 +12,7 @@
 
 @Path("/users")
 @RegisterRestClient
+@ApplicationScoped
 public interface UserClient {
 
     // This will emit binary encoded events.

examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/client/UserEventsGenerator.java

@@ -3,11 +3,11 @@
 import java.net.URI;
 import java.util.UUID;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.MediaType;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.slf4j.Logger;
@@ -26,12 +26,12 @@ public class UserEventsGenerator {
     private static final Logger LOGGER = LoggerFactory.getLogger(UserEventsGenerator.class);
 
     @Inject
-    ObjectMapper mapper;
+    JsonMapper mapper;
 
     @Inject
     @RestClient
     UserClient userClient;
-    
+
     long userCount=0;
 
     @Scheduled(every="2s")

examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/config/ApplicationConfig.java

@@ -0,0 +1,14 @@
+package io.cloudevents.examples.quarkus.config;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import tools.jackson.databind.json.JsonMapper;
+
+@ApplicationScoped
+public class ApplicationConfig {
+    @Produces
+    @ApplicationScoped
+    public JsonMapper jsonMapper() {
+        return JsonMapper.builder().findAndAddModules().build();
+    }
+}

examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/resources/UserResource.java

@@ -1,19 +1,20 @@
 package io.cloudevents.examples.quarkus.resources;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 import io.cloudevents.CloudEvent;
 import io.cloudevents.examples.quarkus.model.User;
 import io.cloudevents.jackson.JsonFormat;
 import io.cloudevents.jackson.PojoCloudEventDataMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,12 +26,12 @@ public class UserResource {
     private static final Logger LOGGER = LoggerFactory.getLogger(UserResource.class);
 
     @Inject
-    ObjectMapper mapper;
+    JsonMapper mapper;
 
     @Context
     UriInfo uriInfo;
 
-    private Map<String, User> users = new HashMap<>();
+    private final Map<String, User> users = new HashMap<>();
 
     @GET
     @Path("/{username}")

examples/restful-ws-quarkus/src/main/resources/application.properties

@@ -4,4 +4,3 @@
 ## The Rest client will send events to the local UserResource
 io.cloudevents.examples.quarkus.client.UserClient/mp-rest/url=http://localhost:8080
 %test.io.cloudevents.examples.quarkus.client.UserClient/mp-rest/url=http://localhost:8081
-io.cloudevents.examples.quarkus.client.UserClient/mp-rest/scope=javax.inject.Singleton

examples/restful-ws-quarkus/src/test/java/io/cloudevents/examples/quarkus/NativeUserResourceTestIT.java

@@ -1,8 +1,8 @@
 package io.cloudevents.examples.quarkus;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class NativeUserResourceTestIT extends UserResourceTest {
 
     // Execute the same tests but in native mode.