From 86625a137afbd4c16a1f70054503d68aadbfddcb Mon Sep 17 00:00:00 2001 From: Roger Barker Date: Thu, 31 Oct 2024 15:23:54 -0500 Subject: [PATCH] chore: 16356 cherry pick java version fixes (#16358) Signed-off-by: Mihail Mihov Signed-off-by: Roger Barker Co-authored-by: Mihail Mihov --- .github/workflows/flow-artifact-determinism.yaml | 6 +++--- .github/workflows/node-flow-build-application.yaml | 4 ++-- .github/workflows/node-flow-deploy-adhoc-artifact.yaml | 4 ++-- .../workflows/node-flow-fsts-custom-regression.yaml | 4 ++-- .github/workflows/node-flow-pull-request-checks.yaml | 4 ++-- .github/workflows/node-zxc-build-release-artifact.yaml | 2 +- .../workflows/node-zxc-compile-application-code.yaml | 2 +- .../platform-pull-request-extended-checks.yaml | 10 +++++----- .../workflows/zxc-verify-docker-build-determinism.yaml | 2 +- .../workflows/zxc-verify-gradle-build-determinism.yaml | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/flow-artifact-determinism.yaml b/.github/workflows/flow-artifact-determinism.yaml index a67316fb04a..f638b1c915b 100644 --- a/.github/workflows/flow-artifact-determinism.yaml +++ b/.github/workflows/flow-artifact-determinism.yaml @@ -32,7 +32,7 @@ on: description: "Java JDK Version:" type: string required: false - default: "21" + default: "21.0.4" push: branches: - develop @@ -55,7 +55,7 @@ jobs: with: ref: ${{ github.event.inputs.ref || '' }} java-distribution: ${{ inputs.java-distribution || 'temurin' }} - java-version: ${{ inputs.java-version || '21' }} + java-version: ${{ inputs.java-version || '21.0.4' }} secrets: gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }} gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }} @@ -66,7 +66,7 @@ jobs: with: ref: ${{ github.event.inputs.ref || '' }} java-distribution: ${{ inputs.java-distribution || 'temurin' }} - java-version: ${{ inputs.java-version || '21' }} + java-version: ${{ inputs.java-version || '21.0.4' }} secrets: gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }} gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }} diff --git a/.github/workflows/node-flow-build-application.yaml b/.github/workflows/node-flow-build-application.yaml index 714d54ce8b3..f87dc275607 100644 --- a/.github/workflows/node-flow-build-application.yaml +++ b/.github/workflows/node-flow-build-application.yaml @@ -42,7 +42,7 @@ on: description: "Java JDK Version:" type: string required: false - default: "21" + default: "21.0.4" java-distribution: description: "Java JDK Distribution:" type: string @@ -63,7 +63,7 @@ jobs: name: Code uses: ./.github/workflows/node-zxc-compile-application-code.yaml with: - java-version: ${{ github.event.inputs.java-version || '21' }} + java-version: ${{ github.event.inputs.java-version || '21.0.4' }} java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }} enable-unit-tests: ${{ github.event_name == 'push' || github.event.inputs.enable-unit-tests == 'true' }} enable-hapi-tests-misc: ${{ github.event.inputs.enable-hapi-tests == 'true' }} diff --git a/.github/workflows/node-flow-deploy-adhoc-artifact.yaml b/.github/workflows/node-flow-deploy-adhoc-artifact.yaml index 2ff197d2a55..a313968dee4 100644 --- a/.github/workflows/node-flow-deploy-adhoc-artifact.yaml +++ b/.github/workflows/node-flow-deploy-adhoc-artifact.yaml @@ -27,7 +27,7 @@ on: description: "Java JDK Version:" type: string required: false - default: "21" + default: "21.0.4" java-distribution: description: "Java JDK Distribution:" type: string @@ -53,7 +53,7 @@ jobs: trigger-env-deploy: none release-profile: AdhocCommit dry-run-enabled: ${{ github.event.inputs.dry-run-enabled == 'true' }} - java-version: ${{ github.event.inputs.java-version || '21' }} + java-version: ${{ github.event.inputs.java-version || '21.0.4' }} java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }} gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }} diff --git a/.github/workflows/node-flow-fsts-custom-regression.yaml b/.github/workflows/node-flow-fsts-custom-regression.yaml index 415cf26c1ad..1ca07c14ae9 100644 --- a/.github/workflows/node-flow-fsts-custom-regression.yaml +++ b/.github/workflows/node-flow-fsts-custom-regression.yaml @@ -37,7 +37,7 @@ on: description: "Java JDK Version:" type: string required: false - default: "21" + default: "21.0.4" java-distribution: description: "Java JDK Distribution:" type: string @@ -67,7 +67,7 @@ jobs: branch-name: ${{ github.ref_name }} slack-results-channel: ${{ github.event.inputs.slack-results-channel }} slack-summary-channel: ${{ github.event.inputs.slack-summary-channel }} - java-version: ${{ github.event.inputs.java-version || '21' }} + java-version: ${{ github.event.inputs.java-version || '21.0.4' }} java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }} gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }} use-branch-for-slack-channel: false diff --git a/.github/workflows/node-flow-pull-request-checks.yaml b/.github/workflows/node-flow-pull-request-checks.yaml index 0ac07575d09..adb23238af4 100644 --- a/.github/workflows/node-flow-pull-request-checks.yaml +++ b/.github/workflows/node-flow-pull-request-checks.yaml @@ -276,7 +276,7 @@ jobs: with: ref: ${{ github.event.inputs.ref || '' }} java-distribution: temurin - java-version: 21 + java-version: 21.0.4 secrets: gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }} gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }} @@ -291,7 +291,7 @@ jobs: with: ref: ${{ github.event.inputs.ref || '' }} java-distribution: temurin - java-version: 21 + java-version: 21.0.4 secrets: gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }} gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }} diff --git a/.github/workflows/node-zxc-build-release-artifact.yaml b/.github/workflows/node-zxc-build-release-artifact.yaml index 27a335cc318..86dc74e1b40 100644 --- a/.github/workflows/node-zxc-build-release-artifact.yaml +++ b/.github/workflows/node-zxc-build-release-artifact.yaml @@ -59,7 +59,7 @@ on: description: "Java JDK Version:" type: string required: false - default: "21" + default: "21.0.4" gradle-version: description: "Gradle Version:" type: string diff --git a/.github/workflows/node-zxc-compile-application-code.yaml b/.github/workflows/node-zxc-compile-application-code.yaml index b490b85bfbb..1412bbb6351 100644 --- a/.github/workflows/node-zxc-compile-application-code.yaml +++ b/.github/workflows/node-zxc-compile-application-code.yaml @@ -87,7 +87,7 @@ on: description: "Java JDK Version:" type: string required: false - default: "21" + default: "21.0.4" node-version: description: "NodeJS Version:" type: string diff --git a/.github/workflows/platform-pull-request-extended-checks.yaml b/.github/workflows/platform-pull-request-extended-checks.yaml index 4af44bf9dff..44c82ae01d6 100644 --- a/.github/workflows/platform-pull-request-extended-checks.yaml +++ b/.github/workflows/platform-pull-request-extended-checks.yaml @@ -31,7 +31,7 @@ on: description: "Java JDK Version:" type: string required: false - default: "21" + default: "21.0.4" java-distribution: description: "Java JDK Distribution:" type: string @@ -61,7 +61,7 @@ jobs: branch-name: ${{ github.ref_name }} slack-results-channel: ${{ github.event.inputs.slack-results-channel }} slack-summary-channel: ${{ github.event.inputs.slack-summary-channel }} - java-version: ${{ github.event.inputs.java-version || '21' }} + java-version: ${{ github.event.inputs.java-version || '21.0.4' }} java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }} gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }} use-branch-for-slack-channel: false @@ -86,7 +86,7 @@ jobs: branch-name: ${{ github.ref_name }} slack-results-channel: ${{ github.event.inputs.slack-results-channel }} slack-summary-channel: ${{ github.event.inputs.slack-summary-channel }} - java-version: ${{ github.event.inputs.java-version || '21' }} + java-version: ${{ github.event.inputs.java-version || '21.0.4' }} java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }} gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }} use-branch-for-slack-channel: false @@ -111,7 +111,7 @@ jobs: branch-name: ${{ github.ref_name }} slack-results-channel: ${{ github.event.inputs.slack-results-channel }} slack-summary-channel: ${{ github.event.inputs.slack-summary-channel }} - java-version: ${{ github.event.inputs.java-version || '21' }} + java-version: ${{ github.event.inputs.java-version || '21.0.4' }} java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }} gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }} use-branch-for-slack-channel: false @@ -136,7 +136,7 @@ jobs: branch-name: ${{ github.ref_name }} slack-results-channel: ${{ github.event.inputs.slack-results-channel }} slack-summary-channel: ${{ github.event.inputs.slack-summary-channel }} - java-version: ${{ github.event.inputs.java-version || '21' }} + java-version: ${{ github.event.inputs.java-version || '21.0.4' }} java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }} gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }} use-branch-for-slack-channel: false diff --git a/.github/workflows/zxc-verify-docker-build-determinism.yaml b/.github/workflows/zxc-verify-docker-build-determinism.yaml index 05b51c4e9bd..c0e0117e3cf 100644 --- a/.github/workflows/zxc-verify-docker-build-determinism.yaml +++ b/.github/workflows/zxc-verify-docker-build-determinism.yaml @@ -32,7 +32,7 @@ on: description: "Java JDK Version:" type: string required: false - default: "21" + default: "21.0.4" secrets: gradle-cache-username: diff --git a/.github/workflows/zxc-verify-gradle-build-determinism.yaml b/.github/workflows/zxc-verify-gradle-build-determinism.yaml index 9db521d3265..adfe28596b8 100644 --- a/.github/workflows/zxc-verify-gradle-build-determinism.yaml +++ b/.github/workflows/zxc-verify-gradle-build-determinism.yaml @@ -32,7 +32,7 @@ on: description: "Java JDK Version:" type: string required: false - default: "21" + default: "21.0.4" secrets: gradle-cache-username: