From 6599297e683853e49204127f08ce86d8271081ab Mon Sep 17 00:00:00 2001
From: Farah Juma <fjuma@redhat.com>
Date: Thu, 14 Mar 2024 09:38:06 -0400
Subject: [PATCH 1/2] [ELY-2727] Update CI to also run with JDK 21

---
 .github/workflows/pr-ci.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml
index 32ffa815c7..c56d1e36f0 100644
--- a/.github/workflows/pr-ci.yaml
+++ b/.github/workflows/pr-ci.yaml
@@ -11,16 +11,18 @@ on:
 
 jobs:
   build:
+    name: ${{ matrix.os }}-jdk${{ matrix.java }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        java: ['11', '21']
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: ${{ matrix.java }}
       # ELY-2204 - Temporarily preventing OidcTest from running on macOS since there
       # are intermittent issues with starting up the Docker container.
       #- if: matrix.os == 'macos-latest'

From e4fd8267adbd74afded90471eb025e517dee22f4 Mon Sep 17 00:00:00 2001
From: Prarthona Paul <prpaul@redhat.com>
Date: Mon, 6 May 2024 10:55:30 -0400
Subject: [PATCH 2/2] [ELY-2727] Update CI to also run with JDK 21

---
 .github/workflows/pr-ci.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml
index c56d1e36f0..eb720698df 100644
--- a/.github/workflows/pr-ci.yaml
+++ b/.github/workflows/pr-ci.yaml
@@ -11,12 +11,11 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.os }}-jdk${{ matrix.java }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        java: ['11', '21']
+        java: ['11', '17', '21']
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.java }}