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

Merge branch '2.4.x' into 2.5.x

Browse Source 
Closes gh-28661
This commit is contained in:
Andy Wilkinson
2021-11-12 20:31:25 +00:00
parent ef02db9ed1 2cec3971d7
commit 5e4a502b2d
42 changed files with 455 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle
View File

@@ -8,8 +8,10 @@ description = "Spring Boot Testing Support"
dependencies {
api(platform(project(path: ":spring-boot-project:spring-boot-parent")))
compileOnly("com.datastax.oss:java-driver-core")
compileOnly("javax.servlet:javax.servlet-api")
compileOnly("com.datastax.oss:java-driver-core") {
exclude(group: "org.slf4j", module: "jcl-over-slf4j")
}
compileOnly("jakarta.servlet:jakarta.servlet-api")
compileOnly("junit:junit")
compileOnly("org.elasticsearch:elasticsearch")
compileOnly("org.junit.jupiter:junit-jupiter")
@@ -21,9 +23,12 @@ dependencies {
compileOnly("org.testcontainers:cassandra")
compileOnly("org.testcontainers:testcontainers")
implementation("jakarta.inject:jakarta.inject-api")
implementation("org.apache.maven.resolver:maven-resolver-connector-basic")
implementation("org.apache.maven.resolver:maven-resolver-impl")
implementation("org.apache.maven:maven-resolver-provider")
implementation("org.apache.maven:maven-resolver-provider") {
exclude(group: "javax.inject", module: "javax.inject")
}
implementation("org.apache.maven.resolver:maven-resolver-transport-http") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
@@ -33,7 +38,7 @@ dependencies {
implementation("org.springframework:spring-core")
implementation("org.springframework:spring-test")
testImplementation("javax.servlet:javax.servlet-api")
testImplementation("jakarta.servlet:jakarta.servlet-api")
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.springframework:spring-context")