Skip to content

Commit 1747c81

Browse files
committed
Merge pull request #32747 from hpoettker
* gh-32747: Upgrade MySQL Connector/J and use new Maven identifiers Closes gh-32747
2 parents a182cc6 + 4ed072a commit 1747c81

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,13 @@ dependencies {
224224
testImplementation("com.github.h-thurow:simple-jndi")
225225
testImplementation("com.ibm.db2:jcc")
226226
testImplementation("com.jayway.jsonpath:json-path")
227+
testImplementation("com.mysql:mysql-connector-j")
227228
testImplementation("com.squareup.okhttp3:mockwebserver")
228229
testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
229230
testImplementation("io.projectreactor:reactor-test")
230231
testImplementation("io.r2dbc:r2dbc-h2")
231232
testImplementation("jakarta.json:jakarta.json-api")
232233
testImplementation("jakarta.xml.ws:jakarta.xml.ws-api")
233-
testImplementation("mysql:mysql-connector-java")
234234
testImplementation("org.apache.johnzon:johnzon-jsonb")
235235
testImplementation("org.apache.logging.log4j:log4j-to-slf4j")
236236
testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,14 @@ bom {
12991299
]
13001300
}
13011301
}
1302-
library("MySQL", "8.0.30") {
1302+
library("MySQL", "8.0.31") {
1303+
group("com.mysql") {
1304+
modules = [
1305+
"mysql-connector-j" {
1306+
exclude group: "com.google.protobuf", module: "protobuf-java"
1307+
}
1308+
]
1309+
}
13031310
group("mysql") {
13041311
modules = [
13051312
"mysql-connector-java" {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ dependencies {
113113
testImplementation("com.ibm.db2:jcc")
114114
testImplementation("com.jayway.jsonpath:json-path")
115115
testImplementation("com.microsoft.sqlserver:mssql-jdbc")
116+
testImplementation("com.mysql:mysql-connector-j")
116117
testImplementation("com.squareup.okhttp3:okhttp")
117118
testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
118119
testImplementation("io.projectreactor:reactor-test")
119120
testImplementation("io.r2dbc:r2dbc-h2")
120121
testImplementation("jakarta.inject:jakarta.inject-api")
121122
testImplementation("jakarta.persistence:jakarta.persistence-api")
122123
testImplementation("jakarta.xml.ws:jakarta.xml.ws-api")
123-
testImplementation("mysql:mysql-connector-java")
124124
testImplementation("net.sourceforge.jtds:jtds")
125125
testImplementation("org.apache.derby:derby")
126126
testImplementation("org.awaitility:awaitility")

0 commit comments

Comments
 (0)