Skip to content

Commit a6a6cf7

Browse files
committed
Upgrade to Java Activation Framework 1.2 as API dependency
Includes XMLUnit 2.6.1 and Undertow 2.0.13. Issue: SPR-16115
1 parent 2ac23ba commit a6a6cf7

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ext {
4545
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
4646
tiles3Version = "3.0.8"
4747
tomcatVersion = "9.0.10"
48-
undertowVersion = "2.0.12.Final"
48+
undertowVersion = "2.0.13.Final"
4949

5050
gradleScriptDir = "${rootProject.projectDir}/gradle"
5151
withoutJclOverSlf4J = {

spring-context-support/spring-context-support.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66
compile(project(":spring-core"))
77
optional(project(":spring-jdbc")) // for Quartz support
88
optional(project(":spring-tx")) // for Quartz support
9-
optional("javax.activation:activation:1.1.1")
9+
optional("javax.activation:javax.activation-api:1.2.0")
1010
optional("javax.mail:javax.mail-api:1.6.1")
1111
optional("javax.cache:cache-api:1.1.0")
1212
optional("com.github.ben-manes.caffeine:caffeine:2.6.2")

spring-core/spring-core.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ dependencies {
8181
optional("io.netty:netty-buffer")
8282
testCompile("io.projectreactor:reactor-test")
8383
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
84-
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
84+
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
8585
testCompile("javax.xml.bind:jaxb-api:2.3.0")
8686
testCompile("com.fasterxml.woodstox:woodstox-core:5.1.0") {
8787
exclude group: "stax", module: "stax-api"

spring-messaging/spring-messaging.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
3737
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
3838
testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
39-
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
39+
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
4040
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
4141
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
4242
testRuntime("com.sun.activation:javax.activation:1.2.0")

spring-oxm/spring-oxm.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ dependencies {
9999
compile(project(":spring-beans"))
100100
compile(project(":spring-core"))
101101
optional("javax.xml.bind:jaxb-api:2.3.0")
102-
optional("javax.activation:activation:1.1.1")
102+
optional("javax.activation:javax.activation-api:1.2.0")
103103
optional("org.codehaus.castor:castor-xml:1.4.1") {
104104
exclude group: "stax", module: "stax-api"
105105
exclude group: "org.springframework", module: "spring-context"
@@ -117,7 +117,7 @@ dependencies {
117117
}
118118
testCompile(files(genCastor.classesDir).builtBy(genCastor))
119119
testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
120-
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
120+
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
121121
testRuntime("xerces:xercesImpl:2.11.0") // for Castor
122122
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
123123
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")

spring-test/spring-test.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
optional(project(":spring-webflux"))
2121
optional(project(":spring-webmvc"))
2222
optional(project(":spring-websocket"))
23-
optional("javax.activation:activation:1.1.1")
23+
optional("javax.activation:javax.activation-api:1.2.0")
2424
optional("javax.el:javax.el-api:3.0.1-b04")
2525
optional("javax.inject:javax.inject:1")
2626
optional("javax.servlet:javax.servlet-api:4.0.1")
@@ -47,7 +47,7 @@ dependencies {
4747
exclude group: "commons-logging", module: "commons-logging"
4848
exclude group: "io.netty", module: "netty"
4949
}
50-
optional("org.xmlunit:xmlunit-matchers:2.6.0")
50+
optional("org.xmlunit:xmlunit-matchers:2.6.1")
5151
optional("org.skyscreamer:jsonassert:1.5.0")
5252
optional("com.jayway.jsonpath:json-path:2.4.0")
5353
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")

spring-web/spring-web.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies {
7777
testCompile("com.squareup.okhttp3:mockwebserver:3.11.0")
7878
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
7979
testCompile("org.skyscreamer:jsonassert:1.5.0")
80-
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
80+
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
8181
testRuntime("com.sun.mail:javax.mail:1.6.1")
8282
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
8383
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")

spring-webmvc/spring-webmvc.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666
exclude group: "xom", module: "xom"
6767
exclude group: "xerces", module: "xercesImpl"
6868
}
69-
testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
69+
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
7070
testCompile("io.projectreactor:reactor-core")
7171
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
7272
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")

0 commit comments

Comments
 (0)