From 2fa419532662a60110d2154439ed0a09234c7c96 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 09:30:53 +0200 Subject: [PATCH 01/24] Upgrade to Dropwizard Metrics 4.2.12 Closes gh-32305 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 958b1a2fbcf..82b2dd7658c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -258,7 +258,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.11") { + library("Dropwizard Metrics", "4.2.12") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 7de6d72346a2a05d7dd6dceb844f65c0082ca2c0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 09:30:56 +0200 Subject: [PATCH 02/24] Upgrade to Hibernate 5.6.11.Final Closes gh-32306 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 82b2dd7658c..8af124f2258 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -426,7 +426,7 @@ bom { ] } } - library("Hibernate", "5.6.10.Final") { + library("Hibernate", "5.6.11.Final") { prohibit("[6.0.0.Alpha2,)") { because "it uses the jakarta.* namespace" } From 1775fc148c61613feaf71087dcdd116f089b8e8b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 09:30:58 +0200 Subject: [PATCH 03/24] Upgrade to Hibernate Validator 6.2.5.Final Closes gh-32307 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 8af124f2258..2e8d02c759f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -449,7 +449,7 @@ bom { ] } } - library("Hibernate Validator", "6.2.4.Final") { + library("Hibernate Validator", "6.2.5.Final") { prohibit("[7.0.0.Alpha1,)") { because "it uses the jakarta.* namespace" } From b4475e13872f5ede9ca6364ee6765fa354bddc52 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 09:31:01 +0200 Subject: [PATCH 04/24] Upgrade to Jackson Bom 2.13.4 Closes gh-32308 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2e8d02c759f..2ff3e948f90 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -553,7 +553,7 @@ bom { ] } } - library("Jackson Bom", "2.13.3") { + library("Jackson Bom", "2.13.4") { group("com.fasterxml.jackson") { imports = [ "jackson-bom" From 4848f8db5b615b3d3503f146510c57b9187406dc Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 09:31:03 +0200 Subject: [PATCH 05/24] Upgrade to Janino 3.1.8 Closes gh-32309 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2ff3e948f90..24530246892 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -732,7 +732,7 @@ bom { ] } } - library("Janino", "3.1.7") { + library("Janino", "3.1.8") { group("org.codehaus.janino") { modules = [ "commons-compiler", From 3d21fcb3815382c833fc0d6c778159ff9c9373ae Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 09:31:05 +0200 Subject: [PATCH 06/24] Upgrade to Johnzon 1.2.19 Closes gh-32310 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 24530246892..4d33013a16f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -932,7 +932,7 @@ bom { ] } } - library("Johnzon", "1.2.18") { + library("Johnzon", "1.2.19") { group("org.apache.johnzon") { modules = [ "johnzon-core", From a3465ced28d3363ec8c73f07fd5ea3abd926cb3f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 09:31:08 +0200 Subject: [PATCH 07/24] Upgrade to Kafka 3.0.2 Closes gh-32311 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 4d33013a16f..98810bdb806 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1021,7 +1021,7 @@ bom { ] } } - library("Kafka", "3.0.1") { + library("Kafka", "3.0.2") { group("org.apache.kafka") { modules = [ "connect", From c216e1e4a45d3f5b0541f71689f32592ace27d04 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 09:31:10 +0200 Subject: [PATCH 08/24] Upgrade to Netty 4.1.82.Final Closes gh-32312 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 98810bdb806..1c6d5ef9247 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1322,7 +1322,7 @@ bom { ] } } - library("Netty", "4.1.79.Final") { + library("Netty", "4.1.82.Final") { group("io.netty") { imports = [ "netty-bom" From 89491c3aaa9e1e312cbd353df9d6ed0dcdc8ff36 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:15 +0200 Subject: [PATCH 09/24] Upgrade to Byte Buddy 1.12.16 Closes gh-32314 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index c5409ab82e0..22507544f2d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -152,7 +152,7 @@ bom { ] } } - library("Byte Buddy", "1.12.13") { + library("Byte Buddy", "1.12.16") { group("net.bytebuddy") { modules = [ "byte-buddy", From c9067cd6a8bfe5b7a7f93b17b24701f9c55ef2c6 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:18 +0200 Subject: [PATCH 10/24] Upgrade to Couchbase Client 3.3.4 Closes gh-32315 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 22507544f2d..4c88a91817a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -241,7 +241,7 @@ bom { ] } } - library("Couchbase Client", "3.3.3") { + library("Couchbase Client", "3.3.4") { group("com.couchbase.client") { modules = [ "java-client" From a32bf83f6008102f82d94a03b5e5921033fefea8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:20 +0200 Subject: [PATCH 11/24] Upgrade to Dropwizard Metrics 4.2.12 Closes gh-32316 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 4c88a91817a..f7ce0e37e94 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -276,7 +276,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.11") { + library("Dropwizard Metrics", "4.2.12") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From a111f66e76be66401c76407e76015cab2bce84f4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:22 +0200 Subject: [PATCH 12/24] Upgrade to Ehcache3 3.10.1 Closes gh-32317 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index f7ce0e37e94..15c31c2b15e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -290,7 +290,7 @@ bom { ] } } - library("Ehcache3", "3.10.0") { + library("Ehcache3", "3.10.1") { group("org.ehcache") { modules = [ "ehcache", From 07985e34fbb511dd6ee41910a75445979be27364 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:25 +0200 Subject: [PATCH 13/24] Upgrade to Elasticsearch 7.17.6 Closes gh-32318 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 15c31c2b15e..8f08d27624a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -299,7 +299,7 @@ bom { ] } } - library("Elasticsearch", "7.17.4") { + library("Elasticsearch", "7.17.6") { group("org.elasticsearch") { modules = [ "elasticsearch" From a00951d6730480861b7ae854bf771a6dbc64bf72 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:27 +0200 Subject: [PATCH 14/24] Upgrade to Embedded Mongo 3.4.9 Closes gh-32319 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 8f08d27624a..c1416e57095 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -330,7 +330,7 @@ bom { ] } } - library("Embedded Mongo", "3.4.8") { + library("Embedded Mongo", "3.4.9") { group("de.flapdoodle.embed") { modules = [ "de.flapdoodle.embed.mongo" From 1c41032d664a9b5da63c4e70a5c681e0787441e8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:29 +0200 Subject: [PATCH 15/24] Upgrade to Hibernate 5.6.11.Final Closes gh-32320 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index c1416e57095..719f36a6134 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -457,7 +457,7 @@ bom { ] } } - library("Hibernate", "5.6.10.Final") { + library("Hibernate", "5.6.11.Final") { prohibit("[6.0.0.Alpha2,)") { because "it uses the jakarta.* namespace" } From c5b2bacfd36bfbe8e17ca91cbd39296d1bfc952e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:32 +0200 Subject: [PATCH 16/24] Upgrade to Hibernate Validator 6.2.5.Final Closes gh-32321 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 719f36a6134..2f8edb1daa2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -480,7 +480,7 @@ bom { ] } } - library("Hibernate Validator", "6.2.4.Final") { + library("Hibernate Validator", "6.2.5.Final") { prohibit("[7.0.0.Alpha1,)") { because "it uses the jakarta.* namespace" } From 051331beb98003412929a0a4992511a8fb40a10a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:34 +0200 Subject: [PATCH 17/24] Upgrade to Infinispan 13.0.11.Final Closes gh-32322 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2f8edb1daa2..c8dbbbaca13 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -570,7 +570,7 @@ bom { ] } } - library("Infinispan", "13.0.10.Final") { + library("Infinispan", "13.0.11.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From 7cff955030c1b56d45cec678d42708c312364ed4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:37 +0200 Subject: [PATCH 18/24] Upgrade to Jackson Bom 2.13.4 Closes gh-32323 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index c8dbbbaca13..375660d09dd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -584,7 +584,7 @@ bom { ] } } - library("Jackson Bom", "2.13.3") { + library("Jackson Bom", "2.13.4") { group("com.fasterxml.jackson") { imports = [ "jackson-bom" From d525d36fb94d198b8eaf8c4b593e979eaae1632a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:39 +0200 Subject: [PATCH 19/24] Upgrade to Janino 3.1.8 Closes gh-32324 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 375660d09dd..7b50773396a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -763,7 +763,7 @@ bom { ] } } - library("Janino", "3.1.7") { + library("Janino", "3.1.8") { group("org.codehaus.janino") { modules = [ "commons-compiler", From 7e8c560e9b2b5bf5cbe755f86102fff7fd3d5ef0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:42 +0200 Subject: [PATCH 20/24] Upgrade to Johnzon 1.2.19 Closes gh-32325 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 7b50773396a..c0637a77244 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -963,7 +963,7 @@ bom { ] } } - library("Johnzon", "1.2.18") { + library("Johnzon", "1.2.19") { group("org.apache.johnzon") { modules = [ "johnzon-core", From 8621e63aefb91591d7d9402f7b97ea79990955ed Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:44 +0200 Subject: [PATCH 21/24] Upgrade to Kafka 3.1.2 Closes gh-32326 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index c0637a77244..5abf84290f0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1052,7 +1052,7 @@ bom { ] } } - library("Kafka", "3.1.1") { + library("Kafka", "3.1.2") { group("org.apache.kafka") { modules = [ "connect", From 24ab4e88cdc68467d1bf6c97070c16891ad31c74 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:46 +0200 Subject: [PATCH 22/24] Upgrade to Netty 4.1.82.Final Closes gh-32327 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5abf84290f0..9984af97068 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1344,7 +1344,7 @@ bom { ] } } - library("Netty", "4.1.79.Final") { + library("Netty", "4.1.82.Final") { group("io.netty") { imports = [ "netty-bom" From d4a88041dc5a8295503135d94120388ddf86e038 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:49 +0200 Subject: [PATCH 23/24] Upgrade to R2DBC Bom Borca-SR2 Closes gh-32328 --- .../autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java | 2 +- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../springframework/boot/r2dbc/ConnectionFactoryBuilder.java | 4 ++++ .../boot/r2dbc/ConnectionFactoryBuilderTests.java | 5 +++++ 4 files changed, 11 insertions(+), 2 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 2f4f7d3093d..7a092d4b9b6 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 9984af97068..a87d64ddf8f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1407,7 +1407,7 @@ bom { ] } } - library("R2DBC Bom", "Borca-SR1") { + library("R2DBC Bom", "Borca-SR2") { group("io.r2dbc") { imports = [ "r2dbc-bom" diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java index 04d583391a8..716839a4447 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java @@ -244,6 +244,10 @@ public final class ConnectionFactoryBuilder { .to(builder::maxIdleTime); map.from(options.getValue(PoolingConnectionFactoryProvider.MAX_CREATE_CONNECTION_TIME)).as(this::toDuration) .to(builder::maxCreateConnectionTime); + map.from(options.getValue(PoolingConnectionFactoryProvider.MAX_VALIDATION_TIME)).as(this::toDuration) + .to(builder::maxValidationTime); + map.from(options.getValue(PoolingConnectionFactoryProvider.MIN_IDLE)).as(this::toInteger) + .to(builder::minIdle); map.from(options.getValue(PoolingConnectionFactoryProvider.POOL_NAME)).as(this::toString).to(builder::name); map.from(options.getValue(PoolingConnectionFactoryProvider.PRE_RELEASE)).to((function) -> builder .preRelease((Function>) function)); 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 a6201529a45..ad78dc731e0 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,11 @@ class ConnectionFactoryBuilderTests { MAX_CREATE_CONNECTION_TIME(PoolingConnectionFactoryProvider.MAX_CREATE_CONNECTION_TIME, Duration.ofSeconds(10), "maxCreateConnectionTime"), + MAX_VALIDATION_TIME(PoolingConnectionFactoryProvider.MAX_VALIDATION_TIME, Duration.ofMinutes(4), + "maxValidationTime"), + + MIN_IDLE(PoolingConnectionFactoryProvider.MIN_IDLE, 5, "minIdle"), + POOL_NAME(PoolingConnectionFactoryProvider.POOL_NAME, "testPool", "name"), POST_ALLOCATE(PoolingConnectionFactoryProvider.POST_ALLOCATE, mock(Function.class), "postAllocate"), From cdac50a1c987f9077c69a301af80c77012e7c444 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Sep 2022 10:32:51 +0200 Subject: [PATCH 24/24] Upgrade to UnboundID LDAPSDK 6.0.6 Closes gh-32329 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a87d64ddf8f..cdad7f2d79c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1878,7 +1878,7 @@ bom { ] } } - library("UnboundID LDAPSDK", "6.0.5") { + library("UnboundID LDAPSDK", "6.0.6") { group("com.unboundid") { modules = [ "unboundid-ldapsdk"