From 8da8864551a2695aa030ef4b3f20fb91e38e1149 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 23 Nov 2025 14:12:57 -0500
Subject: [PATCH 1/2] [gha] Fix codeql

---
 .github/workflows/codeql.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 51e758f85..5c46a0eb3 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -38,13 +38,13 @@ jobs:
         with:
           queries: +security-and-quality
 
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4
+      - name: Autobuild (manual core)
         working-directory: core
+        run: ./mvnw clean install -DskipTests
 
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4
+      - name: Autobuild (manual eclipse)
         working-directory: eclipse
+        run: ./mvnw clean install -DskipTests
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4

From aff6f2a18b3a57adbcaeada5737e1c8e728436a8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 23 Nov 2025 14:16:43 -0500
Subject: [PATCH 2/2] [gha] Add toolchain back but java 17 probably isn't valid
 and the action is really old

---
 .github/workflows/eclipse-ci.yaml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/.github/workflows/eclipse-ci.yaml b/.github/workflows/eclipse-ci.yaml
index 22a62301c..edccbcd1d 100644
--- a/.github/workflows/eclipse-ci.yaml
+++ b/.github/workflows/eclipse-ci.yaml
@@ -44,6 +44,30 @@ jobs:
 
     steps:
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+      - name: Install Toolchain JDK
+        uses: battila7/jdk-via-jabba@v1
+        with:
+          jdk: zulu@1.17.0-0
+          javaHomeEnvironmentVariable: TOOLCHAIN_JDK
+      - name: Set up Toolchain
+        shell: bash
+        run: |
+          mkdir --parents $HOME/.m2 \
+          && cat << EOF > $HOME/.m2/toolchains.xml
+          <?xml version="1.0" encoding="UTF-8"?>
+          <toolchains>
+            <toolchain>
+              <type>jdk</type>
+                <provides>
+                  <version>17</version>
+                  <vendor>zulu</vendor>
+                </provides>
+                <configuration>
+                  <jdkHome>${{ env.TOOLCHAIN_JDK }}</jdkHome>
+                </configuration>
+            </toolchain>
+          </toolchains>
+          EOF
       - name: Setup Java ${{ matrix.java }} ${{ matrix.distribution }}
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
         with: