Merge branch '5.3.x'

This commit is contained in:
Sam Brannen 2022-01-07 15:55:18 +01:00
commit e1991f981a
2 changed files with 4 additions and 1 deletions

View File

@ -86,7 +86,7 @@ configure(allprojects) { project ->
dependency "org.ogce:xpp3:1.1.6"
dependency "org.yaml:snakeyaml:1.30"
dependency "com.h2database:h2:1.4.200"
dependency "com.h2database:h2:2.0.206"
dependency "com.github.ben-manes.caffeine:caffeine:3.0.5"
dependency "com.github.librepdf:openpdf:1.3.26"
dependency "com.rometools:rome:1.16.0"

View File

@ -17,6 +17,9 @@ dependencies {
testImplementation(testFixtures(project(":spring-context")))
testImplementation("io.projectreactor:reactor-test")
testImplementation("io.r2dbc:r2dbc-h2")
testImplementation("com.h2database:h2:1.4.200") {
because("r2dbc-h2 does not yet support H2 2.0")
}
testImplementation("io.r2dbc:r2dbc-spi-test:0.8.1.RELEASE") {
exclude group: "org.springframework", module: "spring-jdbc"
}