Skip to content

Commit 185537d

Browse files
committed
Refine jsr305 dependency management
See gh-28797
1 parent 92f1f55 commit 185537d

File tree

5 files changed

+2
-7
lines changed

5 files changed

+2
-7
lines changed

build.gradle

-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ configure([rootProject] + javaProjects) { project ->
8080
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
8181
testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
8282
testRuntimeOnly("org.apache.logging.log4j:log4j-core")
83-
// JSR-305 only used for non-required meta-annotations
84-
compileOnly("com.google.code.findbugs:jsr305")
85-
testCompileOnly("com.google.code.findbugs:jsr305")
8683
}
8784

8885
ext.javadocLinks = [

spring-aop/spring-aop.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ apply plugin: "kotlin"
55
dependencies {
66
api(project(":spring-beans"))
77
api(project(":spring-core"))
8+
compileOnly("com.google.code.findbugs:jsr305") // for the AOP Alliance fork
89
optional("org.apache.commons:commons-pool2")
910
optional("org.aspectj:aspectjweaver")
1011
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
1112
testFixturesImplementation(testFixtures(project(":spring-beans")))
1213
testFixturesImplementation(testFixtures(project(":spring-core")))
13-
testFixturesImplementation("com.google.code.findbugs:jsr305")
1414
testImplementation(project(":spring-core-test"))
1515
testImplementation(testFixtures(project(":spring-beans")))
1616
testImplementation(testFixtures(project(":spring-core")))

spring-beans/spring-beans.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies {
1111
optional("org.reactivestreams:reactive-streams")
1212
optional("org.yaml:snakeyaml")
1313
testFixturesApi("org.junit.jupiter:junit-jupiter-api")
14-
testFixturesImplementation("com.google.code.findbugs:jsr305")
1514
testFixturesImplementation("org.assertj:assertj-core")
1615
testImplementation(project(":spring-core-test"))
1716
testImplementation(testFixtures(project(":spring-core")))

spring-context/spring-context.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ dependencies {
3333
optional("org.reactivestreams:reactive-streams")
3434
testFixturesApi("org.junit.jupiter:junit-jupiter-api")
3535
testFixturesImplementation(testFixtures(project(":spring-beans")))
36-
testFixturesImplementation("com.google.code.findbugs:jsr305")
3736
testFixturesImplementation("io.projectreactor:reactor-test")
3837
testFixturesImplementation("org.assertj:assertj-core")
3938
testImplementation(project(":spring-core-test"))

spring-core/spring-core.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ dependencies {
7272
api(files(objenesisRepackJar))
7373
api("commons-logging:commons-logging")
7474
api("org.jspecify:jspecify")
75+
compileOnly("com.google.code.findbugs:jsr305")
7576
compileOnly("io.projectreactor.tools:blockhound")
7677
compileOnly("org.graalvm.sdk:graal-sdk")
7778
optional("io.micrometer:context-propagation")
@@ -87,7 +88,6 @@ dependencies {
8788
optional("org.jetbrains.kotlin:kotlin-stdlib")
8889
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
8990
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
90-
testFixturesImplementation("com.google.code.findbugs:jsr305")
9191
testFixturesImplementation("io.projectreactor:reactor-test")
9292
testFixturesImplementation("org.assertj:assertj-core")
9393
testFixturesImplementation("org.junit.platform:junit-platform-launcher")

0 commit comments

Comments
 (0)