From 4ed072a06bdaaa0b745b23a6db816ec7af22999a Mon Sep 17 00:00:00 2001 From: Henning Poettker Date: Mon, 17 Oct 2022 01:09:31 +0200 Subject: [PATCH] Upgrade MySQL Connector/J and use new Maven identifiers See gh-32747 --- .../spring-boot-autoconfigure/build.gradle | 2 +- .../spring-boot-dependencies/build.gradle | 9 ++++++++- spring-boot-project/spring-boot/build.gradle | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index e5e6c67817be..9df315d1aee5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -224,13 +224,13 @@ 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.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") diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 27add70c22f6..0e607eae1211 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1299,7 +1299,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" { diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle index 136dda6bafc5..4adf86dbcc34 100644 --- a/spring-boot-project/spring-boot/build.gradle +++ b/spring-boot-project/spring-boot/build.gradle @@ -113,6 +113,7 @@ 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") @@ -120,7 +121,6 @@ dependencies { 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")