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

Merge branch '6.2.x'

This commit is contained in:
Sam Brannen 2025-03-17 18:13:04 +01:00
parent 8ee09e5766 7a839e988a
commit 30a7f7be28
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework-docs/framework-docs.gradle
View File

@ -52,6 +52,7 @@ dependencies {
api(project(":spring-aspects")) api(project(":spring-aspects"))
api(project(":spring-context")) api(project(":spring-context"))
api(project(":spring-context-support")) api(project(":spring-context-support"))
api(project(":spring-core-test"))
api(project(":spring-jdbc")) api(project(":spring-jdbc"))
api(project(":spring-jms")) api(project(":spring-jms"))
api(project(":spring-test")) api(project(":spring-test"))
@ -74,9 +75,9 @@ dependencies {
api("org.apache.activemq:activemq-ra:6.1.2") api("org.apache.activemq:activemq-ra:6.1.2")
api("org.apache.commons:commons-dbcp2:2.11.0") api("org.apache.commons:commons-dbcp2:2.11.0")
api("org.aspectj:aspectjweaver") api("org.aspectj:aspectjweaver")
api("org.assertj:assertj-core")
api("org.eclipse.jetty.websocket:jetty-websocket-jetty-api") api("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")
api("org.jetbrains.kotlin:kotlin-stdlib") api("org.jetbrains.kotlin:kotlin-stdlib")
api("org.junit.jupiter:junit-jupiter-api")
implementation(project(":spring-core-test"))
implementation("org.assertj:assertj-core")
} }

9
spring-core-test/spring-core-test.gradle
View File

@ -2,11 +2,10 @@ description = "Spring Core Test"
dependencies { dependencies {
api(project(":spring-core")) api(project(":spring-core"))
api("org.assertj:assertj-core") optional("org.assertj:assertj-core")
api("org.junit.jupiter:junit-jupiter-api") optional("org.junit.jupiter:junit-jupiter-api")
compileOnly("org.junit.jupiter:junit-jupiter") compileOnly("org.junit.jupiter:junit-jupiter-params") // Used in CompileWithForkedClassLoaderExtension Javadoc
compileOnly("org.junit.platform:junit-platform-engine") compileOnly("org.junit.platform:junit-platform-launcher") // Used in CompileWithForkedClassLoaderExtension
compileOnly("org.junit.platform:junit-platform-launcher")
implementation("com.thoughtworks.qdox:qdox") implementation("com.thoughtworks.qdox:qdox")
} }