Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-beans/spring-beans.gradle
#	spring-context/spring-context.gradle
#	spring-orm/spring-orm.gradle
#	spring-test/spring-test.gradle
#	spring-web/spring-web.gradle
#	spring-webflux/spring-webflux.gradle
This commit is contained in:
Juergen Hoeller
2023-08-02 01:04:31 +02:00
parent b9ae996dfc d250a5155a
commit 3b1af692cc
20 changed files with 178 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-tx/spring-tx.gradle
View File

@@ -7,12 +7,12 @@ dependencies {
api(project(":spring-core"))
optional(project(":spring-aop"))
optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
optional("io.projectreactor:reactor-core")
optional("io.vavr:vavr")
optional("jakarta.ejb:jakarta.ejb-api")
optional("jakarta.interceptor:jakarta.interceptor-api")
optional("jakarta.resource:jakarta.resource-api")
optional("jakarta.transaction:jakarta.transaction-api")
optional("io.projectreactor:reactor-core")
optional("io.vavr:vavr")
optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
@@ -21,8 +21,8 @@ dependencies {
testImplementation(testFixtures(project(":spring-beans")))
testImplementation(testFixtures(project(":spring-context")))
testImplementation(testFixtures(project(":spring-core")))
testImplementation("org.aspectj:aspectjweaver")
testImplementation("org.apache.groovy:groovy")
testImplementation("jakarta.persistence:jakarta.persistence-api")
testImplementation("org.aspectj:aspectjweaver")
testImplementation("io.projectreactor:reactor-test")
testImplementation("jakarta.persistence:jakarta.persistence-api")
}