Merge branch '2.7.x' into 3.0.x

Closes gh-36740

Author: snicoll

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -813,7 +813,7 @@ bom {
 			]
 		}
 	}
-	library("MariaDB", "3.0.10") {
+	library("MariaDB", "3.1.4") {
 		group("org.mariadb.jdbc") {
 			modules = [
 				"mariadb-java-client"