From 54bdab4553138a5617da34296a48d07b97434a34 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 7 Jan 2022 15:50:44 +0100 Subject: [PATCH] Partially upgrade to H2 database 2.0.206 Commit ed4e2289cd introduced support for H2 2.0.x but did not upgrade the H2 dependency. This commit upgrades the H2 dependency to version 2.0.206 but also adds an explicit test dependency on version 1.4.200 in spring-r2dbc, since r2dbc-h2 does not yet support H2 2.0.x. Once https://github.com/r2dbc/r2dbc-h2/pull/204 has been included in a released version of r2dbc-h2 we will be able to upgrade spring-r2dbc's test dependency on the H2 database to 2.0.x as well. See gh-27870 See gh-27902 --- build.gradle | 2 +- spring-r2dbc/spring-r2dbc.gradle | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1e3da6be106..743f3d22876 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,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:2.9.3" dependency "com.github.librepdf:openpdf:1.3.26" dependency "com.rometools:rome:1.16.0" diff --git a/spring-r2dbc/spring-r2dbc.gradle b/spring-r2dbc/spring-r2dbc.gradle index dfb6b1ece9d..eb86b43f517 100644 --- a/spring-r2dbc/spring-r2dbc.gradle +++ b/spring-r2dbc/spring-r2dbc.gradle @@ -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" }