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

49
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
View File

@@ -12,25 +12,42 @@ dependencies {
api(project(":spring-boot-project:spring-boot-test"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))
optional("javax.json.bind:javax.json.bind-api")
optional("javax.servlet:javax.servlet-api")
optional("javax.transaction:javax.transaction-api")
optional("jakarta.json.bind:jakarta.json.bind-api")
optional("jakarta.persistence:jakarta.persistence-api")
optional("jakarta.servlet:jakarta.servlet-api")
optional("jakarta.transaction:jakarta.transaction-api")
optional("com.fasterxml.jackson.core:jackson-databind")
optional("com.google.code.gson:gson")
optional("com.jayway.jsonpath:json-path")
optional("com.sun.xml.messaging.saaj:saaj-impl")
optional("io.rest-assured:rest-assured")
optional("net.sourceforge.htmlunit:htmlunit")
optional("org.hibernate:hibernate-core")
optional("io.rest-assured:rest-assured") {
exclude group: "commons-logging", module: "commons-logging"
exclude group: "javax.activation", module: "activation"
exclude group: "javax.xml.bind", module: "jaxb-api"
}
optional("net.sourceforge.htmlunit:htmlunit") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.hibernate:hibernate-core") {
exclude group: "commons-logging", module: "commons-logging"
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.junit.jupiter:junit-jupiter-api")
optional("org.seleniumhq.selenium:htmlunit-driver")
optional("org.seleniumhq.selenium:htmlunit-driver") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.seleniumhq.selenium:selenium-api")
optional("org.springframework:spring-orm")
optional("org.springframework:spring-test")
optional("org.springframework:spring-web")
optional("org.springframework:spring-webmvc")
optional("org.springframework:spring-webflux")
optional("org.springframework.data:spring-data-cassandra")
optional("org.springframework.data:spring-data-cassandra") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.springframework.data:spring-data-jdbc")
optional("org.springframework.data:spring-data-jpa")
optional("org.springframework.data:spring-data-ldap")
@@ -38,8 +55,14 @@ dependencies {
optional("org.springframework.data:spring-data-neo4j")
optional("org.springframework.data:spring-data-r2dbc")
optional("org.springframework.data:spring-data-redis")
optional("org.springframework.restdocs:spring-restdocs-mockmvc")
optional("org.springframework.restdocs:spring-restdocs-restassured")
optional("org.springframework.restdocs:spring-restdocs-mockmvc") {
exclude group: "javax.servlet", module: "javax.servlet-api"
}
optional("org.springframework.restdocs:spring-restdocs-restassured") {
exclude group: "commons-logging", module: "commons-logging"
exclude group: "javax.activation", module: "activation"
exclude group: "javax.xml.bind", module: "jaxb-api"
}
optional("org.springframework.restdocs:spring-restdocs-webtestclient")
optional("org.springframework.security:spring-security-config")
optional("org.springframework.security:spring-security-test")
@@ -61,7 +84,7 @@ dependencies {
testImplementation("io.projectreactor:reactor-core")
testImplementation("io.projectreactor:reactor-test")
testImplementation("io.r2dbc:r2dbc-h2")
testImplementation("javax.json:javax.json-api")
testImplementation("jakarta.json:jakarta.json-api")
testImplementation("org.apache.commons:commons-pool2")
testImplementation("org.apache.johnzon:johnzon-jsonb")
testImplementation("org.apache.tomcat.embed:tomcat-embed-el")
@@ -71,7 +94,9 @@ dependencies {
testImplementation("org.awaitility:awaitility")
testImplementation("org.hibernate.validator:hibernate-validator")
testImplementation("org.hsqldb:hsqldb")
testImplementation("org.jooq:jooq")
testImplementation("org.jooq:jooq") {
exclude group: "javax.xml.bind", module: "jaxb-api"
}
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.junit.platform:junit-platform-engine")
testImplementation("org.junit.platform:junit-platform-launcher")