mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '2.6.x' into 2.7.x
Closes gh-32781
This commit is contained in:
commit
a19e394ebb
@ -231,6 +231,7 @@ 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")
|
||||
@ -238,7 +239,6 @@ dependencies {
|
||||
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")
|
||||
|
@ -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" {
|
||||
|
@ -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")
|
||||
|
Loading…
Reference in New Issue
Block a user