diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d48e77f7cac1c..de25fe5a14ee9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT=17 +ARG VARIANT=21 FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT} ARG USER=vscode diff --git a/.github/matrix-jvm-tests.json b/.github/matrix-jvm-tests.json index 7e901e49ad11b..9eb73de979842 100644 --- a/.github/matrix-jvm-tests.json +++ b/.github/matrix-jvm-tests.json @@ -1,18 +1,9 @@ [ - { - "name": "JVM Tests - JDK 17", - "category": "Runtime", - "java-version": 17, - "maven_args": "$JVM_TEST_MAVEN_ARGS", - "maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g", - "os-name": "ubuntu-latest", - "modules": "-pl\n!docs\n-Dno-test-modules" - }, { "name": "JVM Tests - JDK 21", "category": "Runtime", "java-version": 21, - "java-version-gradle": 17, + "java-version-gradle": 21, "maven_args": "$JVM_TEST_MAVEN_ARGS", "maven_opts": "-Xmx3g -XX:MaxMetaspaceSize=1g", "os-name": "ubuntu-latest", @@ -22,30 +13,21 @@ "name": "JVM Tests - JDK 25", "category": "Runtime", "java-version": 25, - "java-version-gradle": 17, + "java-version-gradle": 21, "maven_args": "$JVM_TEST_MAVEN_ARGS", "maven_opts": "-Xmx3g -XX:MaxMetaspaceSize=1g", "os-name": "ubuntu-latest", "modules": "-pl\n!docs\n-Dno-test-modules" }, { - "name": "JVM Tests - JDK 17 Windows", + "name": "JVM Tests - JDK 21 Windows", "category": "Runtime", - "java-version": 17, + "java-version": 21, "maven_args": "-DskipDocs -Dformat.skip", "maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g", "os-name": "windows-latest", "modules": "-pl\n!docs\n-Dno-test-modules" }, - { - "name": "JVM Integration Tests - JDK 17", - "category": "Integration", - "java-version": 17, - "maven_args": "$JVM_TEST_MAVEN_ARGS", - "maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g", - "os-name": "ubuntu-latest", - "modules": "-f\nintegration-tests\n-pl\n!gradle\n-pl\n!maven\n-pl\n!devmode\n-pl\n!devtools" - }, { "name": "JVM Integration Tests - JDK 21", "category": "Integration", @@ -65,9 +47,9 @@ "modules": "-f\nintegration-tests\n-pl\n!gradle\n-pl\n!maven\n-pl\n!devmode\n-pl\n!devtools" }, { - "name": "JVM Integration Tests - JDK 17 Windows", + "name": "JVM Integration Tests - JDK 21 Windows", "category": "Integration", - "java-version": 17, + "java-version": 21, "maven_args": "-DskipDocs -Dformat.skip", "maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g", "os-name": "windows-latest", diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml index e8faf2fcce52a..8a7636695358b 100644 --- a/.github/workflows/ci-actions-incremental.yml +++ b/.github/workflows/ci-actions-incremental.yml @@ -202,10 +202,10 @@ jobs: fi - build-jdk17: - name: "Initial JDK 17 Build" + build-jdk21: + name: "Initial JDK 21 Build" needs: [ configure ] - runs-on: ${{ fromJson(needs.configure.outputs.config).runners['ubuntu-latest'].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners['ubuntu-latest'].runsOn, 'initial-jdk-17') || 'ubuntu-latest' }} + runs-on: ${{ fromJson(needs.configure.outputs.config).runners['ubuntu-latest'].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners['ubuntu-latest'].runsOn, 'initial-jdk-21') || 'ubuntu-latest' }} env: COMMON_MAVEN_ARGS: ${{ needs.configure.outputs.common-maven-args }} RUNS_ON_ENABLED: ${{ fromJson(needs.configure.outputs.config).runners['ubuntu-latest'].runsOn && 'true' || 'false' }} @@ -216,8 +216,8 @@ jobs: - uses: runs-on/action@v2 - name: Gradle Enterprise environment run: | - echo "GE_TAGS=jdk-17" >> "$GITHUB_ENV" - echo "GE_CUSTOM_VALUES=gh-job-name=Initial JDK 17 Build" >> "$GITHUB_ENV" + echo "GE_TAGS=jdk-21" >> "$GITHUB_ENV" + echo "GE_CUSTOM_VALUES=gh-job-name=Initial JDK 21 Build" >> "$GITHUB_ENV" - uses: actions/checkout@v5 with: # this is important for GIB to work @@ -226,11 +226,11 @@ jobs: run: git remote show quarkusio &> /dev/null || git remote add quarkusio https://github.com/quarkusio/quarkus.git - name: Reclaim Disk Space run: .github/ci-prerequisites.sh - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Restore Maven Repository uses: actions/cache/restore@v4 if: github.event_name != 'push' || github.repository != 'quarkusio/quarkus' || github.actor == 'dependabot[bot]' @@ -257,9 +257,9 @@ jobs: if: github.event_name == 'pull_request' with: path: ~/.m2/.develocity/build-cache - key: develocity-cache-Initial JDK 17 Build-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }} + key: develocity-cache-Initial JDK 21 Build-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }} restore-keys: | - develocity-cache-Initial JDK 17 Build-${{ github.event.pull_request.number }}- + develocity-cache-Initial JDK 21 Build-${{ github.event.pull_request.number }}- - name: Verify native-tests.json run: ./.github/verify-tests-json.sh native-tests.json integration-tests/ - name: Verify virtual-threads-tests.json @@ -268,7 +268,7 @@ jobs: uses: gradle/develocity-actions/setup-maven@v1.4 with: capture-strategy: ON_DEMAND - job-name: "Initial JDK 17 Build" + job-name: "Initial JDK 21 Build" add-pr-comment: false add-job-summary: false develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} @@ -356,7 +356,7 @@ jobs: uses: actions/upload-artifact@v4 if: always() with: - name: "build-reports-${{ github.run_attempt }}-Initial JDK 17 Build" + name: "build-reports-${{ github.run_attempt }}-Initial JDK 21 Build" path: | build-reports.zip retention-days: 7 @@ -364,9 +364,9 @@ jobs: calculate-test-jobs: name: Calculate Test Jobs runs-on: ubuntu-latest - needs: build-jdk17 + needs: build-jdk21 env: - GIB_IMPACTED_MODULES: ${{ needs.build-jdk17.outputs.gib_impacted }} + GIB_IMPACTED_MODULES: ${{ needs.build-jdk21.outputs.gib_impacted }} outputs: native_matrix: ${{ steps.calc-native-matrix.outputs.matrix }} jvm_matrix: ${{ steps.calc-jvm-matrix.outputs.matrix }} @@ -429,7 +429,7 @@ jobs: jvm-tests: name: ${{ matrix.java.name }} runs-on: ${{ fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn, matrix.java.tag) || matrix.java.os-name }} - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] if: needs.calculate-test-jobs.outputs.jvm_matrix timeout-minutes: 400 env: @@ -589,7 +589,7 @@ jobs: maven-tests: name: Maven Tests - JDK ${{matrix.java.name}} runs-on: ${{ fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn, matrix.java.tag) || matrix.java.os-name }} - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] env: MAVEN_OPTS: -Xmx2g -XX:MaxMetaspaceSize=1g COMMON_MAVEN_ARGS: ${{ needs.configure.outputs.common-maven-args }} @@ -602,16 +602,16 @@ jobs: matrix: java: - { - name: "17", - java-version: 17, + name: "21", + java-version: 21, os-name: "ubuntu-latest", - tag: "maven-jdk-17" + tag: "maven-jdk-21" } - { - name: "17 Windows", - java-version: 17, + name: "21 Windows", + java-version: 21, os-name: "windows-latest", - tag: "maven-jdk-17-windows" + tag: "maven-jdk-21-windows" } steps: - uses: runs-on/action@v2 @@ -662,7 +662,7 @@ jobs: CAPTURE_BUILD_SCAN: true # Important: keep -pl ... in sync with "Calculate run flags"! # Despite the pre-calculated run_maven flag, GIB has to be re-run here to figure out the exact submodules to build. - run: ./mvnw $COMMON_MAVEN_ARGS $COMMON_TEST_MAVEN_ARGS $PTS_MAVEN_ARGS $JVM_TEST_MAVEN_ARGS clean install -pl 'integration-tests/maven' -pl 'integration-tests/devmode' ${{ needs.build-jdk17.outputs.gib_args }} + run: ./mvnw $COMMON_MAVEN_ARGS $COMMON_TEST_MAVEN_ARGS $PTS_MAVEN_ARGS $JVM_TEST_MAVEN_ARGS clean install -pl 'integration-tests/maven' -pl 'integration-tests/devmode' ${{ needs.build-jdk21.outputs.gib_args }} - name: Prepare failure archive (if maven failed) if: failure() run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T - @@ -700,7 +700,7 @@ jobs: gradle-tests: name: Gradle Tests - JDK ${{matrix.java.name}} runs-on: ${{ fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn, matrix.java.tag) || matrix.java.os-name }} - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] env: # leave more space for the actual gradle execution (which is just wrapped by maven) MAVEN_OPTS: -Xmx1g @@ -714,16 +714,16 @@ jobs: matrix: java: - { - name: "17", - java-version: 17, + name: "21", + java-version: 21, os-name: "ubuntu-latest", - tag: "gradle-jdk-17" + tag: "gradle-jdk-21" } - { - name: "17 Windows", - java-version: 17, + name: "21 Windows", + java-version: 21, os-name: "windows-latest", - tag: "gradle-jdk-17-windows" + tag: "gradle-jdk-21-windows" } steps: - uses: runs-on/action@v2 @@ -795,7 +795,7 @@ jobs: devtools-tests: name: Devtools Tests - JDK ${{matrix.java.name}} runs-on: ${{ fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn, matrix.java.tag) || matrix.java.os-name }} - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] # Skip main in forks if: needs.calculate-test-jobs.outputs.run_devtools == 'true' env: @@ -806,12 +806,6 @@ jobs: fail-fast: false matrix: java: - - { - name: "17", - java-version: 17, - os-name: "ubuntu-latest", - tag: "devtools-jdk-17" - } - { name: "21", java-version: 21, @@ -819,10 +813,10 @@ jobs: tag: "devtools-jdk-21" } - { - name: "17 Windows", - java-version: 17, + name: "21 Windows", + java-version: 21, os-name: "windows-latest", - tag: "devtools-jdk-17-windows" + tag: "devtools-jdk-21-windows" } steps: - uses: runs-on/action@v2 @@ -898,7 +892,7 @@ jobs: kubernetes-tests: name: Kubernetes Tests - JDK ${{matrix.java.name}} runs-on: ${{ fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn, matrix.java.tag) || matrix.java.os-name }} - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] # Skip main in forks if: needs.calculate-test-jobs.outputs.run_kubernetes == 'true' env: @@ -909,12 +903,6 @@ jobs: fail-fast: false matrix: java: - - { - name: "17", - java-version: 17, - os-name: "ubuntu-latest", - tag: "kubernetes-jdk-17" - } - { name: "21", java-version: 21, @@ -922,10 +910,10 @@ jobs: tag: "kubernetes-jdk-21" } - { - name: "17 Windows", - java-version: 17, + name: "21 Windows", + java-version: 21, os-name: "windows-latest", - tag: "kubernetes-jdk-17-windows" + tag: "kubernetes-jdk-21-windows" } steps: - uses: runs-on/action@v2 @@ -1001,7 +989,7 @@ jobs: quickstarts-tests: name: Quickstarts Compilation - JDK ${{matrix.java.name}} runs-on: ${{ fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn, matrix.java.tag) || matrix.java.os-name }} - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] # Skip main in forks if: needs.calculate-test-jobs.outputs.run_quickstarts == 'true' env: @@ -1013,10 +1001,10 @@ jobs: matrix: java: - { - name: "17", - java-version: 17, + name: "21", + java-version: 21, os-name: "ubuntu-latest", - tag: "quickstarts-jdk-17" + tag: "quickstarts-jdk-21" } steps: - uses: runs-on/action@v2 @@ -1099,7 +1087,7 @@ jobs: platform-tests: name: Platform Tests - JDK ${{matrix.java.name}} runs-on: ${{ fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners[matrix.java.os-name].runsOn, matrix.java.tag) || matrix.java.os-name }} - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] # Skip main in forks if: ${{ contains( github.event.pull_request.labels.*.name, 'ci/test-platform') }} env: @@ -1111,10 +1099,10 @@ jobs: matrix: java: - { - name: "17", - java-version: 17, + name: "21", + java-version: 21, os-name: "ubuntu-latest", - tag: "platform-jdk-17" + tag: "platform-jdk-21" } steps: - uses: runs-on/action@v2 @@ -1197,7 +1185,7 @@ jobs: virtual-thread-native-tests: name: Native Tests - Virtual Thread - ${{matrix.category}} runs-on: ${{ fromJson(needs.configure.outputs.config).runners[matrix.os-name].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners[matrix.os-name].runsOn, matrix.tag) || matrix.os-name }} - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] # Skip main in forks if: needs.calculate-test-jobs.outputs.virtual_threads_matrix != '{}' env: @@ -1277,7 +1265,7 @@ jobs: tcks-test: name: MicroProfile TCKs Tests - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] # Skip main in forks if: needs.calculate-test-jobs.outputs.run_tcks == 'true' runs-on: ${{ fromJson(needs.configure.outputs.config).runners['ubuntu-latest'].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners['ubuntu-latest'].runsOn, 'microprofile-tcks') || 'ubuntu-latest' }} @@ -1289,7 +1277,7 @@ jobs: - uses: runs-on/action@v2 - name: Gradle Enterprise environment run: | - echo "GE_TAGS=jdk-17" >> "$GITHUB_ENV" + echo "GE_TAGS=jdk-21" >> "$GITHUB_ENV" echo "GE_CUSTOM_VALUES=gh-job-name=MicroProfile TCKs Tests" >> "$GITHUB_ENV" - uses: actions/checkout@v5 with: @@ -1299,11 +1287,11 @@ jobs: run: git remote show quarkusio &> /dev/null || git remote add quarkusio https://github.com/quarkusio/quarkus.git - name: Reclaim Disk Space run: .github/ci-prerequisites.sh - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Restore Maven Repository uses: actions/cache/restore@v4 with: @@ -1333,7 +1321,7 @@ jobs: CAPTURE_BUILD_SCAN: true # Important: keep -pl ... in sync with "Calculate run flags"! # Despite the pre-calculated run_tcks flag, GIB has to be re-run here to figure out the exact tcks submodules to build. - run: ./mvnw $COMMON_MAVEN_ARGS $COMMON_TEST_MAVEN_ARGS $PTS_MAVEN_ARGS -Dtcks -pl tcks -amd clean install ${{ needs.build-jdk17.outputs.gib_args }} + run: ./mvnw $COMMON_MAVEN_ARGS $COMMON_TEST_MAVEN_ARGS $PTS_MAVEN_ARGS -Dtcks -pl tcks -amd clean install ${{ needs.build-jdk21.outputs.gib_args }} - name: Verify resteasy-reative dependencies # note: ideally, this would be run _before_ mvnw but that would required building tcks/resteasy-reactive in two steps run: ./tcks/resteasy-reactive/update-dependencies.sh $COMMON_MAVEN_ARGS @@ -1367,7 +1355,7 @@ jobs: native-tests: name: Native Tests - ${{matrix.category}} - needs: [configure, build-jdk17, calculate-test-jobs] + needs: [configure, build-jdk21, calculate-test-jobs] runs-on: ${{ fromJson(needs.configure.outputs.config).runners[matrix.os-name].runsOn && format('{0}/tag={1}', fromJson(needs.configure.outputs.config).runners[matrix.os-name].runsOn, matrix.tag) || matrix.os-name }} env: # leave more space for the actual native compilation and execution @@ -1397,11 +1385,11 @@ jobs: - name: Reclaim Disk Space run: .github/ci-prerequisites.sh if: ${{ !startsWith(matrix.os-name, 'windows') }} - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Install cl.exe if: startsWith(matrix.os-name, 'windows') uses: ilammy/msvc-dev-cmd@v1 @@ -1568,7 +1556,7 @@ jobs: build-report: runs-on: ubuntu-latest name: Build report - needs: [build-jdk17,jvm-tests,maven-tests,gradle-tests,devtools-tests,kubernetes-tests,quickstarts-tests,platform-tests,tcks-test,native-tests,virtual-thread-native-tests] + needs: [build-jdk21,jvm-tests,maven-tests,gradle-tests,devtools-tests,kubernetes-tests,quickstarts-tests,platform-tests,tcks-test,native-tests,virtual-thread-native-tests] if: always() steps: - uses: runs-on/action@v2 diff --git a/.github/workflows/ci-istio.yml b/.github/workflows/ci-istio.yml index e5a53db8d64d4..2c18ac5027788 100644 --- a/.github/workflows/ci-istio.yml +++ b/.github/workflows/ci-istio.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Install artifacts run: ./mvnw ${MAVEN_ARGS} -DskipTests -DskipITs -Dinvoker.skip clean install -pl :quarkus-integration-test-istio-invoker -am - name: Tar Maven repository @@ -51,7 +51,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Download Maven repository uses: actions/download-artifact@v5 with: diff --git a/.github/workflows/ci-kubernetes.yml b/.github/workflows/ci-kubernetes.yml index ad7d330fd900f..c9324c78ec8b2 100644 --- a/.github/workflows/ci-kubernetes.yml +++ b/.github/workflows/ci-kubernetes.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Install artifacts run: ./mvnw ${MAVEN_ARGS} -DskipTests -DskipITs -Dinvoker.skip clean install -pl :quarkus-integration-test-kubernetes-invoker -am - name: Tar Maven repository @@ -51,7 +51,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Download Maven repository uses: actions/download-artifact@v5 with: @@ -111,7 +111,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Download Maven repository uses: actions/download-artifact@v5 with: diff --git a/.github/workflows/ci-openshift.yml b/.github/workflows/ci-openshift.yml index 366dd3c9daaf6..59936646c7543 100644 --- a/.github/workflows/ci-openshift.yml +++ b/.github/workflows/ci-openshift.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Install artifacts run: ./mvnw ${MAVEN_ARGS} -DskipTests -DskipITs -Dinvoker.skip clean install -pl :quarkus-integration-test-kubernetes-invoker -am - name: Tar Maven repository @@ -51,7 +51,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Download Maven repository uses: actions/download-artifact@v5 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 479a1f545f108..eede8a04013b8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -35,7 +35,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/deploy-snapshots.yml b/.github/workflows/deploy-snapshots.yml index 9b12b5583fbe9..52b15801dd6f7 100644 --- a/.github/workflows/deploy-snapshots.yml +++ b/.github/workflows/deploy-snapshots.yml @@ -24,11 +24,11 @@ jobs: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - name: Reclaim Disk Space run: .github/ci-prerequisites.sh - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Generate cache key id: cache-key run: | diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index 46a35c2b7b873..a2594209bcb94 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -53,11 +53,11 @@ jobs: if: github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main') steps: - uses: actions/checkout@v5 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Generate cache key id: cache-key run: | diff --git a/.github/workflows/native-it-selected-graalvm.yml b/.github/workflows/native-it-selected-graalvm.yml index e11619939eb66..a6c024512f167 100644 --- a/.github/workflows/native-it-selected-graalvm.yml +++ b/.github/workflows/native-it-selected-graalvm.yml @@ -24,7 +24,6 @@ on: default: '21' type: choice options: - - '17' - '21' - '22' @@ -46,8 +45,8 @@ defaults: shell: bash jobs: - build-jdk17: - name: "Initial JDK 17 Build - ${{ inputs.BRANCH }}" + build-jdk21: + name: "Initial JDK 21 Build - ${{ inputs.BRANCH }}" runs-on: ubuntu-latest outputs: gib_args: ${{ steps.get-gib-args.outputs.gib_args }} @@ -60,8 +59,8 @@ jobs: steps: - name: Gradle Enterprise environment run: | - echo "GE_TAGS=jdk-17" >> "$GITHUB_ENV" - echo "GE_CUSTOM_VALUES=gh-job-name=Initial JDK 17 Build" >> "$GITHUB_ENV" + echo "GE_TAGS=jdk-21" >> "$GITHUB_ENV" + echo "GE_CUSTOM_VALUES=gh-job-name=Initial JDK 21 Build" >> "$GITHUB_ENV" - uses: actions/checkout@v5 with: ref: ${{ inputs.BRANCH }} @@ -71,11 +70,11 @@ jobs: run: git remote show quarkusio &> /dev/null || git remote add quarkusio https://github.com/quarkusio/quarkus.git - name: Reclaim Disk Space run: .github/ci-prerequisites.sh - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Generate cache key id: cache-key run: | @@ -106,7 +105,7 @@ jobs: uses: gradle/develocity-actions/setup-maven@v1.4 with: capture-strategy: ON_DEMAND - job-name: "Initial JDK 17 Build" + job-name: "Initial JDK 21 Build" add-pr-comment: false add-job-summary: false develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} @@ -179,7 +178,7 @@ jobs: uses: actions/upload-artifact@v4 if: always() with: - name: "build-reports-Initial JDK 17 Build" + name: "build-reports-Initial JDK 21 Build" path: | build-reports.zip retention-days: 7 @@ -187,9 +186,9 @@ jobs: calculate-test-jobs: name: Calculate Test Jobs runs-on: ubuntu-latest - needs: build-jdk17 + needs: build-jdk21 env: - GIB_IMPACTED_MODULES: ${{ needs.build-jdk17.outputs.gib_impacted }} + GIB_IMPACTED_MODULES: ${{ needs.build-jdk21.outputs.gib_impacted }} outputs: native_matrix: ${{ steps.calc-native-matrix.outputs.matrix }} virtual_threads_matrix: ${{ steps.calc-virtual-threads-matrix.outputs.matrix }} @@ -219,7 +218,7 @@ jobs: virtual-thread-native-tests: name: Native Tests - Virtual Thread - ${{matrix.category}} - ${{inputs.NATIVE_COMPILER}} ${{inputs.NATIVE_COMPILER_VERSION}} - ${{inputs.BRANCH}} runs-on: ${{matrix.os-name}} - needs: [build-jdk17, calculate-test-jobs] + needs: [build-jdk21, calculate-test-jobs] timeout-minutes: ${{matrix.timeout}} strategy: max-parallel: 12 @@ -236,10 +235,10 @@ jobs: uses: actions/cache/restore@v4 with: path: ~/.m2/repository - key: ${{ needs.build-jdk17.outputs.m2-cache-key }} + key: ${{ needs.build-jdk21.outputs.m2-cache-key }} restore-keys: | - ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}- - ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}- + ${{ needs.build-jdk21.outputs.m2-monthly-branch-cache-key }}- + ${{ needs.build-jdk21.outputs.m2-monthly-cache-key }}- - name: Download .m2/repository/io/quarkus uses: actions/download-artifact@v5 with: @@ -299,7 +298,7 @@ jobs: native-tests: name: Native Tests - ${{matrix.category}} - ${{inputs.NATIVE_COMPILER}} ${{inputs.NATIVE_COMPILER_VERSION}} - ${{inputs.BRANCH}} - needs: [build-jdk17, calculate-test-jobs] + needs: [build-jdk21, calculate-test-jobs] runs-on: ${{matrix.os-name}} env: # leave more space for the actual native compilation and execution @@ -319,11 +318,11 @@ jobs: - uses: actions/checkout@v5 - name: Reclaim Disk Space run: .github/ci-prerequisites.sh - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Setup GraalVM id: setup-graalvm uses: graalvm/setup-graalvm@v1 @@ -341,10 +340,10 @@ jobs: uses: actions/cache/restore@v4 with: path: ~/.m2/repository - key: ${{ needs.build-jdk17.outputs.m2-cache-key }} + key: ${{ needs.build-jdk21.outputs.m2-cache-key }} restore-keys: | - ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}- - ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}- + ${{ needs.build-jdk21.outputs.m2-monthly-branch-cache-key }}- + ${{ needs.build-jdk21.outputs.m2-monthly-cache-key }}- - name: Download .m2/repository/io/quarkus uses: actions/download-artifact@v5 with: @@ -365,9 +364,9 @@ jobs: uses: actions/cache@v4 with: path: '**/.quarkus/quarkus-prod-config-dump' - key: ${{ needs.build-jdk17.outputs.quarkus-metadata-cache-key }} + key: ${{ needs.build-jdk21.outputs.quarkus-metadata-cache-key }} # The key is restored from default branch if not found, but still branch specific to override the default after first run - restore-keys: ${{ needs.build-jdk17.outputs.quarkus-metadata-cache-key-default }} + restore-keys: ${{ needs.build-jdk21.outputs.quarkus-metadata-cache-key-default }} - name: Build env: TEST_MODULES: ${{matrix.test-modules}} @@ -404,17 +403,17 @@ jobs: build-report: runs-on: ubuntu-latest name: Build report - ${{inputs.NATIVE_COMPILER}} ${{inputs.NATIVE_COMPILER_VERSION}} - ${{inputs.BRANCH}} - needs: [build-jdk17,native-tests,virtual-thread-native-tests] + needs: [build-jdk21,native-tests,virtual-thread-native-tests] if: always() steps: - uses: actions/download-artifact@v5 with: path: build-reports-artifacts - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Produce report and add it as job summary uses: quarkusio/action-build-reporter@main with: diff --git a/.github/workflows/owasp-check.yml b/.github/workflows/owasp-check.yml index faa937cefea34..f70e53a76d696 100644 --- a/.github/workflows/owasp-check.yml +++ b/.github/workflows/owasp-check.yml @@ -24,7 +24,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Generate cache key id: cache-key diff --git a/.github/workflows/podman-build.yml b/.github/workflows/podman-build.yml index ae028bf17bb38..135d5756b7d3b 100644 --- a/.github/workflows/podman-build.yml +++ b/.github/workflows/podman-build.yml @@ -19,7 +19,7 @@ env: jobs: build-all-the-things: - name: "JDK 17 Build" + name: "JDK 21 Build" runs-on: ubuntu-latest env: MAVEN_OPTS: "-Xmx2g -XX:MaxMetaspaceSize=1g" @@ -51,11 +51,11 @@ jobs: - name: Reclaim Disk Space if: "!startsWith(matrix.java.os-name, 'windows') && !startsWith(matrix.java.os-name, 'macos')" run: .github/ci-prerequisites.sh - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Get Date id: get-date run: | diff --git a/.github/workflows/populate-cache.yml b/.github/workflows/populate-cache.yml index 4c9cbe4bde17e..5d64557442096 100644 --- a/.github/workflows/populate-cache.yml +++ b/.github/workflows/populate-cache.yml @@ -48,11 +48,11 @@ jobs: needs: [ configure ] runs-on: ubuntu-latest steps: - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - uses: actions/checkout@v5 with: fetch-depth: 0 diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 60f3d987cf976..8503585c953a9 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -23,11 +23,11 @@ jobs: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - name: Reclaim Disk Space run: .github/ci-prerequisites.sh - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Create maven repo run: mkdir -p $HOME/release/repository - name: Build and Test diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index f51f191af7620..7eed3b0cc79d8 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -13,11 +13,11 @@ jobs: - uses: actions/checkout@v5 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Generate cache key id: cache-key run: | diff --git a/.gitpod/Dockerfile b/.gitpod/Dockerfile index 06e26b762fc70..e23d9216cfc54 100644 --- a/.gitpod/Dockerfile +++ b/.gitpod/Dockerfile @@ -1,6 +1,6 @@ -FROM gitpod/workspace-java-17 +FROM gitpod/workspace-java-21 -ENV JAVA_VERSION=17.0.14-tem +ENV JAVA_VERSION=21.0.8-tem RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \ sdk install java ${JAVA_VERSION} && \ diff --git a/build-parent/pom.xml b/build-parent/pom.xml index df5e1c4961612..97dcb69c35f2c 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -829,12 +829,12 @@ - 17 + 21 html - https://docs.oracle.com/en/java/javase/17/docs/api/ + https://docs.oracle.com/en/java/javase/21/docs/api/ diff --git a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml index 48a83ffaeb60f..2be6d1179ccf3 100644 --- a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml +++ b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml @@ -10,8 +10,8 @@ 3.1.0 3.14.0 true - 17 - 17 + 21 + 21 UTF-8 UTF-8 999-SNAPSHOT diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml index 2004e12e167c6..33a8e28c804e7 100644 --- a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml +++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml @@ -10,8 +10,8 @@ 3.1.0 3.14.0 true - 17 - 17 + 21 + 21 UTF-8 UTF-8 999-SNAPSHOT diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml index fbc5b9cd83c9d..376b916428440 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml @@ -9,8 +9,8 @@ 3.14.0 true - 17 - 17 + 21 + 21 UTF-8 UTF-8 999-SNAPSHOT diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml index 5f93a1d90733f..83b125adc7409 100644 --- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml +++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml @@ -9,8 +9,8 @@ 3.14.0 true - 17 - 17 + 21 + 21 UTF-8 UTF-8 999-SNAPSHOT diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index c55283c5ce22a..e00dae3f248f1 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -42,7 +42,7 @@ 2.19.1 1.1.3 - 3.4 + 3.10 verify @@ -50,9 +50,9 @@ true - 17 - 17 - 17 + 21 + 21 + 21 ${maven.compiler.release} ${maven.compiler.release} ${maven.compiler.target} diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml index 3afc45c3557ab..70e92cc731a51 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml index 480724f5cabb7..652508a19d17d 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml index d6dac3dce1b80..7b0e728f131a4 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml index 316ae23698a1e..23c4ac8dcac12 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml index 715b928fa7b32..02035804212f2 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml index d00629eebbe22..312dc577a9576 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml index 8758e779a045d..f5380eb8218aa 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-native-main/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-native-main/pom.xml index ccc112de4db0f..edb8d1750c1d6 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-native-main/pom.xml +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-native-main/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 false diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testMavenContent/pom.xml b/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testMavenContent/pom.xml index a940ef7539813..ed5bdf112313c 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testMavenContent/pom.xml +++ b/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testMavenContent/pom.xml @@ -8,7 +8,7 @@ 3.8.1-MOCK 1.4.28-MOCK - 17 + 21 UTF-8 UTF-8 quarkus-mock-bom @@ -158,7 +158,7 @@ true - 17 + 21 all-open kotlinx-serialization diff --git a/integration-tests/hibernate-orm-compatibility-5.6/database-generator/pom.xml b/integration-tests/hibernate-orm-compatibility-5.6/database-generator/pom.xml index 057ae8636809d..a3f43c4bc4ce7 100644 --- a/integration-tests/hibernate-orm-compatibility-5.6/database-generator/pom.xml +++ b/integration-tests/hibernate-orm-compatibility-5.6/database-generator/pom.xml @@ -8,7 +8,7 @@ 1.0.0-SNAPSHOT 3.10.1 - 17 + 21 UTF-8 UTF-8 quarkus-bom diff --git a/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml b/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml index 38f71920863c4..600b49eb27988 100644 --- a/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml +++ b/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/classic-kotlin/pom.xml b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/classic-kotlin/pom.xml index 48df305cb1a8f..adc24c9c11ac5 100644 --- a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/classic-kotlin/pom.xml +++ b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/classic-kotlin/pom.xml @@ -9,9 +9,9 @@ 1.0-SNAPSHOT @project.version@ - 17 + 21 + 21 UTF-8 - 17 @kotlin.version@ diff --git a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml index 07eb27036f0a9..5ce1ebd2c52be 100644 --- a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml +++ b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml @@ -9,9 +9,9 @@ @project.version@ - 17 + 21 + 21 UTF-8 - 17 @kotlin.version@ diff --git a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml index a477ef7274fe5..e116d6936a0b4 100644 --- a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml +++ b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml @@ -8,9 +8,9 @@ 1.0-SNAPSHOT - 17 + 21 + 21 UTF-8 - 17 3.2.2 @kotlin.version@ diff --git a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/kotlin-compiler-args/pom.xml b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/kotlin-compiler-args/pom.xml index 4ecdc8df91ce4..15a1fc2520892 100644 --- a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/kotlin-compiler-args/pom.xml +++ b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/kotlin-compiler-args/pom.xml @@ -9,9 +9,9 @@ 1.0-SNAPSHOT @project.version@ - 17 + 21 + 21 UTF-8 - 17 @kotlin.version@ diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml index 013852297dd56..88f17a88748e2 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml index ca1dfa7ee0f0f..1d7b673ea4f6c 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml index 4886a40f31558..ed4d00dd88a5c 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml index 72fee808ab714..dfbbd833cad6a 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml index 533c3ad5326ad..7b7a0a6ece513 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml @@ -9,9 +9,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml index df2dcb9d6b7d6..717c1d195aa84 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml index 7e0bfb3f2aaa7..140f8c2dd00ac 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml index ff89f4dfb1503..feefed6e10ae6 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml index 1ed10dd126bf8..3dfd857de1411 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml index 5ff15e511abe6..f026cc5256167 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml index 4c0fbcee7c557..23f5ec7056f7f 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml @@ -8,9 +8,9 @@ UTF-8 3.5.4 - 17 + 21 + 21 UTF-8 - 17 diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml index ce1c6a8583ec8..75ad41912cd3d 100644 --- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml @@ -17,8 +17,8 @@ UTF-8 UTF-8 - 17 - 17 + 21 + 21 true diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/pom.xml index ce69dfc08adb7..5d287cfb3e264 100644 --- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/pom.xml @@ -17,8 +17,8 @@ UTF-8 UTF-8 - 17 - 17 + 21 + 21 true diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/pom.xml index dc6bcdb39ff84..eb95ab3467397 100644 --- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/pom.xml @@ -17,8 +17,8 @@ UTF-8 UTF-8 - 17 - 17 + 21 + 21 true diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/pom.xml index 3db396312fb52..7a34f9c19663c 100644 --- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/pom.xml @@ -18,8 +18,8 @@ UTF-8 UTF-8 - 17 - 17 + 21 + 21 true diff --git a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/pom.xml index 06e3b726f2358..929b052250270 100644 --- a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/pom.xml @@ -14,7 +14,7 @@ UTF-8 UTF-8 - 17 + 21 \${project.version} \${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml index 218d2d5c53e18..997c3415aa329 100644 --- a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml @@ -19,8 +19,8 @@ UTF-8 UTF-8 - 17 - 17 + 21 + 21 true \${project.version} \${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/pom.xml index 06e3b726f2358..929b052250270 100644 --- a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/pom.xml @@ -14,7 +14,7 @@ UTF-8 UTF-8 - 17 + 21 \${project.version} \${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/mockito-non-public-inner-class/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/mockito-non-public-inner-class/pom.xml index fbe2012be6825..22625c94a7ccd 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/mockito-non-public-inner-class/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/mockito-non-public-inner-class/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT 3.12.1 - 17 + 21 UTF-8 UTF-8 quarkus-bom diff --git a/integration-tests/maven/src/test/resources-filtered/projects/non-parent-aggregator/model/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/non-parent-aggregator/model/pom.xml index 0c45a5ea79d23..3c154f854c4b6 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/non-parent-aggregator/model/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/non-parent-aggregator/model/pom.xml @@ -11,9 +11,9 @@ UTF-8 UTF-8 - 17 - 17 - 17 + 21 + 21 + 21 true diff --git a/integration-tests/maven/src/test/resources-filtered/projects/non-parent-aggregator/service/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/non-parent-aggregator/service/pom.xml index 7325a847394b4..72aa65aab854b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/non-parent-aggregator/service/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/non-parent-aggregator/service/pom.xml @@ -11,10 +11,10 @@ UTF-8 UTF-8 - 17 - 17 - 17 - 17 + 21 + 21 + 21 + 21 diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-selection/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-selection/pom.xml index 4cb346fd1160d..3fa4b8caa46d9 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/test-selection/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/test-selection/pom.xml @@ -12,9 +12,9 @@ UTF-8 UTF-8 - 17 - 17 - 17 + 21 + 21 + 21 true diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml index 64ff32d871b7d..19ce38e9f37f5 100644 --- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml +++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml @@ -26,7 +26,7 @@ 3.14.0 - 17 + 21 UTF-8 UTF-8 3.14.0 diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml index 57035ea3cbc67..a939663e5dc64 100644 --- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml +++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml @@ -15,7 +15,7 @@ 3.14.0 ${surefire-plugin.version} - 17 + 21 UTF-8 UTF-8 3.14.0 diff --git a/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml b/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml index 4839d506ea307..18de993b75469 100644 --- a/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml +++ b/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml @@ -8,9 +8,9 @@ 1.0-SNAPSHOT @project.version@ - 17 + 21 + 21 UTF-8 - 17 @scala.version@ @scala-maven-plugin.version@ @version.surefire.plugin@ diff --git a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml index d6ec72e0a9f1e..bde6a49dcfd0b 100644 --- a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml +++ b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml @@ -10,9 +10,9 @@ @project.version@ - 17 + 21 + 21 UTF-8 - 17 @scala.version@ @scala-maven-plugin.version@ @version.surefire.plugin@ diff --git a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml index 1c15f735f9b74..735344234db6f 100644 --- a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml +++ b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml @@ -10,9 +10,9 @@ @project.version@ - 17 + 21 + 21 UTF-8 - 17 @scala.version@ @scala-maven-plugin.version@ 3.2.2 diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/avro-multimodule-project/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/avro-multimodule-project/pom.xml index abf39cedad87f..c22a22aa217d1 100644 --- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/avro-multimodule-project/pom.xml +++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/avro-multimodule-project/pom.xml @@ -12,7 +12,7 @@ UTF-8 UTF-8 - 17 + 21 ${compiler-plugin.version} 3.5.4 diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml index 7e5c7dec8c51a..267809489a9b7 100644 --- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml +++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml @@ -9,7 +9,7 @@ ${compiler-plugin.version} false quarkus-bom - 17 + 21 UTF-8 UTF-8 3.5.4 diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml index abe42112c0a1e..189f809456ccc 100644 --- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml +++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml @@ -9,7 +9,7 @@ ${compiler-plugin.version} false - 17 + 21 UTF-8 UTF-8 quarkus-bom diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension-with-bytecode-changes/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension-with-bytecode-changes/pom.xml index 5d835238c2271..11398c96b9d05 100644 --- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension-with-bytecode-changes/pom.xml +++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension-with-bytecode-changes/pom.xml @@ -9,7 +9,7 @@ ${compiler-plugin.version} false quarkus-bom - 17 + 21 UTF-8 UTF-8 3.5.4 diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml index 5d835238c2271..11398c96b9d05 100644 --- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml +++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml @@ -9,7 +9,7 @@ ${compiler-plugin.version} false quarkus-bom - 17 + 21 UTF-8 UTF-8 3.5.4