diff --git a/build.gradle b/build.gradle
index 9dd97321..0a073f05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,7 @@ plugins {
 	id 'io.spring.dependency-management' version '1.1.4' apply false
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
+	id 'com.github.spotbugs' version '6.0.7'
 }
 
 description = 'Spring AMQP'
@@ -45,7 +46,6 @@ ext {
 	commonsCompressVersion = '1.20'
 	commonsHttpClientVersion = '5.1.3'
 	commonsPoolVersion = '2.11.1'
-	googleJsr305Version = '3.0.2'
 	hamcrestVersion = '2.2'
 	hibernateValidationVersion = '8.0.0.Final'
 	jacksonBomVersion = '2.14.3'
@@ -166,7 +166,10 @@ configure(javaProjects) { subproject ->
 
 	// dependencies that are common across all java projects
 	dependencies {
-		compileOnly "com.google.code.findbugs:jsr305:$googleJsr305Version"
+		def spotbugsAnnotations = "com.github.spotbugs:spotbugs-annotations:${spotbugs.toolVersion.get()}"
+		compileOnly spotbugsAnnotations
+		testCompileOnly spotbugsAnnotations
+
 		testImplementation 'org.apache.logging.log4j:log4j-core'
 		testImplementation "org.hamcrest:hamcrest-core:$hamcrestVersion"
 		testImplementation ("org.mockito:mockito-core:$mockitoVersion") {
@@ -188,7 +191,6 @@ configure(javaProjects) { subproject ->
 		// To avoid compiler warnings about @API annotations in JUnit code
 		testCompileOnly 'org.apiguardian:apiguardian-api:1.0.0'
 
-		testCompileOnly "com.google.code.findbugs:jsr305:$googleJsr305Version"
 		testImplementation 'org.jetbrains.kotlin:kotlin-reflect'
 		testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'