root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Java Activation Framework 1.2 as API dependency 

Includes XMLUnit 2.6.1 and Undertow 2.0.13.

Issue: SPR-16115
This commit is contained in:
Juergen Hoeller 2018-08-17 16:01:15 +02:00
parent 2ac23badee
commit a6a6cf7d97
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -45,7 +45,7 @@ ext {
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8"
tomcatVersion = "9.0.10"
undertowVersion = "2.0.12.Final"
undertowVersion = "2.0.13.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle"
withoutJclOverSlf4J = {

2
spring-context-support/spring-context-support.gradle
View File

@ -6,7 +6,7 @@ dependencies {
compile(project(":spring-core"))
optional(project(":spring-jdbc")) // for Quartz support
optional(project(":spring-tx")) // for Quartz support
optional("javax.activation:activation:1.1.1")
optional("javax.activation:javax.activation-api:1.2.0")
optional("javax.mail:javax.mail-api:1.6.1")
optional("javax.cache:cache-api:1.1.0")
optional("com.github.ben-manes.caffeine:caffeine:2.6.2")

2
spring-core/spring-core.gradle
View File

@ -81,7 +81,7 @@ dependencies {
optional("io.netty:netty-buffer")
testCompile("io.projectreactor:reactor-test")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testCompile("javax.xml.bind:jaxb-api:2.3.0")
testCompile("com.fasterxml.woodstox:woodstox-core:5.1.0") {
exclude group: "stax", module: "stax-api"

2
spring-messaging/spring-messaging.gradle
View File

@ -36,7 +36,7 @@ dependencies {
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
testRuntime("com.sun.activation:javax.activation:1.2.0")

4
spring-oxm/spring-oxm.gradle
View File

@ -99,7 +99,7 @@ dependencies {
compile(project(":spring-beans"))
compile(project(":spring-core"))
optional("javax.xml.bind:jaxb-api:2.3.0")
optional("javax.activation:activation:1.1.1")
optional("javax.activation:javax.activation-api:1.2.0")
optional("org.codehaus.castor:castor-xml:1.4.1") {
exclude group: "stax", module: "stax-api"
exclude group: "org.springframework", module: "spring-context"
@ -117,7 +117,7 @@ dependencies {
}
testCompile(files(genCastor.classesDir).builtBy(genCastor))
testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testRuntime("xerces:xercesImpl:2.11.0") // for Castor
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")

4
spring-test/spring-test.gradle
View File

@ -20,7 +20,7 @@ dependencies {
optional(project(":spring-webflux"))
optional(project(":spring-webmvc"))
optional(project(":spring-websocket"))
optional("javax.activation:activation:1.1.1")
optional("javax.activation:javax.activation-api:1.2.0")
optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.inject:javax.inject:1")
optional("javax.servlet:javax.servlet-api:4.0.1")
@ -47,7 +47,7 @@ dependencies {
exclude group: "commons-logging", module: "commons-logging"
exclude group: "io.netty", module: "netty"
}
optional("org.xmlunit:xmlunit-matchers:2.6.0")
optional("org.xmlunit:xmlunit-matchers:2.6.1")
optional("org.skyscreamer:jsonassert:1.5.0")
optional("com.jayway.jsonpath:json-path:2.4.0")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")

2
spring-web/spring-web.gradle
View File

@ -77,7 +77,7 @@ dependencies {
testCompile("com.squareup.okhttp3:mockwebserver:3.11.0")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testRuntime("com.sun.mail:javax.mail:1.6.1")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")

2
spring-webmvc/spring-webmvc.gradle
View File

@ -66,7 +66,7 @@ dependencies {
exclude group: "xom", module: "xom"
exclude group: "xerces", module: "xercesImpl"
}
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testCompile("io.projectreactor:reactor-core")
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")