Skip to content

Commit

Permalink
Merge pull request #32747 from hpoettker
Browse files Browse the repository at this point in the history
* gh-32747:
  Upgrade MySQL Connector/J and use new Maven identifiers

Closes gh-32747
  • Loading branch information
wilkinsona committed Oct 19, 2022
2 parents a182cc6 + 4ed072a commit 1747c81
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion spring-boot-project/spring-boot-autoconfigure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 8 additions & 1 deletion spring-boot-project/spring-boot-dependencies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-project/spring-boot/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 1747c81

Please sign in to comment.