diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1dac557df..c1cc243af 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,27 +17,43 @@ jobs:
     docker:
       - image: cimg/openjdk:8.0
     <<: *lint_steps
+
+  # JDK 8 (LTS) - 31 Dec 2030 (extended support)
   test_openjdk8:
     docker:
       - image: cimg/openjdk:8.0
     <<: *build_steps
+
+  # JDK 11 (LTS) - 31 Jan 2032 (extended support)
   test_openjdk11:
     docker:
       - image: cimg/openjdk:11.0
     <<: *build_steps
-  test_openjdk15:
-    docker:
-      - image: cimg/openjdk:15.0
-    <<: *build_steps
+
+  # JDK 11 (LTS) - 30 Sep 2029 (extended support)
   test_openjdk17:
     docker:
       - image: cimg/openjdk:17.0
     <<: *build_steps
+
+  # Available in Ubuntu 22.04
+  test_openjdk18:
+    docker:
+      - image: cimg/openjdk:18.0
+    <<: *build_steps
+
+  # Available in Ubuntu 22.04
   test_openjdk19:
     docker:
       - image: cimg/openjdk:19.0
     <<: *build_steps
 
+  # JDK 21 (LTS) - 30 Sep 2031 (extended support)
+  test_openjdk21:
+    docker:
+      - image: cimg/openjdk:21.0
+    <<: *build_steps
+
 workflows:
   version: 2
   workflow:
@@ -45,6 +61,7 @@ workflows:
       - lint_openjdk8
       - test_openjdk8
       - test_openjdk11
-      - test_openjdk15
       - test_openjdk17
+      - test_openjdk18
       - test_openjdk19
+      - test_openjdk21
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3283c27b5..a689660b1 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,16 +37,16 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 8
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: '8'
         java-package: jdk
 
     - name: Build with Maven
-      run: ./mvnw clean compile assembly:single
+      run: ./mvnw --batch-mode --no-transfer-progress clean package -DskipTests=true
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2