From 9c36b5383317c7fd92d4f4f3ebc9c90790eac168 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 11 Jun 2018 22:01:51 +0200 Subject: [PATCH] Upgrade to JAXB 2.3.0.1, Aalto XML 1.1, Rome 1.10 --- spring-messaging/spring-messaging.gradle | 4 ++-- spring-oxm/spring-oxm.gradle | 10 +++++----- spring-test/spring-test.gradle | 6 +++--- spring-web/spring-web.gradle | 8 ++++---- spring-webflux/spring-webflux.gradle | 6 +++--- spring-webmvc/spring-webmvc.gradle | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle index b1a31af5ba..726778660b 100644 --- a/spring-messaging/spring-messaging.gradle +++ b/spring-messaging/spring-messaging.gradle @@ -36,7 +36,7 @@ dependencies { testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") testCompile("org.xmlunit:xmlunit-matchers:2.6.0") - testRuntime("com.sun.xml.bind:jaxb-core:2.3.0") - testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0") + 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") } diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle index b27a459df5..699ad22022 100644 --- a/spring-oxm/spring-oxm.gradle +++ b/spring-oxm/spring-oxm.gradle @@ -11,9 +11,9 @@ dependencies { jibx "org.jibx:jibx-bind:1.3.1" jibx "org.apache.bcel:bcel:6.0" 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.xml.bind:jaxb-core:2.3.0.1' + xjc 'com.sun.xml.bind:jaxb-impl:2.3.0.1' + xjc 'com.sun.xml.bind:jaxb-xjc:2.3.0.1' xjc 'com.sun.activation:javax.activation:1.2.0' } @@ -119,8 +119,8 @@ dependencies { testCompile(files(genJaxb.classesDir).builtBy(genJaxb)) testCompile("org.xmlunit:xmlunit-matchers:2.6.0") testRuntime("xerces:xercesImpl:2.11.0") // for Castor - testRuntime("com.sun.xml.bind:jaxb-core:2.3.0") - testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0") + testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1") + testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1") } // JiBX compiler is currently not compatible with JDK 9 diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 3c27337d4d..f9159adda5 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -66,7 +66,7 @@ dependencies { testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}") testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") testCompile("com.thoughtworks.xstream:xstream:1.4.10") - testCompile("com.rometools:rome:1.9.0") + testCompile("com.rometools:rome:1.10.0") testCompile("org.apache.tiles:tiles-api:${tiles3Version}") testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J) testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J) @@ -82,8 +82,8 @@ dependencies { testRuntime("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}") testRuntime("org.junit.vintage:junit-vintage-engine:${junitVintageVersion}") 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("com.sun.xml.bind:jaxb-core:2.3.0.1") + testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1") } task testNG(type: Test) { diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index abd18c6f85..0fc0ed87b3 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -48,7 +48,7 @@ dependencies { optional("com.fasterxml.woodstox:woodstox-core:5.1.0") { // woodstox before aalto exclude group: "stax", module: "stax-api" } - optional("com.fasterxml:aalto-xml:1.0.0") + optional("com.fasterxml:aalto-xml:1.1.0") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}") @@ -56,7 +56,7 @@ dependencies { optional("com.google.code.gson:gson:2.8.5") optional("com.google.protobuf:protobuf-java-util:3.5.1") optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4") - optional("com.rometools:rome:1.9.0") + optional("com.rometools:rome:1.10.0") optional("com.caucho:hessian:4.0.51") optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") @@ -77,8 +77,8 @@ dependencies { testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.xmlunit:xmlunit-matchers:2.6.0") testRuntime("com.sun.mail:javax.mail:1.6.1") - testRuntime("com.sun.xml.bind:jaxb-core:2.3.0") - testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0") + testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1") + testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1") testRuntime("javax.json:javax.json-api:1.1.2") testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.7") } diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index d4347328cc..a08452eae3 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -47,7 +47,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") testCompile("io.undertow:undertow-core:${undertowVersion}") - testCompile("com.fasterxml:aalto-xml:1.0.0") + testCompile("com.fasterxml:aalto-xml:1.1.0") testCompile("com.squareup.okhttp3:mockwebserver:3.10.0") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") @@ -57,7 +57,7 @@ dependencies { testRuntime("org.synchronoss.cloud:nio-multipart-parser:1.1.0") testRuntime("org.webjars:underscorejs:1.8.3") 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("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") } diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 97e7718400..8e5b4e94e0 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -21,7 +21,7 @@ dependencies { optional("javax.el:javax.el-api:3.0.1-b04") optional("javax.xml.bind:jaxb-api:2.3.0") optional('org.webjars:webjars-locator-core:0.35') - optional("com.rometools:rome:1.9.0") + optional("com.rometools:rome:1.10.0") optional("com.github.librepdf:openpdf:1.0.5") optional("org.apache.poi:poi-ooxml:3.17") optional("org.freemarker:freemarker:${freemarkerVersion}") @@ -77,7 +77,7 @@ dependencies { testRuntime("org.python:jython-standalone:2.7.1") testRuntime("org.webjars:underscorejs:1.8.3") 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("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") }