From d18e3c143a2e921554eb4ed7459f9360fc444c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Greffier?= Date: Sat, 22 Nov 2025 23:03:48 +0100 Subject: [PATCH] Bump to Java 25 --- .docker/Dockerfile | 13 ------------- .github/workflows/build.yml | 6 ++---- .mvn/wrapper/maven-wrapper.properties | 2 +- README.md | 2 +- dsl/README.md | 2 +- .../error/handling/dsl/KafkaStreamsAppTest.java | 12 +++--------- pom.xml | 8 ++++---- processor-api/README.md | 2 +- .../error/handling/papi/KafkaStreamsAppTest.java | 12 +++--------- 9 files changed, 16 insertions(+), 43 deletions(-) delete mode 100644 .docker/Dockerfile diff --git a/.docker/Dockerfile b/.docker/Dockerfile deleted file mode 100644 index f408d90..0000000 --- a/.docker/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM eclipse-temurin:21-jre-alpine - -LABEL org.opencontainers.image.authors="Michelin" - -COPY target/kafka-streams-processing-error-handling.jar /app/kafka-streams-processing-error-handling.jar - -RUN apk update \ - && echo -e "#!/bin/sh\n\njava -jar /app/kafka-streams-processing-error-handling.jar \"\$@\"" > /usr/bin/kafka-streams-processing-error-handling \ - && chmod +x /usr/bin/kafka-streams-processing-error-handling \ - && apk upgrade \ - && rm -rf /var/cache/apk/* - -ENTRYPOINT ["kafka-streams-processing-error-handling"] \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d621440..0781136 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,6 @@ on: pull_request: branches: - 'main' - schedule: - - cron: '0 5 * * 1' jobs: build: @@ -20,10 +18,10 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '25' distribution: 'temurin' cache: maven diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 84f26c9..0ea42ff 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. 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 \ No newline at end of file +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/README.md b/README.md index 6ff6cf7..9a23b3e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Available since Apache Kafka 3.9.0, this example showcases the use of the Kafka ## Prerequisites -- Java 21 +- Java 25 - Maven - Docker diff --git a/dsl/README.md b/dsl/README.md index 4e88e87..aaefaf1 100644 --- a/dsl/README.md +++ b/dsl/README.md @@ -6,7 +6,7 @@ This module demonstrates how to use the processing exception handler to manage p To compile and run this demo, you’ll need: -- Java 21 +- Java 25 - Maven - Docker diff --git a/dsl/src/test/java/com/michelin/kafka/error/handling/dsl/KafkaStreamsAppTest.java b/dsl/src/test/java/com/michelin/kafka/error/handling/dsl/KafkaStreamsAppTest.java index 4d688f8..c4020b5 100644 --- a/dsl/src/test/java/com/michelin/kafka/error/handling/dsl/KafkaStreamsAppTest.java +++ b/dsl/src/test/java/com/michelin/kafka/error/handling/dsl/KafkaStreamsAppTest.java @@ -65,9 +65,7 @@ static Stream provideProcessingExceptionHandlerClassName() { void shouldContinueOnInvalidDeliveryAndNullPointerExceptions(String processingExceptionHandlerClassName) { instantiateTopologyTestDriver(processingExceptionHandlerClassName); - inputTopic.pipeInput( - "DEL12345", - """ + inputTopic.pipeInput("DEL12345", """ { "deliveryId": "DEL12345", "truckId": "TRK56789", @@ -77,9 +75,7 @@ void shouldContinueOnInvalidDeliveryAndNullPointerExceptions(String processingEx """); // "numberOfTires" is negative. This will throw an InvalidDeliveryException - inputTopic.pipeInput( - "DEL73148", - """ + inputTopic.pipeInput("DEL73148", """ { "deliveryId": "DEL67145", "truckId": "TRK34567", @@ -89,9 +85,7 @@ void shouldContinueOnInvalidDeliveryAndNullPointerExceptions(String processingEx """); // "numberOfTires" is missing. This will throw a NullPointerException - inputTopic.pipeInput( - "DEL73148", - """ + inputTopic.pipeInput("DEL73148", """ { "deliveryId": "DEL73148", "truckId": "TRK48612", diff --git a/pom.xml b/pom.xml index 14c1a2b..4db7dc9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ 6.0.1 4.1.1 1.5.21 - 21 - 21 - 2.58.0 + 25 + 25 + 2.82.0 UTF-8 2.0.17 https://sonarcloud.io @@ -150,7 +150,7 @@ ${jib-maven-plugin.version} - eclipse-temurin:21-jre-alpine + eclipse-temurin:25-jre-alpine amd64 diff --git a/processor-api/README.md b/processor-api/README.md index 6501e0a..4c672a5 100644 --- a/processor-api/README.md +++ b/processor-api/README.md @@ -6,7 +6,7 @@ This module demonstrates how to use the processing exception handler to manage p To compile and run this demo, you’ll need: -- Java 21 +- Java 25 - Maven - Docker diff --git a/processor-api/src/test/java/com/michelin/kafka/error/handling/papi/KafkaStreamsAppTest.java b/processor-api/src/test/java/com/michelin/kafka/error/handling/papi/KafkaStreamsAppTest.java index 15128bc..fce95ea 100644 --- a/processor-api/src/test/java/com/michelin/kafka/error/handling/papi/KafkaStreamsAppTest.java +++ b/processor-api/src/test/java/com/michelin/kafka/error/handling/papi/KafkaStreamsAppTest.java @@ -66,9 +66,7 @@ static Stream provideProcessingExceptionHandlerClassName() { void shouldContinueOnInvalidDeliveryAndNullPointerExceptions(String processingExceptionHandlerClassName) { instantiateTopologyTestDriver(processingExceptionHandlerClassName); - inputTopic.pipeInput( - "DEL12345", - """ + inputTopic.pipeInput("DEL12345", """ { "deliveryId": "DEL12345", "truckId": "TRK56789", @@ -78,9 +76,7 @@ void shouldContinueOnInvalidDeliveryAndNullPointerExceptions(String processingEx """); // "numberOfTires" is negative. This will throw an InvalidDeliveryException - inputTopic.pipeInput( - "DEL73148", - """ + inputTopic.pipeInput("DEL73148", """ { "deliveryId": "DEL67145", "truckId": "TRK34567", @@ -90,9 +86,7 @@ void shouldContinueOnInvalidDeliveryAndNullPointerExceptions(String processingEx """); // "numberOfTires" is missing. This will throw a NullPointerException - inputTopic.pipeInput( - "DEL73148", - """ + inputTopic.pipeInput("DEL73148", """ { "deliveryId": "DEL73148", "truckId": "TRK48612",