This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch task-42 in repository https://gitbox.apache.org/repos/asf/camel.git
commit ce61ffce6330d1d14a64f6ce004cd5d6339ac9a7 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Mar 2 10:55:14 2026 +0100 CAMEL-23112 - Drop Support for JDK 17 - Jenkinsfile: remove jdk_17_latest from matrix axis and JDK_FILTER choices, remove JDK 21 excludes on ppc64le/s390x so the new baseline runs on all platforms, move coverage profile to the JDK 21 build, and run Sonar analysis on JDK 21 instead of JDK 17 - Jenkinsfile.deploy: default JDK changed to jdk_21_latest - Jenkinsfile.jbangtest: default JDK changed to jdk_21_latest Signed-off-by: Andrea Cosentino <[email protected]> --- .github/workflows/alternative-os-build-main.yml | 2 +- .github/workflows/generate-sbom-main.yml | 2 +- .github/workflows/pr-build-main.yml | 5 +- .github/workflows/pr-manual-component-test.yml | 2 +- .github/workflows/security-scan.yml | 4 +- AGENTS.md | 2 +- Jenkinsfile | 33 ++------ Jenkinsfile.deploy | 2 +- Jenkinsfile.jbangtest | 2 +- docs/main/modules/contributing/pages/building.adoc | 4 +- docs/main/modules/contributing/pages/index.adoc | 2 +- .../camel/dsl/jbang/core/commands/Export.java | 4 +- .../src/main/resources/templates/Dockerfile17.tmpl | 97 ---------------------- pom.xml | 2 +- .../src/it/customized-v3/pom.xml | 6 +- .../src/it/expanded-v3-yaml/pom.xml | 6 +- .../src/it/simple-dto-v3/pom.xml | 6 +- .../src/it/simple-v3-yaml/pom.xml | 6 +- .../src/it/simple-v3/pom.xml | 6 +- .../src/it/simple-xml-dto-v3/pom.xml | 6 +- .../src/it/simple-xml-v3/pom.xml | 6 +- .../src/it/simple-yaml-dto-v3/pom.xml | 6 +- .../src/it/simple-yaml-kamelet-v3/pom.xml | 6 +- .../src/it/simple-yaml-v3/pom.xml | 6 +- 24 files changed, 49 insertions(+), 174 deletions(-) diff --git a/.github/workflows/alternative-os-build-main.yml b/.github/workflows/alternative-os-build-main.yml index 170688ce4520..fc81eab36209 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: 17 + java-version: 21 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/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml index 113d6096abab..6b0460766395 100644 --- a/.github/workflows/generate-sbom-main.yml +++ b/.github/workflows/generate-sbom-main.yml @@ -34,7 +34,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/pr-build-main.yml b/.github/workflows/pr-build-main.yml index 569680d03531..9467f7fe951e 100644 --- a/.github/workflows/pr-build-main.yml +++ b/.github/workflows/pr-build-main.yml @@ -41,11 +41,8 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - java: ['17'] + java: ['21'] experimental: [ false ] - include: - - java: '21' - experimental: true steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/pr-manual-component-test.yml b/.github/workflows/pr-manual-component-test.yml index 1e186e1e199f..ef88b148f140 100644 --- a/.github/workflows/pr-manual-component-test.yml +++ b/.github/workflows/pr-manual-component-test.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/security-scan.yml b/.github/workflows/security-scan.yml index 2d7bfdc3ef49..c5fa606e3643 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 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '17' + java-version: '21' 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/AGENTS.md b/AGENTS.md index f2f3385bef39..632f852c8382 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -7,7 +7,7 @@ Guidelines for AI agents working on this codebase. Apache Camel is an integration framework supporting routing rules in Java, XML and YAML DSLs. - Version: 4.19.0-SNAPSHOT -- Java: 17+ (21 for Virtual Threads) +- Java: 21+ - Build: Maven 3.9.12+ ## Structure diff --git a/Jenkinsfile b/Jenkinsfile index b49f2bab0cc3..bbabca5708eb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ pipeline { parameters { booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description: 'Perform the build using virtual threads') choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x', 'ubuntu-avx'], description: 'Run on specific platform') - choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest', 'jdk_21_latest', 'jdk_25_latest'], description: 'Run on specific jdk') + choice(name: 'JDK_FILTER', choices: ['all', 'jdk_21_latest', 'jdk_25_latest'], description: 'Run on specific jdk') } agent none stages { @@ -70,7 +70,7 @@ pipeline { axes { axis { name 'JDK_NAME' - values 'jdk_17_latest', 'jdk_21_latest', 'jdk_25_latest' + values 'jdk_21_latest', 'jdk_25_latest' } axis { name 'PLATFORM' @@ -78,26 +78,6 @@ pipeline { } } excludes { - exclude { - axis { - name 'JDK_NAME' - values 'jdk_21_latest' - } - axis { - name 'PLATFORM' - values 'ppc64le' - } - } - exclude { - axis { - name 'JDK_NAME' - values 'jdk_21_latest' - } - axis { - name 'PLATFORM' - values 's390x' - } - } exclude { axis { name 'JDK_NAME' @@ -139,11 +119,8 @@ pipeline { script { if ("${PLATFORM}" == "ubuntu-avx") { if ("${JDK_NAME}" == "jdk_21_latest") { - // Enable virtual threads - sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS_UBUNTU -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true install -Dcamel.threads.virtual.enabled=${params.VIRTUAL_THREAD}" - } else if ("${JDK_NAME}" == "jdk_17_latest") { - // Enable coverage required later by Sonar check - sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true install -Pcoverage" + // Enable virtual threads and coverage required later by Sonar check + sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS_UBUNTU -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true install -Dcamel.threads.virtual.enabled=${params.VIRTUAL_THREAD} -Pcoverage" } else { sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true install" } @@ -168,7 +145,7 @@ pipeline { script { echo "Do Static code analysis for ${PLATFORM}-${JDK_NAME}" // We only execute this on the main PLATFORM/JDK target - if ("${PLATFORM}" == "ubuntu-avx" && "${JDK_NAME}" == "jdk_17_latest") { + if ("${PLATFORM}" == "ubuntu-avx" && "${JDK_NAME}" == "jdk_21_latest") { withCredentials([string(credentialsId: 'apache-camel-core', variable: 'SONAR_TOKEN')]) { echo "Code quality review ENABLED for ${PLATFORM} with ${JDK_NAME}" sh "./mvnw $MAVEN_PARAMS -Dsonar.host.url=https://sonarcloud.io -Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache -Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME org.sonarsource.scanner.maven:sonar-maven-plugin:sonar" diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy index 405b786d93af..5c1db358ac00 100644 --- a/Jenkinsfile.deploy +++ b/Jenkinsfile.deploy @@ -15,7 +15,7 @@ * limitations under the License. */ 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 " diff --git a/Jenkinsfile.jbangtest b/Jenkinsfile.jbangtest index 63729151045c..7b0b4807f024 100644 --- a/Jenkinsfile.jbangtest +++ b/Jenkinsfile.jbangtest @@ -15,7 +15,7 @@ * limitations under the License. */ 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 " diff --git a/docs/main/modules/contributing/pages/building.adoc b/docs/main/modules/contributing/pages/building.adoc index 1a15528e9059..af9419733302 100644 --- a/docs/main/modules/contributing/pages/building.adoc +++ b/docs/main/modules/contributing/pages/building.adoc @@ -18,7 +18,7 @@ == Prerequisites for Camel 4.x -* Java 17 (we test using https://adoptium.net/[OpenJDK], but any modern JDK should be fine). +* Java 21 (we test using https://adoptium.net/[OpenJDK], but any modern JDK should be fine). * https://github.com/takari/maven-wrapper[Maven Wrapper] can be used and is bundled. @@ -33,7 +33,7 @@ Running the Maven Wrapper `mvnw` script with `-v` parameter from the root direct ./mvnw -v Apache Maven 1.2.3 Maven home: /home/user/.m2/wrapper/dists/apache-maven-1.2.3-bin/deadbeef/apache-maven-1.2.3 -Java version: 17.0.5, vendor: Eclipse Adoptium, runtime: /home/user/java/17.0.5-tem +Java version: 21.0.10, vendor: Eclipse Adoptium, runtime: /home/user/java/21.0.10-tem Default locale: en_IE, platform encoding: UTF-8 OS name: "linux", version: "6.3.7-200.fc38.x86_64", arch: "amd64", family: "unix" ---- diff --git a/docs/main/modules/contributing/pages/index.adoc b/docs/main/modules/contributing/pages/index.adoc index 9df2eabad0c5..246d385b6b33 100644 --- a/docs/main/modules/contributing/pages/index.adoc +++ b/docs/main/modules/contributing/pages/index.adoc @@ -127,7 +127,7 @@ If you are an Apache Camel committer, then you may also clone the https://gitbox To build the project, you need http://maven.apache.org/download.html[Apache Maven]. -- To build Camel 4, you need Java 17 Apache Maven version 3.9.6 or higher. +- To build Camel 4, you need Java 21 and Apache Maven version 3.9.6 or higher. === Building Camel 4 diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java index 7ac476c14e9b..8b63fe340bc6 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java @@ -368,10 +368,8 @@ public class Export extends ExportBaseCommand { Path docker = Path.of(buildDir).resolve("src/main/docker"); Files.createDirectories(docker); String[] ids = gav.split(":"); - // we only support and have docker files for java 17 or 21 - String v = javaVersion.equals("17") ? "17" : "21"; InputStream is - = ExportCamelMain.class.getClassLoader().getResourceAsStream("templates/Dockerfile" + v + ".tmpl"); + = ExportCamelMain.class.getClassLoader().getResourceAsStream("templates/Dockerfile21.tmpl"); String context = IOHelper.loadText(is); IOHelper.close(is); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/Dockerfile17.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/Dockerfile17.tmpl deleted file mode 100644 index c57a8c7abdc1..000000000000 --- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/Dockerfile17.tmpl +++ /dev/null @@ -1,97 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#### -# This Dockerfile is used in order to build a container that runs the Camel application -# -# ./mvnw clean package -# docker build -f src/main/docker/Dockerfile -t {{ .ArtifactId }}:{{ .Version }} . -# docker run -it {{ .ArtifactId }}:{{ .Version }} -# -# This image uses the `run-java.sh` script to run the application. -# This scripts computes the command line to execute your Java application, and -# includes memory/GC tuning. -# You can configure the behavior using the following environment properties: -# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") -# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options -# in JAVA_OPTS (example: "-Dsome.property=foo") -# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is -# used to calculate a default maximal heap memory based on a containers restriction. -# If used in a container without any memory constraints for the container then this -# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio -# of the container available memory as set here. The default is `50` which means 50% -# of the available memory is used as an upper boundary. You can skip this mechanism by -# setting this value to `0` in which case no `-Xmx` option is added. -# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This -# is used to calculate a default initial heap memory based on the maximum heap memory. -# If used in a container without any memory constraints for the container then this -# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio -# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` -# is used as the initial heap size. You can skip this mechanism by setting this value -# to `0` in which case no `-Xms` option is added (example: "25") -# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. -# This is used to calculate the maximum value of the initial heap memory. If used in -# a container without any memory constraints for the container then this option has -# no effect. If there is a memory constraint then `-Xms` is limited to the value set -# here. The default is 4096MB which means the calculated value of `-Xms` never will -# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") -# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output -# when things are happening. This option, if set to true, will set -# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). -# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: -# true"). -# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). -# - CONTAINER_CORE_LIMIT: A calculated core limit as described in -# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") -# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). -# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. -# (example: "20") -# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. -# (example: "40") -# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. -# (example: "4") -# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus -# previous GC times. (example: "90") -# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") -# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") -# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should -# contain the necessary JRE command-line options to specify the required GC, which -# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). -# - HTTPS_PROXY: The location of the https proxy. (example: "[email protected]:8080") -# - HTTP_PROXY: The location of the http proxy. (example: "[email protected]:8080") -# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be -# accessed directly. (example: "foo.example.com,bar.example.com") -# -# If you want to include the debug port into your docker image -# you will have to expose the debug port (default 5005 being the default) like this : EXPOSE 8080 5005. -# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005 -# when running the container -# -### -FROM registry.access.redhat.com/ubi8/openjdk-17:1.23 - -COPY --chown=185 target/{{ .AppJar }} /deployments/ - -# Uncomment to expose any given port -# EXPOSE 8080 -USER 185 -# Uncomment to provide any Java option -# ENV JAVA_OPTS="" -ENV JAVA_APP_JAR="/deployments/{{ .AppJar }}" - -ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ] - diff --git a/pom.xml b/pom.xml index 61815c06f3c1..70736b0783b1 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url> - <jdk.version>17</jdk.version> + <jdk.version>21</jdk.version> <!-- These two are here only to prevent the versions for the Apache parent pom from leaking--> <maven.compiler.source>${jdk.version}</maven.compiler.source> <maven.compiler.target>${jdk.version}</maven.compiler.target> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized-v3/pom.xml index eb7375e01afe..4988dbca8a88 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized-v3/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized-v3/pom.xml @@ -29,9 +29,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> </properties> <build> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/pom.xml index 78fd49ec4d51..bb549c5814ad 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/pom.xml @@ -29,9 +29,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> </properties> <dependencies> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml index 621468eecf14..7c248f8d3742 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml @@ -29,9 +29,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> </properties> <dependencies> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/pom.xml index 308765b9d7b8..a02c2f5a541c 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/pom.xml @@ -29,9 +29,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> </properties> <dependencies> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3/pom.xml index 70cef1e80c53..25db335cca8f 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3/pom.xml @@ -29,9 +29,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> </properties> <dependencies> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml index 9e98a3d9a456..d27608d2110a 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml @@ -29,9 +29,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> </properties> <dependencies> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-v3/pom.xml index 0340e5021494..5a7326b23674 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-v3/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-v3/pom.xml @@ -29,9 +29,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> </properties> <build> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml index 559095996dac..6cfc2c233e11 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml @@ -29,9 +29,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> </properties> <dependencies> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-kamelet-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-kamelet-v3/pom.xml index 7526d4e050b7..703d59d902b4 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-kamelet-v3/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-kamelet-v3/pom.xml @@ -29,9 +29,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> </properties> <build> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-v3/pom.xml index c0932b98d0d5..2b4d48d9abc5 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-v3/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-v3/pom.xml @@ -29,9 +29,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> </properties> <build>
