From 9bab7a2708d00c6213a22616fd04222bfe0c5912 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 25 Oct 2017 19:18:10 +0200 Subject: [PATCH] Upgrade to Java Activation Framework 1.2 for test runtime Includes upgrade to Hibernate Validator 6.0.4 (where applicable) Issue: SPR-16115 --- spring-context-support/spring-context-support.gradle | 2 +- spring-messaging/spring-messaging.gradle | 2 +- spring-oxm/spring-oxm.gradle | 2 +- spring-test/spring-test.gradle | 2 +- spring-webflux/spring-webflux.gradle | 4 ++-- spring-webmvc/spring-webmvc.gradle | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle index 5737a0f8ce..2674d418c4 100644 --- a/spring-context-support/spring-context-support.gradle +++ b/spring-context-support/spring-context-support.gradle @@ -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") diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle index bf0e7fbb1b..ef90ded378 100644 --- a/spring-messaging/spring-messaging.gradle +++ b/spring-messaging/spring-messaging.gradle @@ -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") } diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle index 63948e4afc..c0ef3d60b0 100644 --- a/spring-oxm/spring-oxm.gradle +++ b/spring-oxm/spring-oxm.gradle @@ -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" diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 22fbd11fa4..902809d777 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -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}") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index cace631da4..58252b92b1 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -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") } diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index d9aabf47bf..f082034b6d 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -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") }