This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 35897e90a7093a8fa19df3be7c9603b1a9b28f7f Author: Croway <[email protected]> AuthorDate: Thu Mar 5 11:12:33 2026 +0100 Update JDK to 21 (Camel 4.19+ requirement) --- .github/workflows/ci-build.yml | 4 ++-- .github/workflows/generate-sbom-main.yml | 2 +- .github/workflows/integration-tests.yaml | 2 +- .github/workflows/java-tests.yaml | 2 +- .github/workflows/main-push-regen.yaml | 2 +- Jenkinsfile.deploy | 2 +- Jenkinsfile.ppc64le | 2 +- jitpack.yml | 2 +- kamelets/databricks-sink.kamelet.yaml | 2 +- kamelets/databricks-source.kamelet.yaml | 2 +- library/camel-kamelets-crds/pom.xml | 6 +++--- .../src/main/resources/kamelets/databricks-sink.kamelet.yaml | 2 +- .../src/main/resources/kamelets/databricks-source.kamelet.yaml | 2 +- pom.xml | 10 +++++----- tests/camel-kamelets-itest/README.md | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e298db033..c544ca77a 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -58,7 +58,7 @@ jobs: uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: 'temurin' - java-version: 17 + java-version: 21 cache: 'maven' - name: Build camel-kamelets run: ./mvnw -V -ntp clean install @@ -85,7 +85,7 @@ jobs: uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: 'temurin' - java-version: 17 + java-version: 21 - name: Deploy to ASF Snapshots Repository # Deploy both artifacts and sources (maybe required by Camel K) run: | diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml index a204810be..338a71364 100644 --- a/.github/workflows/generate-sbom-main.yml +++ b/.github/workflows/generate-sbom-main.yml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '17' ] + java: [ '21' ] steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index f0c7ae724..42918122d 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -55,7 +55,7 @@ jobs: uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: 'temurin' - java-version: 17 + java-version: 21 cache: 'maven' - name: Build Kamelet libraries run: | diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index e23efafad..3498ba28b 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -45,7 +45,7 @@ jobs: uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: 'temurin' - java-version: 17 + java-version: 21 cache: 'maven' - name: Build catalog 1st Run run: ./mvnw clean install -DskipTests -DskipITs diff --git a/.github/workflows/main-push-regen.yaml b/.github/workflows/main-push-regen.yaml index f29856f36..167be2407 100644 --- a/.github/workflows/main-push-regen.yaml +++ b/.github/workflows/main-push-regen.yaml @@ -44,7 +44,7 @@ jobs: uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: 'temurin' - java-version: 17 + java-version: 21 cache: 'maven' - name: Install Go uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0 diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy index 76714d120..c79843646 100644 --- a/Jenkinsfile.deploy +++ b/Jenkinsfile.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 -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true' diff --git a/Jenkinsfile.ppc64le b/Jenkinsfile.ppc64le index 9bc4c280c..3c7c9619e 100644 --- a/Jenkinsfile.ppc64le +++ b/Jenkinsfile.ppc64le @@ -19,7 +19,7 @@ def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/maven-repositories/0' def AGENT_LABEL = env.AGENT_LABEL ?: 'power9' -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/jitpack.yml b/jitpack.yml index efde7bf25..727c9abd3 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,2 @@ jdk: - - openjdk17 + - openjdk21 diff --git a/kamelets/databricks-sink.kamelet.yaml b/kamelets/databricks-sink.kamelet.yaml index c127be4b3..b882caf0b 100644 --- a/kamelets/databricks-sink.kamelet.yaml +++ b/kamelets/databricks-sink.kamelet.yaml @@ -77,7 +77,7 @@ spec: - "camel:jackson" - "camel:kamelet" - "camel:sql" - - "mvn:com.databricks:databricks-jdbc:3.1.1" + - "mvn:com.databricks:databricks-jdbc:3.2.1" - "mvn:org.apache.commons:commons-dbcp2:2.14.0" template: beans: diff --git a/kamelets/databricks-source.kamelet.yaml b/kamelets/databricks-source.kamelet.yaml index 5e90f0aa7..6b219e9f8 100644 --- a/kamelets/databricks-source.kamelet.yaml +++ b/kamelets/databricks-source.kamelet.yaml @@ -87,7 +87,7 @@ spec: - "camel:jackson" - "camel:kamelet" - "camel:sql" - - "mvn:com.databricks:databricks-jdbc:3.1.1" + - "mvn:com.databricks:databricks-jdbc:3.2.1" - "mvn:org.apache.commons:commons-dbcp2:2.14.0" template: beans: diff --git a/library/camel-kamelets-crds/pom.xml b/library/camel-kamelets-crds/pom.xml index cab7f5239..ccc0afc21 100644 --- a/library/camel-kamelets-crds/pom.xml +++ b/library/camel-kamelets-crds/pom.xml @@ -33,9 +33,9 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.release>17</maven.compiler.release> - <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.target>17</maven.compiler.target> + <maven.compiler.release>21</maven.compiler.release> + <maven.compiler.source>21</maven.compiler.source> + <maven.compiler.target>21</maven.compiler.target> <fabric8-version>7.5.2</fabric8-version> <maven-surefire-plugin-version>3.5.0</maven-surefire-plugin-version> diff --git a/library/camel-kamelets/src/main/resources/kamelets/databricks-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/databricks-sink.kamelet.yaml index c127be4b3..b882caf0b 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/databricks-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/databricks-sink.kamelet.yaml @@ -77,7 +77,7 @@ spec: - "camel:jackson" - "camel:kamelet" - "camel:sql" - - "mvn:com.databricks:databricks-jdbc:3.1.1" + - "mvn:com.databricks:databricks-jdbc:3.2.1" - "mvn:org.apache.commons:commons-dbcp2:2.14.0" template: beans: diff --git a/library/camel-kamelets/src/main/resources/kamelets/databricks-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/databricks-source.kamelet.yaml index 5e90f0aa7..6b219e9f8 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/databricks-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/databricks-source.kamelet.yaml @@ -87,7 +87,7 @@ spec: - "camel:jackson" - "camel:kamelet" - "camel:sql" - - "mvn:com.databricks:databricks-jdbc:3.1.1" + - "mvn:com.databricks:databricks-jdbc:3.2.1" - "mvn:org.apache.commons:commons-dbcp2:2.14.0" template: beans: diff --git a/pom.xml b/pom.xml index 0c6d0f89a..6f2945f96 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-dependencies</artifactId> - <version>4.19.0-SNAPSHOT</version> + <version>4.19.0-SNAPSHOT</version> </parent> <groupId>org.apache.camel.kamelets</groupId> @@ -43,9 +43,9 @@ </modules> <properties> - <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.target>17</maven.compiler.target> - <maven.compiler.release>17</maven.compiler.release> + <maven.compiler.source>21</maven.compiler.source> + <maven.compiler.target>21</maven.compiler.target> + <maven.compiler.release>21</maven.compiler.release> <failIfNoTests>false</failIfNoTests> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -176,7 +176,7 @@ <exclude>**/README.md</exclude> <exclude>**/ReadMe.md</exclude> <exclude>**/resources/**/*.xsd</exclude> - <exclude>**/webapp/js/**/*</exclude> + <exclude>**/webapp/js/**/*</exclude> <exclude>**/test/resources/**/*</exclude> <exclude>**/test/data*/**/*</exclude> <exclude>.gitignore</exclude> diff --git a/tests/camel-kamelets-itest/README.md b/tests/camel-kamelets-itest/README.md index 4d522f8d3..ce8d2b8f9 100644 --- a/tests/camel-kamelets-itest/README.md +++ b/tests/camel-kamelets-itest/README.md @@ -3,7 +3,7 @@ This folder contains a suite of integration tests for Kamelets You need the following tools to run the tests: -- Java 17 +- Java 21 - [JBang](https://www.jbang.dev/) - [Camel JBang](https://camel.apache.org/manual/camel-jbang.html) - [Citrus JBang App](https://citrusframework.org/citrus/reference/html/index.html#runtime-jbang-install)
