From 4f09790d96309113d8381e4ad55d4d7d1ca40451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Mon, 19 Oct 2026 15:45:55 +0200 Subject: [PATCH 1/5] CAMEL-22996: Bump minimum Java version from 17 to 21 in root POM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Camel core now requires Java 21 as its minimum (apache/camel#27943). Camel Spring Boot must follow suit. - Change the jdk.version property from 17 to 21. This property drives maven.compiler.source, maven.compiler.target, maven.compiler.release and minimalJavaBuildVersion for every module in the reactor. - Update the two hardcoded 17 entries in the maven-javadoc-plugin configuration (main build and deploy profile) to 21 so that Javadoc generation also targets Java 21. Co-authored-by: IBM Bob 2.2.1 Signed-off-by: Aurélien Pupier --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d7009c9ec7f..297ddf53ee4 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ UTF-8 scpexe://people.apache.org/www/camel.apache.org/maven/ - 17 + 21 ${jdk.version} ${jdk.version} @@ -182,7 +182,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 17 + 21 ${javadoc.opts} none @@ -680,7 +680,7 @@ jar - 17 + 21 none From f9727863daf3b923f44dc169bf18c6a4ed070de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Mon, 19 Oct 2026 15:46:04 +0200 Subject: [PATCH 2/5] CAMEL-22996: Bump Java release to 21 in the Maven archetype template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The archetype template for new Camel Spring Boot projects carried its own hardcoded 17 in the maven-compiler-plugin configuration. Projects generated from this archetype must now target Java 21, matching the minimum requirement introduced in Camel core (apache/camel#27943). Co-authored-by: IBM Bob 2.2.1 Signed-off-by: Aurélien Pupier --- .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml index 1acb7d0de2e..f5addd3bbc8 100644 --- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml @@ -104,7 +104,7 @@ maven-compiler-plugin ${maven-compiler-plugin-version} - 17 + 21 From 5a5dfabf034ee3b336b4e91d216a80c10c64b4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Mon, 19 Oct 2026 15:46:21 +0200 Subject: [PATCH 3/5] CAMEL-22996: Update GitHub Actions CI workflows to use Java 21 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Camel core now requires Java 21 as the minimum (apache/camel#27943). Update all CI workflow files that referenced Java 17: - pr-build-main.yml: replace '17' with '21' in the build matrix so PR builds are validated on Java 21 and Java 25 (EA) instead of 17 and 25. - generate-sbom-main.yml: bump the java-version pin from 17 to 21. - automatic-sync-main.yml: bump the java-version pin from 17 to 21. Co-authored-by: IBM Bob 2.2.1 Signed-off-by: Aurélien Pupier --- .github/workflows/automatic-sync-main.yml | 2 +- .github/workflows/generate-sbom-main.yml | 2 +- .github/workflows/pr-build-main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automatic-sync-main.yml b/.github/workflows/automatic-sync-main.yml index 6e224558def..b5a35280c58 100644 --- a/.github/workflows/automatic-sync-main.yml +++ b/.github/workflows/automatic-sync-main.yml @@ -45,7 +45,7 @@ jobs: uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6 with: distribution: 'temurin' - java-version: 17 + java-version: 21 cache: 'maven' - name: Build Camel Project run: ./mvnw -V --no-transfer-progress -Dquickly clean install diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml index 572652539b8..2dab6177a97 100644 --- a/.github/workflows/generate-sbom-main.yml +++ b/.github/workflows/generate-sbom-main.yml @@ -46,7 +46,7 @@ jobs: uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6 with: distribution: 'temurin' - java-version: 17 + java-version: 21 cache: 'maven' - name: Build Camel Project run: ./mvnw -B -V --no-transfer-progress -Dquickly install diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml index 7c07fe20658..85321cc47b0 100644 --- a/.github/workflows/pr-build-main.yml +++ b/.github/workflows/pr-build-main.yml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: ['17', '25'] + java: ['21', '25'] steps: - uses: actions/checkout@v7 with: From a027400acc9302b4ccbc8e7df79e7e0f6345e125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Mon, 19 Oct 2026 15:47:38 +0200 Subject: [PATCH 4/5] CAMEL-22996: Bump Jenkins JDK default from jdk_17_latest to jdk_21_latest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Camel core now requires Java 21 as the minimum (apache/camel#27943). Update the default JDK tool name in all three Jenkinsfiles so that Jenkins pipeline builds (main, deploy and ppc64le) pick up Java 21 when no JDK_NAME environment variable is explicitly overridden. Co-authored-by: IBM Bob 2.2.1 Signed-off-by: Aurélien Pupier --- Jenkinsfile.sb | 2 +- Jenkinsfile.sb.deploy | 2 +- Jenkinsfile.sb.ppc64le | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile.sb b/Jenkinsfile.sb index bca674c38ef..ee8d8087165 100644 --- a/Jenkinsfile.sb +++ b/Jenkinsfile.sb @@ -19,7 +19,7 @@ def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/maven-repositories/0' def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu' -def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest' +def JDK_NAME = env.JDK_NAME ?: 'jdk_21_latest' def MAVEN_PARAMS = '-U -B -e -fae -V -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true' diff --git a/Jenkinsfile.sb.deploy b/Jenkinsfile.sb.deploy index 30f0902ee98..1d76070ed39 100644 --- a/Jenkinsfile.sb.deploy +++ b/Jenkinsfile.sb.deploy @@ -19,7 +19,7 @@ def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/maven-repositories/0' def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu' -def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest' +def JDK_NAME = env.JDK_NAME ?: 'jdk_21_latest' def MAVEN_PARAMS = "-U -B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -T1C " diff --git a/Jenkinsfile.sb.ppc64le b/Jenkinsfile.sb.ppc64le index e56aef66689..4b0eeaf4cf6 100644 --- a/Jenkinsfile.sb.ppc64le +++ b/Jenkinsfile.sb.ppc64le @@ -19,7 +19,7 @@ def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/maven-repositories/0' def AGENT_LABEL = env.AGENT_LABEL ?: 'power-for-camel' -def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest' +def JDK_NAME = env.JDK_NAME ?: 'jdk_21_latest' def MAVEN_PARAMS = '-U -B -e -fae -V -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true' From d5954c33c236e3db90241732d8a00b8d5cdb6ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Mon, 19 Oct 2026 15:49:26 +0200 Subject: [PATCH 5/5] CAMEL-22996: Update AGENTS.md minimum Java requirement to 21+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reflect the Java 21 minimum set by Camel core (apache/camel#27943). Co-authored-by: IBM Bob 2.2.1 Signed-off-by: Aurélien Pupier --- AGENTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AGENTS.md b/AGENTS.md index f0d0b85873d..4850c05725b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -7,7 +7,7 @@ Guidelines for AI agents working on this codebase. Apache Camel Spring Boot provides Spring Boot auto-configuration and starter modules for Apache Camel components. - Version: 4.24.0-SNAPSHOT -- Java: 17+ +- Java: 21+ - Build: Maven (use `./mvnw` wrapper) - Issue tracker: [JIRA (CAMEL project)](https://issues.apache.org/jira/browse/CAMEL) - Related repository: [apache/camel](https://github.com/apache/camel) — Camel core