Skip to content

Commit 9bab7a2

Browse files
committed
Upgrade to Java Activation Framework 1.2 for test runtime
Includes upgrade to Hibernate Validator 6.0.4 (where applicable) Issue: SPR-16115
1 parent 01e7cae commit 9bab7a2

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
testCompile(project(":spring-context"))
1818
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
1919
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
20-
testCompile("org.hibernate:hibernate-validator:6.0.3.Final")
20+
testCompile("org.hibernate:hibernate-validator:6.0.4.Final")
2121
testRuntime("org.ehcache:jcache:1.0.1")
2222
testRuntime("org.ehcache:ehcache:3.4.0")
2323
testRuntime("org.glassfish:javax.el:3.0.1-b08")

spring-messaging/spring-messaging.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ dependencies {
4343
testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
4444
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
4545
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
46-
testRuntime("javax.activation:activation:1.1.1")
46+
testRuntime("com.sun.activation:javax.activation:1.2.0")
4747
}

spring-oxm/spring-oxm.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ dependencies {
1010
castor "org.codehaus.castor:castor-anttasks:1.4.1"
1111
jibx "org.jibx:jibx-bind:1.3.1"
1212
jibx "org.apache.bcel:bcel:6.0"
13-
xjc 'javax.activation:activation:1.1.1'
1413
xjc 'javax.xml.bind:jaxb-api:2.3.0'
1514
xjc 'com.sun.xml.bind:jaxb-core:2.3.0'
1615
xjc 'com.sun.xml.bind:jaxb-impl:2.3.0'
1716
xjc 'com.sun.xml.bind:jaxb-xjc:2.2.11' // 2.3.0 breaks with "xjc failed"
17+
xjc 'com.sun.activation:javax.activation:1.2.0'
1818
}
1919

2020
ext.genSourcesDir = "${buildDir}/generated-sources"

spring-test/spring-test.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
6767
testCompile("javax.mail:javax.mail-api:1.6.0")
6868
testCompile("org.hibernate:hibernate-core:5.2.12.Final")
69-
testCompile("org.hibernate:hibernate-validator:6.0.3.Final")
69+
testCompile("org.hibernate:hibernate-validator:6.0.4.Final")
7070
// Enable use of the JUnitPlatform Runner
7171
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
7272
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")

spring-webflux/spring-webflux.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies {
4545
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
4646
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
4747
testCompile("javax.xml.bind:jaxb-api:2.3.0")
48-
testCompile("org.hibernate:hibernate-validator:6.0.3.Final")
48+
testCompile("org.hibernate:hibernate-validator:6.0.4.Final")
4949
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
5050
testCompile("io.projectreactor:reactor-test")
5151
testCompile("io.reactivex:rxnetty-http:0.5.2") {
@@ -68,5 +68,5 @@ dependencies {
6868
testRuntime("org.glassfish:javax.el:3.0.1-b08")
6969
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
7070
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
71-
testRuntime("javax.activation:activation:1.1.1")
71+
testRuntime("com.sun.activation:javax.activation:1.2.0")
7272
}

spring-webmvc/spring-webmvc.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {
6464
exclude group: "javax.servlet", module: "javax.servlet"
6565
}
66-
testCompile("org.hibernate:hibernate-validator:6.0.3.Final")
66+
testCompile("org.hibernate:hibernate-validator:6.0.4.Final")
6767
testCompile("org.apache.httpcomponents:httpclient:4.5.3") {
6868
exclude group: "commons-logging", module: "commons-logging"
6969
}
@@ -92,5 +92,5 @@ dependencies {
9292
testRuntime("org.glassfish:javax.el:3.0.1-b08")
9393
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
9494
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
95-
testRuntime("javax.activation:activation:1.1.1")
95+
testRuntime("com.sun.activation:javax.activation:1.2.0")
9696
}

0 commit comments

Comments
 (0)