Skip to content

Commit

Permalink
Refine jsr305 dependency management
Browse files Browse the repository at this point in the history
  • Loading branch information
sdeleuze committed Dec 26, 2024
1 parent 92f1f55 commit 185537d
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 7 deletions.
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ configure([rootProject] + javaProjects) { project ->
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
testRuntimeOnly("org.apache.logging.log4j:log4j-core")
// JSR-305 only used for non-required meta-annotations
compileOnly("com.google.code.findbugs:jsr305")
testCompileOnly("com.google.code.findbugs:jsr305")
}

ext.javadocLinks = [
Expand Down
2 changes: 1 addition & 1 deletion spring-aop/spring-aop.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ apply plugin: "kotlin"
dependencies {
api(project(":spring-beans"))
api(project(":spring-core"))
compileOnly("com.google.code.findbugs:jsr305") // for the AOP Alliance fork
optional("org.apache.commons:commons-pool2")
optional("org.aspectj:aspectjweaver")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
testFixturesImplementation(testFixtures(project(":spring-beans")))
testFixturesImplementation(testFixtures(project(":spring-core")))
testFixturesImplementation("com.google.code.findbugs:jsr305")
testImplementation(project(":spring-core-test"))
testImplementation(testFixtures(project(":spring-beans")))
testImplementation(testFixtures(project(":spring-core")))
Expand Down
1 change: 0 additions & 1 deletion spring-beans/spring-beans.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies {
optional("org.reactivestreams:reactive-streams")
optional("org.yaml:snakeyaml")
testFixturesApi("org.junit.jupiter:junit-jupiter-api")
testFixturesImplementation("com.google.code.findbugs:jsr305")
testFixturesImplementation("org.assertj:assertj-core")
testImplementation(project(":spring-core-test"))
testImplementation(testFixtures(project(":spring-core")))
Expand Down
1 change: 0 additions & 1 deletion spring-context/spring-context.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ dependencies {
optional("org.reactivestreams:reactive-streams")
testFixturesApi("org.junit.jupiter:junit-jupiter-api")
testFixturesImplementation(testFixtures(project(":spring-beans")))
testFixturesImplementation("com.google.code.findbugs:jsr305")
testFixturesImplementation("io.projectreactor:reactor-test")
testFixturesImplementation("org.assertj:assertj-core")
testImplementation(project(":spring-core-test"))
Expand Down
2 changes: 1 addition & 1 deletion spring-core/spring-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ dependencies {
api(files(objenesisRepackJar))
api("commons-logging:commons-logging")
api("org.jspecify:jspecify")
compileOnly("com.google.code.findbugs:jsr305")
compileOnly("io.projectreactor.tools:blockhound")
compileOnly("org.graalvm.sdk:graal-sdk")
optional("io.micrometer:context-propagation")
Expand All @@ -87,7 +88,6 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
testFixturesImplementation("com.google.code.findbugs:jsr305")
testFixturesImplementation("io.projectreactor:reactor-test")
testFixturesImplementation("org.assertj:assertj-core")
testFixturesImplementation("org.junit.platform:junit-platform-launcher")
Expand Down

0 comments on commit 185537d

Please sign in to comment.