diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 55238c0..736d2b6 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -35,17 +35,17 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: '8'
-        distribution: 'adopt'
+        java-version: '17'
+        distribution: 'temurin'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,12 +65,10 @@ jobs:
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
 
+    # Note: Assumes we're running on Ubuntu
+    # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
     - name: Build
-      #run: ./gradlew build --warning-mode all
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        run: ./gradlew build -xsign -xpublish --warning-mode all
-        working-directory: ./ #optional
+      run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6dd23c0..18e9760 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,23 +16,25 @@ jobs:
 
     strategy:
       matrix:
-        java: [ '8', '11', '14', '17']
+        java: [ '17', '21', '23' ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
+      - name: Verify gradle wrapper
+        uses: gradle/actions/wrapper-validation@v4
+        if: matrix.java == '17'
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'temurin'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      # Note: Assumes we're running on Ubuntu
+      # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
       - name: Build with Gradle
-        #run: ./gradlew build --warning-mode all
-        uses: GabrielBB/xvfb-action@v1
-        with:
-          run: ./gradlew build -xsign -xpublish --warning-mode all
-          working-directory: ./ #optional
+        run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all
diff --git a/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java b/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java
index 2ce592a..ad29a6a 100644
--- a/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java
+++ b/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java
@@ -132,6 +132,7 @@ class AutoCompleteDescWindow extends JWindow implements HyperlinkListener,
 	 * @param owner The parent window.
 	 * @param ac The parent auto-completion.
 	 */
+	@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
 	AutoCompleteDescWindow(Window owner, AutoCompletion ac) {
 
 		super(owner);
diff --git a/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompletion.java b/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompletion.java
index 6aeeb60..68c4b52 100644
--- a/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompletion.java
+++ b/AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompletion.java
@@ -259,6 +259,7 @@ public class AutoCompletion {
 	 *
 	 * @param provider The completion provider. This cannot be <code>null</code>
 	 */
+	@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
 	public AutoCompletion(CompletionProvider provider) {
 
 		setChoicesWindowSize(350, 200);
diff --git a/AutoComplete/src/main/java/org/fife/ui/autocomplete/LanguageAwareCompletionProvider.java b/AutoComplete/src/main/java/org/fife/ui/autocomplete/LanguageAwareCompletionProvider.java
index 6bcb396..3d9b814 100644
--- a/AutoComplete/src/main/java/org/fife/ui/autocomplete/LanguageAwareCompletionProvider.java
+++ b/AutoComplete/src/main/java/org/fife/ui/autocomplete/LanguageAwareCompletionProvider.java
@@ -90,6 +90,7 @@ protected LanguageAwareCompletionProvider() {
 	 * @param defaultProvider The provider to use when no provider is assigned
 	 *        to a particular token type.  This cannot be <code>null</code>.
 	 */
+	@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
 	public LanguageAwareCompletionProvider(CompletionProvider defaultProvider) {
 		setDefaultCompletionProvider(defaultProvider);
 	}
diff --git a/AutoComplete/src/main/java/org/fife/ui/autocomplete/OutlineHighlightPainter.java b/AutoComplete/src/main/java/org/fife/ui/autocomplete/OutlineHighlightPainter.java
index 3e9047c..9c3f986 100644
--- a/AutoComplete/src/main/java/org/fife/ui/autocomplete/OutlineHighlightPainter.java
+++ b/AutoComplete/src/main/java/org/fife/ui/autocomplete/OutlineHighlightPainter.java
@@ -53,7 +53,7 @@ class OutlineHighlightPainter extends
 	 */
 	OutlineHighlightPainter(Color color) {
 		super(color);
-		setColor(color);
+		this.color = color != null? color : Color.BLACK; // SpotBugs
 	}
 
 
diff --git a/build.gradle b/build.gradle
index 5ff7252..b86be96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.github.spotbugs' version '5.2.5'
+    id 'com.github.spotbugs' version '6.0.26'
 }
 
 // We require building with JDK 17 or later. Built artifact compatibility