Merge branch '2.6.x' into 2.7.x

Closes gh-32781

Author: wilkinsona

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

@@ -231,14 +231,14 @@ dependencies {
 	testImplementation("com.github.h-thurow:simple-jndi")
 	testImplementation("com.ibm.db2:jcc")
 	testImplementation("com.jayway.jsonpath:json-path")
+	testImplementation("com.mysql:mysql-connector-j")
 	testImplementation("com.querydsl:querydsl-core")
 	testImplementation("com.squareup.okhttp3:mockwebserver")
 	testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.r2dbc:r2dbc-h2")
 	testImplementation("jakarta.json:jakarta.json-api")
 	testImplementation("jakarta.xml.ws:jakarta.xml.ws-api")
-	testImplementation("mysql:mysql-connector-java")
 	testImplementation("org.apache.johnzon:johnzon-jsonb")
 	testImplementation("org.apache.logging.log4j:log4j-to-slf4j")
 	testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")

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

@@ -1321,7 +1321,14 @@ bom {
 			]
 		}
 	}
-	library("MySQL", "8.0.30") {
+	library("MySQL", "8.0.31") {
+		group("com.mysql") {
+			modules = [
+				"mysql-connector-j" {
+					exclude group: "com.google.protobuf", module: "protobuf-java"
+				}
+			]
+		}
 		group("mysql") {
 			modules = [
 				"mysql-connector-java" {

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

@@ -113,14 +113,14 @@ dependencies {
 	testImplementation("com.ibm.db2:jcc")
 	testImplementation("com.jayway.jsonpath:json-path")
 	testImplementation("com.microsoft.sqlserver:mssql-jdbc")
+	testImplementation("com.mysql:mysql-connector-j")
 	testImplementation("com.squareup.okhttp3:okhttp")
 	testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.r2dbc:r2dbc-h2")
 	testImplementation("jakarta.inject:jakarta.inject-api")
 	testImplementation("jakarta.persistence:jakarta.persistence-api")
 	testImplementation("jakarta.xml.ws:jakarta.xml.ws-api")
-	testImplementation("mysql:mysql-connector-java")
 	testImplementation("net.sourceforge.jtds:jtds")
 	testImplementation("org.apache.derby:derby")
 	testImplementation("org.awaitility:awaitility")