From d44c43f25782d8c19a7fa19de7ff4daa582a8f01 Mon Sep 17 00:00:00 2001
From: Chris Vest <mr.chrisvest@gmail.com>
Date: Sat, 29 Jun 2024 17:58:54 -0700
Subject: [PATCH] Try getting CodeQL to use Java 21 for the main branch

---
 .github/workflows/codeql-legacy.yml | 39 +++++++++++++++++++++++++++++
 .github/workflows/codeql.yml        |  8 +++++-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/codeql-legacy.yml

diff --git a/.github/workflows/codeql-legacy.yml b/.github/workflows/codeql-legacy.yml
new file mode 100644
index 00000000..16fa2642
--- /dev/null
+++ b/.github/workflows/codeql-legacy.yml
@@ -0,0 +1,39 @@
+name: "CodeQL Legacy"
+
+on:
+  push:
+    branches: [ "1.0", "2.0", "2.1", "2.2", "2.3", "2.4", "2.4.1", "2.4.2", "3.0", "3.0.1", "3.1" ]
+  schedule:
+    - cron: "42 11 * * 6"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ java ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{ matrix.language }}"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 3b6e365b..d5c87fb8 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,7 +2,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "main", "1.0", "2.0", "2.1", "2.2", "2.3", "2.4", "2.4.1", "2.4.2", "3.0", "3.0.1", "3.1" ]
+    branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
   schedule:
@@ -25,6 +25,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.6
+      - name: Set up Java
+        uses: actions/setup-java@v4.2.1
+        with:
+          java-version: '21'
+          distribution: 'zulu'
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3