Skip to content

Commit f2972d8

Browse files
committed
Merge branch '6.2.x'
# Conflicts: # framework-platform/framework-platform.gradle # spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
2 parents 59804ab + d17601e commit f2972d8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

framework-platform/framework-platform.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
api(platform("tools.jackson:jackson-bom:3.0.0-rc9"))
2525

2626
constraints {
27-
api("com.fasterxml:aalto-xml:1.3.2")
27+
api("com.fasterxml:aalto-xml:1.3.3")
2828
api("com.fasterxml.woodstox:woodstox-core:6.7.0")
2929
api("com.github.ben-manes.caffeine:caffeine:3.2.2")
3030
api("com.github.librepdf:openpdf:1.3.43")
@@ -52,7 +52,7 @@ dependencies {
5252
api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
5353
api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE")
5454
api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
55-
api("io.reactivex.rxjava3:rxjava:3.1.10")
55+
api("io.reactivex.rxjava3:rxjava:3.1.11")
5656
api("io.smallrye.reactive:mutiny:1.10.0")
5757
api("io.vavr:vavr:0.10.4")
5858
api("jakarta.activation:jakarta.activation-api:2.1.3")

0 commit comments

Comments
 (0)