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

Upgrade to Java Activation Framework 1.2 for test runtime 

Includes upgrade to Hibernate Validator 6.0.4 (where applicable)

Issue: SPR-16115
This commit is contained in:
Juergen Hoeller 2017-10-25 19:18:10 +02:00
parent 01e7cae3ed
commit 9bab7a2708
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ dependencies {
testCompile(project(":spring-context"))
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
testCompile("org.hibernate:hibernate-validator:6.0.3.Final")
testCompile("org.hibernate:hibernate-validator:6.0.4.Final")
testRuntime("org.ehcache:jcache:1.0.1")
testRuntime("org.ehcache:ehcache:3.4.0")
testRuntime("org.glassfish:javax.el:3.0.1-b08")

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

@ -43,5 +43,5 @@ dependencies {
testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
testRuntime("javax.activation:activation:1.1.1")
testRuntime("com.sun.activation:javax.activation:1.2.0")
}

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

@ -10,11 +10,11 @@ dependencies {
castor "org.codehaus.castor:castor-anttasks:1.4.1"
jibx "org.jibx:jibx-bind:1.3.1"
jibx "org.apache.bcel:bcel:6.0"
xjc 'javax.activation:activation:1.1.1'
xjc 'javax.xml.bind:jaxb-api:2.3.0'
xjc 'com.sun.xml.bind:jaxb-core:2.3.0'
xjc 'com.sun.xml.bind:jaxb-impl:2.3.0'
xjc 'com.sun.xml.bind:jaxb-xjc:2.2.11' // 2.3.0 breaks with "xjc failed"
xjc 'com.sun.activation:javax.activation:1.2.0'
}
ext.genSourcesDir = "${buildDir}/generated-sources"

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

@ -66,7 +66,7 @@ dependencies {
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
testCompile("javax.mail:javax.mail-api:1.6.0")
testCompile("org.hibernate:hibernate-core:5.2.12.Final")
testCompile("org.hibernate:hibernate-validator:6.0.3.Final")
testCompile("org.hibernate:hibernate-validator:6.0.4.Final")
// Enable use of the JUnitPlatform Runner
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")

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

@ -45,7 +45,7 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("javax.xml.bind:jaxb-api:2.3.0")
testCompile("org.hibernate:hibernate-validator:6.0.3.Final")
testCompile("org.hibernate:hibernate-validator:6.0.4.Final")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
testCompile("io.projectreactor:reactor-test")
testCompile("io.reactivex:rxnetty-http:0.5.2") {
@ -68,5 +68,5 @@ dependencies {
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
testRuntime("javax.activation:activation:1.1.1")
testRuntime("com.sun.activation:javax.activation:1.2.0")
}

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

@ -63,7 +63,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet"
}
testCompile("org.hibernate:hibernate-validator:6.0.3.Final")
testCompile("org.hibernate:hibernate-validator:6.0.4.Final")
testCompile("org.apache.httpcomponents:httpclient:4.5.3") {
exclude group: "commons-logging", module: "commons-logging"
}
@ -92,5 +92,5 @@ dependencies {
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
testRuntime("javax.activation:activation:1.1.1")
testRuntime("com.sun.activation:javax.activation:1.2.0")
}