Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
Closes gh-32782
This commit is contained in:
Andy Wilkinson
2022-10-19 10:02:56 +01:00
parent b69cf43ec0 a19e394ebb
commit a87aca2744
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

@@ -214,6 +214,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")
@@ -221,7 +222,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.logging.log4j:log4j-to-slf4j")
testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")
testImplementation("org.assertj:assertj-core")

9
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -1070,7 +1070,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" {

2
spring-boot-project/spring-boot/build.gradle
View File

@@ -106,13 +106,13 @@ 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.xml.ws:jakarta.xml.ws-api")
testImplementation("mysql:mysql-connector-java")
testImplementation("net.sourceforge.jtds:jtds")
testImplementation("org.apache.derby:derby")
testImplementation("org.apache.derby:derbytools")