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

14
spring-boot-project/spring-boot-devtools/build.gradle
View File

@@ -24,7 +24,9 @@ dependencies {
intTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
intTestImplementation(project(":spring-boot-project:spring-boot-test"))
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
intTestImplementation("org.apache.httpcomponents:httpclient")
intTestImplementation("org.apache.httpcomponents:httpclient") {
exclude group: "commons-logging", module: "commons-logging"
}
intTestImplementation("org.assertj:assertj-core")
intTestImplementation("org.awaitility:awaitility")
intTestImplementation("org.junit.jupiter:junit-jupiter")
@@ -34,9 +36,15 @@ dependencies {
optional("io.projectreactor:reactor-core")
optional("io.r2dbc:r2dbc-spi")
optional("javax.servlet:javax.servlet-api")
optional("jakarta.persistence:jakarta.persistence-api")
optional("jakarta.servlet:jakarta.servlet-api")
optional("org.apache.derby:derby")
optional("org.hibernate:hibernate-core")
optional("org.hibernate:hibernate-core") {
exclude group: "javax.activation", module:"javax.activation-api"
exclude group: "javax.persistence", module:"javax.persistence-api"
exclude group: "javax.xml.bind", module:"jaxb-api"
exclude group: "org.jboss.spec.javax.transaction", module:"jboss-transaction-api_1.2_spec"
}
optional("org.springframework:spring-jdbc")
optional("org.springframework:spring-orm")
optional("org.springframework:spring-web")