From b4b2fd98b73b887c7766c6f04ceebf23a6a4a916 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Mon, 3 Feb 2025 09:45:58 -0800 Subject: [PATCH] Run JDK 21 workflows with latest JDK. Reverts PR #17458. --- .github/workflows/static-checks.yml | 3 +-- .github/workflows/unit-and-integration-tests-unified.yml | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml index 6a149a46a6d3..5f9fd7b4d608 100644 --- a/.github/workflows/static-checks.yml +++ b/.github/workflows/static-checks.yml @@ -41,8 +41,7 @@ jobs: strategy: fail-fast: false matrix: - # Use JDK 21.0.4 to work around https://github.com/apache/druid/issues/17429 - java: [ '11', '17', '21.0.4' ] + java: [ '11', '17', '21' ] runs-on: ubuntu-latest steps: - name: checkout branch diff --git a/.github/workflows/unit-and-integration-tests-unified.yml b/.github/workflows/unit-and-integration-tests-unified.yml index f5b79853642b..6126c38cb67a 100644 --- a/.github/workflows/unit-and-integration-tests-unified.yml +++ b/.github/workflows/unit-and-integration-tests-unified.yml @@ -79,8 +79,7 @@ jobs: strategy: fail-fast: false matrix: - # Use JDK 21.0.4 to work around https://github.com/apache/druid/issues/17429 - jdk: [ '11', '17', '21.0.4' ] + jdk: [ '11', '17', '21' ] runs-on: ubuntu-latest steps: - name: Checkout branch @@ -211,8 +210,7 @@ jobs: strategy: fail-fast: false matrix: - # Use JDK 21.0.4 to work around https://github.com/apache/druid/issues/17429 - jdk: [ '11', '21.0.4' ] + jdk: [ '11', '21' ] name: "unit tests (jdk${{ matrix.jdk }})" uses: ./.github/workflows/unit-tests.yml needs: [unit-tests-unapproved, check-approval]