Merge branch '2.5.x' into 2.6.x

Closes gh-29008
This commit is contained in:
Stephane Nicoll 2021-12-14 09:50:30 +01:00
commit 91593eeea3

View File

@ -26,7 +26,7 @@ dependencies {
implementation("org.springframework:spring-web:5.2.2.RELEASE")
implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
testImplementation("org.assertj:assertj-core:3.11.1")
testImplementation("org.apache.logging.log4j:log4j-core:2.12.1")
testImplementation("org.apache.logging.log4j:log4j-core:2.15.0")
testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}