diff --git a/.github/workflows/automatic-sync-main.yml b/.github/workflows/automatic-sync-main.yml index 6e224558defd..b5a35280c58d 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 572652539b81..2dab6177a975 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 7c07fe206589..85321cc47b0f 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: diff --git a/AGENTS.md b/AGENTS.md index f0d0b85873df..4850c05725b0 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 diff --git a/Jenkinsfile.sb b/Jenkinsfile.sb index bca674c38efc..ee8d80871655 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 30f0902ee98a..1d76070ed39d 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 e56aef666890..4b0eeaf4cf6c 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' 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 1acb7d0de2ef..f5addd3bbc86 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 diff --git a/pom.xml b/pom.xml index d7009c9ec7f5..297ddf53ee4e 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