Merge branch '2.3.x'

Closes gh-21940
This commit is contained in:
Andy Wilkinson
2020-06-16 10:10:38 +01:00
92 changed files with 122 additions and 194 deletions

View File

@@ -4,21 +4,17 @@ plugins {
id "org.springframework.boot.conventions"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.deployed"
id "org.springframework.boot.internal-dependency-management"
id "org.springframework.boot.optional-dependencies"
}
description = "Spring Boot"
dependencies {
annotationProcessor(platform(project(":spring-boot-project:spring-boot-dependencies")))
annotationProcessor("org.apache.logging.log4j:log4j-core")
api(platform(project(":spring-boot-project:spring-boot-dependencies")))
api("org.springframework:spring-core")
api("org.springframework:spring-context")
optional(platform(project(":spring-boot-project:spring-boot-dependencies")))
optional("ch.qos.logback:logback-classic")
optional("com.atomikos:transactions-jdbc")
optional("com.atomikos:transactions-jms")