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' 

# Conflicts:
#	framework-platform/framework-platform.gradle
#	spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
This commit is contained in:
Juergen Hoeller 2025-09-10 18:39:50 +02:00
parent 59804ab396 d17601e01c
commit f2972d8b38
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework-platform/framework-platform.gradle
View File

@ -24,7 +24,7 @@ dependencies {
api(platform("tools.jackson:jackson-bom:3.0.0-rc9")) api(platform("tools.jackson:jackson-bom:3.0.0-rc9"))
constraints { constraints {
api("com.fasterxml:aalto-xml:1.3.2") api("com.fasterxml:aalto-xml:1.3.3")
api("com.fasterxml.woodstox:woodstox-core:6.7.0") api("com.fasterxml.woodstox:woodstox-core:6.7.0")
api("com.github.ben-manes.caffeine:caffeine:3.2.2") api("com.github.ben-manes.caffeine:caffeine:3.2.2")
api("com.github.librepdf:openpdf:1.3.43") api("com.github.librepdf:openpdf:1.3.43")
@ -52,7 +52,7 @@ dependencies {
api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE") api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE") api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE")
api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE") api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
api("io.reactivex.rxjava3:rxjava:3.1.10") api("io.reactivex.rxjava3:rxjava:3.1.11")
api("io.smallrye.reactive:mutiny:1.10.0") api("io.smallrye.reactive:mutiny:1.10.0")
api("io.vavr:vavr:0.10.4") api("io.vavr:vavr:0.10.4")
api("jakarta.activation:jakarta.activation-api:2.1.3") api("jakarta.activation:jakarta.activation-api:2.1.3")