From c056a1071eff5c3a15989f806e9bc9552e4218d7 Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Sun, 25 Feb 2024 11:58:48 +0100
Subject: [PATCH] WELD-2777 Add JDK 21 into CI setup, bump some test configs to
 use JDK 17, keep 11 as minimal

---
 .github/workflows/ci-actions.yml | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index 240da7e80e..61242cc695 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -93,6 +93,10 @@ jobs:
             name: "17",
             java-version: 17,
           }
+          - {
+            name: "21",
+            java-version: 21,
+          }
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java.name }}
@@ -156,6 +160,10 @@ jobs:
             name: "17",
             java-version: 17,
           }
+          - {
+            name: "21",
+            java-version: 21,
+          }
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java.name }}
@@ -212,8 +220,8 @@ jobs:
       fail-fast: false
       matrix:
         java:
-          - { name: "11",
-              java-version: 11,
+          - { name: "17",
+              java-version: 17,
           }
     steps:
       - uses: actions/checkout@v4
@@ -291,6 +299,10 @@ jobs:
             name: "17",
             java-version: 17,
           }
+          - {
+            name: "21",
+            java-version: 21,
+          }
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java.name }}
@@ -320,9 +332,9 @@ jobs:
           name: test-reports-no-container-jdk${{matrix.java.name}}
           path: 'test-reports.tgz'
 
-  # Weld Examples build and test, only JDK 11
+  # Weld Examples build and test, single JDK
   examples-tests:
-    name: "Weld Examples build and test - JDK 11}"
+    name: "Weld Examples build and test - JDK 17}"
     runs-on: ubuntu-latest
     needs: build-jdk11
     timeout-minutes: 120
@@ -331,7 +343,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.12.0
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Download Maven Repo
         uses: actions/download-artifact@v3
@@ -389,6 +401,10 @@ jobs:
             name: "17",
             java-version: 17,
           }
+          - {
+            name: "21",
+            java-version: 21,
+          }
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java.name }}
@@ -426,10 +442,10 @@ jobs:
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.12.0
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Download Maven Repo
         uses: actions/download-artifact@v3