#704: Bumped to SpringBoot4, SpringFramework7 and JDK17

.github/workflows/branch.yaml

@@ -33,7 +33,7 @@ jobs:
       - name: Setup java
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 17
           server-id: central # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME # env variable for username in deploy
           server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy

.github/workflows/bump.yaml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup java
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 17
       - name: Bump version using Maven
         if: ${{ inputs.maven-modules == 'true' }}
         run: './mvnw versions:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -B'

.github/workflows/pr.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 17, 25 ]
     name: Java ${{ matrix.java }} Test
     steps:
       - uses: actions/checkout@v2

.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>

amqp/src/main/java/io/cloudevents/amqp/impl/AmqpConstants.java

@@ -110,11 +110,9 @@ public static byte[] getPayloadAsByteArray(final Section payload) {
             return null;
         }
 
-        if (payload instanceof Data) {
-            final Data body = (Data) payload;
+        if (payload instanceof Data body) {
             return body.getValue().getArray();
-        } else if (payload instanceof AmqpValue) {
-            final AmqpValue body = (AmqpValue) payload;
+        } else if (payload instanceof AmqpValue body) {
             if (body.getValue() instanceof byte[]) {
                 return (byte[]) body.getValue();
             } else if (body.getValue() instanceof String &&

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>17</javac.target>
         <!-- Name of the benchmark Uber-JAR to generate. -->
         <uberjar.name>benchmarks</uberjar.name>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -149,7 +149,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.9.1</version>
+                    <version>3.12.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -165,7 +165,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.17</version>
+                    <version>3.5.4</version>
                 </plugin>
             </plugins>
         </pluginManagement>

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>

core/src/main/java/io/cloudevents/core/CloudEventUtils.java

@@ -46,8 +46,8 @@ private CloudEventUtils() {}
      * @return the reader implementation
      */
     public static CloudEventReader toReader(CloudEvent event) {
-        if (event instanceof CloudEventReader) {
-            return (CloudEventReader) event;
+        if (event instanceof CloudEventReader reader) {
+            return reader;
         } else {
             return new CloudEventReaderAdapter(event);
         }
@@ -63,8 +63,8 @@ public static CloudEventReader toReader(CloudEvent event) {
      * @return the context reader implementation
      */
     public static CloudEventContextReader toContextReader(CloudEventContext event) {
-        if (event instanceof CloudEventContextReader) {
-            return (CloudEventContextReader) event;
+        if (event instanceof CloudEventContextReader reader) {
+            return reader;
         } else {
             return new CloudEventContextReaderAdapter(event);
         }

core/src/main/java/io/cloudevents/core/impl/CloudEventContextReaderAdapter.java

@@ -54,16 +54,16 @@ public void readAttributes(CloudEventContextWriter writer) throws RuntimeExcepti
     public void readExtensions(CloudEventContextWriter writer) throws RuntimeException {
         for (String key : event.getExtensionNames()) {
             Object value = event.getExtension(key);
-            if (value instanceof String) {
-                writer.withContextAttribute(key, (String) value);
-            } else if (value instanceof Number) {
-                writer.withContextAttribute(key, (Number) value);
-            } else if (value instanceof Boolean) {
-                writer.withContextAttribute(key, (Boolean) value);
-            } else if (value instanceof URI) {
-                writer.withContextAttribute(key, (URI) value);
-            } else if (value instanceof OffsetDateTime) {
-                writer.withContextAttribute(key, (OffsetDateTime) value);
+            if (value instanceof String string) {
+                writer.withContextAttribute(key, string);
+            } else if (value instanceof Number number) {
+                writer.withContextAttribute(key, number);
+            } else if (value instanceof Boolean boolean1) {
+                writer.withContextAttribute(key, boolean1);
+            } else if (value instanceof URI rI) {
+                writer.withContextAttribute(key, rI);
+            } else if (value instanceof OffsetDateTime time) {
+                writer.withContextAttribute(key, time);
             } else {
                 // This should never happen because we build that map only through our builders
                 throw new IllegalStateException("Illegal value inside extensions map: " + key + " " + value);

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>
 
@@ -28,7 +28,6 @@
         <module>amqp-proton</module>
         <module>spring-reactive</module>
         <module>spring-rsocket</module>
-        <module>spring-function</module>
         <module>rocketmq</module>
     </modules>
 

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>
@@ -36,18 +36,23 @@
     </profiles>
 
     <dependencies>
+        <dependency>
+            <groupId>io.cloudevents</groupId>
+            <artifactId>cloudevents-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.cloudevents</groupId>
+            <artifactId>cloudevents-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
             <version>5.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>io.cloudevents</groupId>
-            <artifactId>cloudevents-http-restful-ws-jakarta</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
@@ -148,7 +153,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.18.1</version>
+                <version>3.5.4</version>
                 <executions>
                     <execution>
                         <phase>integration-test</phase>