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

54
spring-boot-project/spring-boot/build.gradle
View File

@@ -39,14 +39,20 @@ dependencies {
optional("io.rsocket:rsocket-core")
optional("io.rsocket:rsocket-transport-netty")
optional("io.undertow:undertow-servlet") {
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.2_spec"
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_4.0_spec"
}
optional("javax.jms:javax.jms-api")
optional("javax.servlet:javax.servlet-api")
optional("jakarta.jms:jakarta.jms-api")
optional("jakarta.persistence:jakarta.persistence-api")
optional("jakarta.servlet:jakarta.servlet-api")
optional("jakarta.transaction:jakarta.transaction-api")
optional("junit:junit")
optional("org.apache.commons:commons-dbcp2")
optional("org.apache.httpcomponents:httpclient")
optional("org.apache.commons:commons-dbcp2") {
exclude(group: "commons-logging", module: "commons-logging")
}
optional("org.apache.httpcomponents:httpclient") {
exclude(group: "commons-logging", module: "commons-logging")
}
optional("org.apache.httpcomponents.client5:httpclient5")
optional("org.apache.logging.log4j:log4j-api")
optional("org.apache.logging.log4j:log4j-core")
@@ -58,15 +64,30 @@ dependencies {
optional("org.codehaus.groovy:groovy-xml")
optional("org.eclipse.jetty:jetty-servlets")
optional("org.eclipse.jetty:jetty-util")
optional("org.eclipse.jetty:jetty-webapp")
optional("org.eclipse.jetty:jetty-alpn-conscrypt-server")
optional("org.eclipse.jetty.http2:http2-server")
optional("org.eclipse.jetty:jetty-webapp") {
exclude(group: "javax.servlet", module: "javax.servlet-api")
}
optional("org.eclipse.jetty:jetty-alpn-conscrypt-server") {
exclude(group: "javax.servlet", module: "javax.servlet-api")
}
optional("org.eclipse.jetty.http2:http2-server") {
exclude(group: "javax.servlet", module: "javax.servlet-api")
}
optional("org.flywaydb:flyway-core")
optional("org.hamcrest:hamcrest-library")
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.hibernate.validator:hibernate-validator")
optional("org.jooq:jooq")
optional("org.liquibase:liquibase-core")
optional("org.jooq:jooq") {
exclude(group: "javax.xml.bind", module: "jaxb-api")
}
optional("org.liquibase:liquibase-core") {
exclude(group: "javax.xml.bind", module: "jaxb-api")
}
optional("org.postgresql:postgresql")
optional("org.slf4j:jul-to-slf4j")
optional("org.slf4j:slf4j-api")
@@ -85,7 +106,9 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib")
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation("com.google.appengine:appengine-api-1.0-sdk")
testImplementation("com.google.appengine:appengine-api-1.0-sdk") {
exclude group: "javax.inject", module: "javax.inject"
}
testImplementation("com.ibm.db2:jcc")
testImplementation("com.jayway.jsonpath:json-path")
testImplementation("com.microsoft.sqlserver:mssql-jdbc")
@@ -93,7 +116,8 @@ dependencies {
testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
testImplementation("io.projectreactor:reactor-test")
testImplementation("io.r2dbc:r2dbc-h2")
testImplementation("javax.xml.ws:jaxws-api")
testImplementation("jakarta.persistence:jakarta.persistence-api")
testImplementation("jakarta.xml.ws:jakarta.xml.ws-api")
testImplementation("mysql:mysql-connector-java")
testImplementation("net.sourceforge.jtds:jtds")
testImplementation("org.apache.derby:derby")
@@ -101,7 +125,9 @@ dependencies {
testImplementation("org.eclipse.jetty:jetty-client")
testImplementation("org.eclipse.jetty.http2:http2-client")
testImplementation("org.eclipse.jetty.http2:http2-http-client-transport")
testImplementation("org.firebirdsql.jdbc:jaybird-jdk18")
testImplementation("org.firebirdsql.jdbc:jaybird-jdk18") {
exclude group: "javax.resource", module: "connector-api"
}
testImplementation("org.hsqldb:hsqldb")
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.mariadb.jdbc:mariadb-java-client")