This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 1be54f89c8c2 Use JDK 25 as main target for GitHub workflows
1be54f89c8c2 is described below
commit 1be54f89c8c24e131c2fbc0da281c21286a8d1a3
Author: Aurélien Pupier <[email protected]>
AuthorDate: Fri Jun 5 09:48:37 2026 +0200
Use JDK 25 as main target for GitHub workflows
* as the plan is to build with JDK 25 and declare JDK 25 as supported
starting with next version, the idea is to use JDK 25 as the main target
of the GitHub jobs.
* proposal to remove the JDK 21 from the test matrix considering that:
* it will reduce the amount of resources taken on GitHub Actions
(close to 10%) . Currently jobs are often queued for a long time. This
has an
impact at whole Apache org level.
* the chances that an issue exists in JDK 21 only, i.e. working in
both JDK 17 and 25 but not 21 is rather small
* JDK 21 continue to be tested on Jenkins
* I removed the configuration on push branch 4.14.x and 4.18.x for
build-main because it wasn't working anyway. I guess it is supposed to
be a file in the related branches
Signed-off-by: Aurélien Pupier <[email protected]>
---
.github/workflows/alternative-os-build-main.yml | 2 +-
.github/workflows/main-build.yml | 4 +---
.github/workflows/pr-build-main.yml | 4 +---
.github/workflows/security-scan.yml | 4 ++--
.github/workflows/sonar-build.yml | 4 ++--
.github/workflows/sonar-scan.yml | 4 ++--
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/alternative-os-build-main.yml
b/.github/workflows/alternative-os-build-main.yml
index 27646b90f002..a42d07a351aa 100644
--- a/.github/workflows/alternative-os-build-main.yml
+++ b/.github/workflows/alternative-os-build-main.yml
@@ -41,7 +41,7 @@ jobs:
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #
v5.2.0
with:
distribution: 'temurin'
- java-version: 21
+ java-version: 25
cache: 'maven'
- name: mvn build ${{ matrix.os }}
run: ./mvnw -B -V -D'http.keepAlive=false' -l build.log
-D'maven.wagon.http.pool=false'
-D'maven.wagon.httpconnectionManager.ttlSeconds=120' --no-transfer-progress
-Dquickly install
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index fe24b048a899..d94d46ce387b 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -21,8 +21,6 @@ on:
push:
branches:
- main
- - camel-4.14.x
- - camel-4.18.x
concurrency:
group: ${{ github.workflow }}-${{ github.sha }}
@@ -37,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: ['21']
+ java: ['25']
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #
v6.0.2
diff --git a/.github/workflows/pr-build-main.yml
b/.github/workflows/pr-build-main.yml
index 17e4bf65240a..1cb4bf59fb19 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -67,15 +67,13 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- java: ['17', '21']
+ java: ['17', '25']
experimental: [ false ]
include:
- java: '17'
# JDK 17 is kept for runtime compatibility testing.
# Skip the enforcer which requires JDK 21+ (needed to compile JDK
21-specific classes).
maven_extra_args: '-Denforcer.phase=none'
- - java: '25'
- experimental: true
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #
v6.0.2
diff --git a/.github/workflows/security-scan.yml
b/.github/workflows/security-scan.yml
index 0300961821cc..8862c0df18ad 100644
--- a/.github/workflows/security-scan.yml
+++ b/.github/workflows/security-scan.yml
@@ -35,11 +35,11 @@ jobs:
uses: actions/checkout@v6
with:
persist-credentials: false
- - name: Set up JDK 21
+ - name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: 'temurin'
- java-version: '21'
+ java-version: '25'
cache: 'maven'
- name: OWASP Dependency Check
run: ./mvnw -B -Pdependencycheck validate -DskipTests -DnvdApiKey=${{
secrets.NVD_API_KEY }} -DnvdApiDelay=5000 -l owasp-check.log
diff --git a/.github/workflows/sonar-build.yml
b/.github/workflows/sonar-build.yml
index 1e20713dff16..70bb3a70e687 100644
--- a/.github/workflows/sonar-build.yml
+++ b/.github/workflows/sonar-build.yml
@@ -49,11 +49,11 @@ jobs:
- id: install-packages
uses: ./.github/actions/install-packages
- - name: Set up JDK 21
+ - name: Set up JDK 25
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #
v5.2.0
with:
distribution: 'temurin'
- java-version: '21'
+ java-version: '25'
cache: 'maven'
- name: Build with Maven
diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
index e2ea808d8c1e..ac2adeadd2ca 100644
--- a/.github/workflows/sonar-scan.yml
+++ b/.github/workflows/sonar-scan.yml
@@ -116,11 +116,11 @@ jobs:
shell: bash
run: tar -xzf target.tar.gz
- - name: Set up JDK 21
+ - name: Set up JDK 25
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #
v5.2.0
with:
distribution: 'temurin'
- java-version: '21'
+ java-version: '25'
cache: 'maven'
- name: Cache SonarCloud packages
