From 30a833c258fef1acd1290b5782994cc475074065 Mon Sep 17 00:00:00 2001
From: dejan2609 <dejan2609@gmail.com>
Date: Wed, 8 Oct 2025 15:41:58 +0200
Subject: [PATCH] KAFKA-19771 Update SpotBugs version and enable Spotbugs
 Gradle tasks on Java 25

details:
 - spotbugs: 4.9.4 -->> 4.9.8
 - spotbugs gradle plugin: 6.2.5 -->> 6.4.4
 - spotbugs tasks are enabled for Java 25

related links:
 - https://github.com/spotbugs/spotbugs/blob/4.9.8/CHANGELOG.md#498---2025-10-18
 - https://github.com/spotbugs/spotbugs-gradle-plugin/releases/tag/6.4.4
---
 .github/workflows/build.yml | 2 +-
 build.gradle                | 9 +--------
 gradle/dependencies.gradle  | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59c2fabaaed25..0f6cea60a25b9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -127,7 +127,7 @@ jobs:
       - name: Setup Gradle
         uses: ./.github/actions/setup-gradle
         with:
-          java-version: 17
+          java-version: 25
           gradle-cache-read-only: ${{ !inputs.is-trunk }}
           gradle-cache-write-only: ${{ inputs.is-trunk }}
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
diff --git a/build.gradle b/build.gradle
index 5b2096816cd01..0b265cd959157 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ plugins {
   id 'org.nosphere.apache.rat' version "0.8.1"
   id "io.swagger.core.v3.swagger-gradle-plugin" version "${swaggerVersion}"
 
-  id "com.github.spotbugs" version '6.2.5' apply false
+  id "com.github.spotbugs" version '6.4.4' apply false
   id 'org.scoverage' version '8.1' apply false
   id 'com.gradleup.shadow' version '8.3.9' apply false
   id 'com.diffplug.spotless' version "8.0.0"
@@ -71,13 +71,6 @@ ext {
       "--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED"
     )
 
-  if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_25)) {
-    // Spotbugs is not compatible with Java 25+ so Gradle related tasks are disabled
-    // until version can be upgraded: https://github.com/spotbugs/spotbugs/issues/3564
-    project.gradle.startParameter.excludedTaskNames.add("spotbugsMain")
-    project.gradle.startParameter.excludedTaskNames.add("spotbugsTest")
-  }    
-
   maxTestForks = project.hasProperty('maxParallelForks') ? maxParallelForks.toInteger() : Runtime.runtime.availableProcessors()
   maxScalacThreads = project.hasProperty('maxScalacThreads') ? maxScalacThreads.toInteger() :
       Math.min(Runtime.runtime.availableProcessors(), 8)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 91f9e1095c393..3b7098c9a3e02 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -123,7 +123,7 @@ versions += [
   scoverage: "2.3.0",
   slf4j: "1.7.36",
   snappy: "1.1.10.7",
-  spotbugs: "4.9.4",
+  spotbugs: "4.9.8",
   mockOAuth2Server: "2.2.1",
   zinc: "1.11.0",
   // When updating the zstd version, please do as well in docker/native/native-image-configs/resource-config.json