From 88ee31c42246b6e9ecd2cdd0ac18faf0491f8ec3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 13 Jul 2022 12:09:02 +0100 Subject: [PATCH] Upgrade to R2DBC 1.0 With the 1.0 release of the SPI, R2DBC's bom is no longer published. This commit updates Spring Boot's dependency management to no longer use the bom. Tests have also been updated to adapt to slight changes in R2DBC's configuration options and their default values. Closes gh-31702 --- .../r2dbc/R2dbcAutoConfigurationTests.java | 2 +- .../spring-boot-dependencies/build.gradle | 41 +++++++++++++++++-- .../r2dbc/ConnectionFactoryBuilderTests.java | 2 + 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java index dfb88fa49e..b26b3d4fb7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java @@ -93,7 +93,7 @@ class R2dbcAutoConfigurationTests { assertThat(context).hasSingleBean(ConnectionFactory.class).hasSingleBean(ConnectionPool.class) .hasSingleBean(R2dbcProperties.class); ConnectionPool connectionPool = context.getBean(ConnectionPool.class); - assertThat(connectionPool).hasFieldOrPropertyWithValue("maxAcquireTime", Duration.ofNanos(-1)); + assertThat(connectionPool).hasFieldOrPropertyWithValue("maxAcquireTime", Duration.ofMillis(-1)); }); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index e4662e6ffc..221f6d217a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1122,6 +1122,13 @@ bom { ] } } + library("Oracle R2DBC", "1.0.0") { + group("com.oracle.database.r2dbc") { + modules = [ + "oracle-r2dbc" + ] + } + } library("Pooled JMS", "3.0.0") { group("org.messaginghub") { modules = [ @@ -1161,10 +1168,38 @@ bom { ] } } - library("R2DBC Bom", "Borca-SR1") { + library("R2DBC H2", "1.0.0.RC1") { group("io.r2dbc") { - imports = [ - "r2dbc-bom" + modules = [ + "r2dbc-h2" + ] + } + } + library("R2DBC Pool", "1.0.0.RC1") { + group("io.r2dbc") { + modules = [ + "r2dbc-pool" + ] + } + } + library("R2DBC Postgresql", "1.0.0.RC1") { + group("org.postgresql") { + modules = [ + "r2dbc-postgresql" + ] + } + } + library("R2DBC Proxy", "1.0.0.RELEASE") { + group("io.r2dbc") { + modules = [ + "r2dbc-proxy" + ] + } + } + library("R2DBC SPI", "1.0.0.RELEASE") { + group("io.r2dbc") { + modules = [ + "r2dbc-spi" ] } } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilderTests.java index a6201529a4..56638d1e15 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilderTests.java @@ -265,6 +265,8 @@ class ConnectionFactoryBuilderTests { MAX_CREATE_CONNECTION_TIME(PoolingConnectionFactoryProvider.MAX_CREATE_CONNECTION_TIME, Duration.ofSeconds(10), "maxCreateConnectionTime"), + MIN_IDLE(PoolingConnectionFactoryProvider.MIN_IDLE, 0, "minIdle"), + POOL_NAME(PoolingConnectionFactoryProvider.POOL_NAME, "testPool", "name"), POST_ALLOCATE(PoolingConnectionFactoryProvider.POST_ALLOCATE, mock(Function.class), "postAllocate"),