Merge branch '6.0.x'

# Conflicts:
#	framework-docs/modules/ROOT/pages/data-access/jdbc/core.adoc

framework-platform/framework-platform.gradle

@@ -24,14 +24,14 @@ dependencies {
 	constraints {
 		api("com.fasterxml:aalto-xml:1.3.2")
 		api("com.fasterxml.woodstox:woodstox-core:6.5.1")
-		api("com.github.ben-manes.caffeine:caffeine:3.1.6")
+		api("com.github.ben-manes.caffeine:caffeine:3.1.7")
 		api("com.github.librepdf:openpdf:1.3.30")
 		api("com.google.code.findbugs:findbugs:3.0.1")
 		api("com.google.code.findbugs:jsr305:3.0.2")
 		api("com.google.code.gson:gson:2.10.1")
 		api("com.google.protobuf:protobuf-java-util:3.23.2")
 		api("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
-		api("com.h2database:h2:2.1.214")
+		api("com.h2database:h2:2.2.220")
 		api("com.jayway.jsonpath:json-path:2.8.0")
 		api("com.rometools:rome:1.19.0")
 		api("com.squareup.okhttp3:mockwebserver:3.14.9")

spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java

@@ -163,8 +163,7 @@ final class DefaultDatabaseClient implements DatabaseClient {
 	/**
 	 * Release the {@link Connection}.
 	 * @param connection to close.
-	 * @return a {@link Publisher} that completes successfully when the connection is
-	 * closed
+	 * @return a {@link Publisher} that completes successfully when the connection is closed
 	 */
 	private Publisher<Void> closeConnection(Connection connection) {
 		return ConnectionFactoryUtils.currentConnectionFactory(