Merge branch '2.5.x'

Closes gh-28662
This commit is contained in:
Andy Wilkinson
2021-11-12 23:40:35 +00:00
43 changed files with 470 additions and 147 deletions

View File

@@ -22,7 +22,9 @@ dependencies {
implementation("org.apache.commons:commons-compress")
implementation("org.springframework:spring-core")
optional("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
optional("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") {
exclude(group: "commons-logging", module: "commons-logging")
}
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-gradle-test-support"))