Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
- name: Setup Gradle
uses: ./.github/actions/setup-gradle
with:
java-version: 17
java-version: 24
gradle-cache-read-only: ${{ !inputs.is-trunk }}
gradle-cache-write-only: ${{ inputs.is-trunk }}
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
Expand Down
6 changes: 0 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@ ext {
"--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED"
)

if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_24)) {
// Spotbugs is not compatible with Java 24+ until Spotbugs 4.9.4. Disable it until we can upgrade to that version.
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)
Expand Down
5 changes: 1 addition & 4 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,7 @@ versions += [
scoverage: "2.0.11",
slf4j: "1.7.36",
snappy: "1.1.10.7",
// While Spotbugs 4.9.3 exists at the time of writing,
// Spotbugs 4.9.1 is the latest version not affected by https://github.com/spotbugs/spotbugs/pull/3311,
// which breaks the build, so we're sticking with that version until 4.9.4 is released.
spotbugs: "4.9.1",
spotbugs: "4.9.4",
mockOAuth2Server: "2.2.1",
zinc: "1.9.2",
// When updating the zstd version, please do as well in docker/native/native-image-configs/resource-config.json
Expand Down
24 changes: 20 additions & 4 deletions gradle/spotbugs-exclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read
</Match>

<Match>
<!-- New warning type added when we upgraded from spotbugs 4.8.6 to 4.9.1.
<!-- New warning type added when we upgraded from spotbugs 4.8.6 to 4.9.4.
These are possibly real bugs, and have not been evaluated, they were just bulk excluded to unblock upgrading Spotbugs.
-->
<Or>
Expand Down Expand Up @@ -586,7 +586,7 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read
</Match>

<Match>
<!-- New warning type added when we upgraded from spotbugs 4.8.6 to 4.9.1.
<!-- New warning type added when we upgraded from spotbugs 4.8.6 to 4.9.4.
These are possibly real bugs, and have not been evaluated, they were just bulk excluded to unblock upgrading Spotbugs.
-->
<Or>
Expand Down Expand Up @@ -617,12 +617,16 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read
<Class name="kafka.coordinator.transaction.TransactionStateManager"/>
<Class name="kafka.log.LogManager"/>
<Class name="kafka.server.ReplicaManager"/>
<Class name="org.apache.kafka.streams.state.internals.AbstractDualSchemaRocksDBSegmentedBytesStore"/>
<Class name="org.apache.kafka.streams.state.internals.AbstractRocksDBSegmentedBytesStore"/>
<Class name="org.apache.kafka.streams.state.internals.InMemorySessionStore"/>
<Class name="org.apache.kafka.streams.state.internals.InMemoryWindowStore"/>
</Or>
<Bug pattern="AT_NONATOMIC_64BIT_PRIMITIVE"/>
</Match>

<Match>
<!-- New warning type added when we upgraded from spotbugs 4.8.6 to 4.9.1.
<!-- New warning type added when we upgraded from spotbugs 4.8.6 to 4.9.4.
These are possibly real bugs, and have not been evaluated, they were just bulk excluded to unblock upgrading Spotbugs.
-->
<Or>
Expand Down Expand Up @@ -687,12 +691,13 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read
<Class name="kafka.server.ReplicaManager"/>
<Class name="org.apache.kafka.trogdor.coordinator.NodeManager$NodeHeartbeat"/>
<Class name="org.apache.kafka.connect.runtime.distributed.DistributedHerder$RebalanceListener"/>
<Class name="org.apache.kafka.streams.processor.internals.StreamThread"/>
</Or>
<Bug pattern="AT_STALE_THREAD_WRITE_OF_PRIMITIVE"/>
</Match>

<Match>
<!-- New warning type added when we upgraded from spotbugs 4.8.6 to 4.9.1.
<!-- New warning type added when we upgraded from spotbugs 4.8.6 to 4.9.4.
These are possibly real bugs, and have not been evaluated, they were just bulk excluded to unblock upgrading Spotbugs.
-->
<Or>
Expand All @@ -719,4 +724,15 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read
<Bug pattern="HSM_HIDING_METHOD"/>
</Match>

<Match>
<!-- New warning type added when we upgraded from spotbugs 4.8.6 to 4.9.4.
These are possibly real bugs, and have not been evaluated, they were just bulk excluded to unblock upgrading Spotbugs.
-->
<Or>
<Class name="org.apache.kafka.common.security.ssl.SslFactory$SslEngineValidator"/>
<Class name="org.apache.kafka.server.authorizer.Authorizer"/>
</Or>
<Bug pattern="SF_SWITCH_FALLTHROUGH"/>
</Match>

</FindBugsFilter>