root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Refine jsr305 dependency management 

See gh-28797
This commit is contained in:
Sébastien Deleuze 2024-12-26 14:13:17 +01:00
parent 92f1f55957
commit 185537d469
5 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -80,9 +80,6 @@ configure([rootProject] + javaProjects) { project ->
testRuntimeOnly("org.junit.platform:junit-platform-launcher") testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testRuntimeOnly("org.junit.platform:junit-platform-suite-engine") testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
testRuntimeOnly("org.apache.logging.log4j:log4j-core") 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 = [ ext.javadocLinks = [

2
spring-aop/spring-aop.gradle
View File

@ -5,12 +5,12 @@ apply plugin: "kotlin"
dependencies { dependencies {
api(project(":spring-beans")) api(project(":spring-beans"))
api(project(":spring-core")) api(project(":spring-core"))
compileOnly("com.google.code.findbugs:jsr305") // for the AOP Alliance fork
optional("org.apache.commons:commons-pool2") optional("org.apache.commons:commons-pool2")
optional("org.aspectj:aspectjweaver") optional("org.aspectj:aspectjweaver")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
testFixturesImplementation(testFixtures(project(":spring-beans"))) testFixturesImplementation(testFixtures(project(":spring-beans")))
testFixturesImplementation(testFixtures(project(":spring-core"))) testFixturesImplementation(testFixtures(project(":spring-core")))
testFixturesImplementation("com.google.code.findbugs:jsr305")
testImplementation(project(":spring-core-test")) testImplementation(project(":spring-core-test"))
testImplementation(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testImplementation(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))

1
spring-beans/spring-beans.gradle
View File

@ -11,7 +11,6 @@ dependencies {
optional("org.reactivestreams:reactive-streams") optional("org.reactivestreams:reactive-streams")
optional("org.yaml:snakeyaml") optional("org.yaml:snakeyaml")
testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesApi("org.junit.jupiter:junit-jupiter-api")
testFixturesImplementation("com.google.code.findbugs:jsr305")
testFixturesImplementation("org.assertj:assertj-core") testFixturesImplementation("org.assertj:assertj-core")
testImplementation(project(":spring-core-test")) testImplementation(project(":spring-core-test"))
testImplementation(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))

1
spring-context/spring-context.gradle
View File

@ -33,7 +33,6 @@ dependencies {
optional("org.reactivestreams:reactive-streams") optional("org.reactivestreams:reactive-streams")
testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesApi("org.junit.jupiter:junit-jupiter-api")
testFixturesImplementation(testFixtures(project(":spring-beans"))) testFixturesImplementation(testFixtures(project(":spring-beans")))
testFixturesImplementation("com.google.code.findbugs:jsr305")
testFixturesImplementation("io.projectreactor:reactor-test") testFixturesImplementation("io.projectreactor:reactor-test")
testFixturesImplementation("org.assertj:assertj-core") testFixturesImplementation("org.assertj:assertj-core")
testImplementation(project(":spring-core-test")) testImplementation(project(":spring-core-test"))

2
spring-core/spring-core.gradle
View File

@ -72,6 +72,7 @@ dependencies {
api(files(objenesisRepackJar)) api(files(objenesisRepackJar))
api("commons-logging:commons-logging") api("commons-logging:commons-logging")
api("org.jspecify:jspecify") api("org.jspecify:jspecify")
compileOnly("com.google.code.findbugs:jsr305")
compileOnly("io.projectreactor.tools:blockhound") compileOnly("io.projectreactor.tools:blockhound")
compileOnly("org.graalvm.sdk:graal-sdk") compileOnly("org.graalvm.sdk:graal-sdk")
optional("io.micrometer:context-propagation") optional("io.micrometer:context-propagation")
@ -87,7 +88,6 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
testFixturesImplementation("com.google.code.findbugs:jsr305")
testFixturesImplementation("io.projectreactor:reactor-test") testFixturesImplementation("io.projectreactor:reactor-test")
testFixturesImplementation("org.assertj:assertj-core") testFixturesImplementation("org.assertj:assertj-core")
testFixturesImplementation("org.junit.platform:junit-platform-launcher") testFixturesImplementation("org.junit.platform:junit-platform-launcher")