From f8754e16571258d2d7ad0e28443d471a7d51f8e8 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Tue, 20 Aug 2024 08:30:18 -0700
Subject: [PATCH] Add additional JDK versions to release setup

---
 .github/workflows/ci.yml      |  2 +-
 .github/workflows/release.yml | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b9183071f4..321b7e4ae34 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -146,8 +146,8 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: |
-            17
             11
+            17
           distribution: 'zulu'
           cache: 'maven'
       - name: 'Generate latest docs'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ef4eb3f18e1..b76cfd0cc48 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,10 +16,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: 'Set up JDK 24 from jdk.java.net'
+        uses: oracle-actions/setup-java@v1
+        with:
+          website: jdk.java.net
+          release: 24
+          cache: 'maven'
+
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: |
+            11
+            17
           distribution: 'zulu'
           cache: 'maven'
           server-id: ossrh