Merge branch '2.7.x' into 3.0.x

2023-05-12 13:13:58 -07:00
parent fc8abf1fcf 57e45dfb21
commit 92e420a098
13 changed files with 151 additions and 69 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcProperties.java
@@ -138,8 +138,6 @@ public class R2dbcProperties {

 		/**
 		 * Minimal number of idle connections.
-		 *
-		 * @since 2.7.12
 		 */
 		private int minIdle = 0;

@@ -163,8 +161,6 @@ public class R2dbcProperties {
 		/**
 		 * Maximum time to validate a connection from the pool. By default, wait
 		 * indefinitely.
-		 *
-		 * @since 2.7.12
 		 */
 		private Duration maxValidationTime;