From 94ae933122e274bee8857a66da5a1b1e1e5df2f5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 14 Sep 2018 14:29:57 +0200 Subject: [PATCH] Upgrade to Rhino 1.7.10 and Apache Johnzon 1.1.9 Includes reordering of web dependency declarations. --- spring-web/spring-web.gradle | 4 ++-- spring-webflux/spring-webflux.gradle | 6 +++--- spring-webmvc/spring-webmvc.gradle | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 377e08646c5..321314287bf 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -28,6 +28,7 @@ dependencies { optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}") optional("io.netty:netty-all") optional("io.projectreactor.ipc:reactor-netty") + optional("io.undertow:undertow-core:${undertowVersion}") optional("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") optional("org.eclipse.jetty:jetty-server:${jettyVersion}") { exclude group: "javax.servlet", module: "javax.servlet-api" @@ -35,7 +36,6 @@ dependencies { optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") { exclude group: "javax.servlet", module: "javax.servlet-api" } - optional("io.undertow:undertow-core:${undertowVersion}") optional("com.squareup.okhttp3:okhttp:3.10.0") optional("org.apache.httpcomponents:httpclient:4.5.5") { exclude group: "commons-logging", module: "commons-logging" @@ -80,5 +80,5 @@ dependencies { testRuntime("com.sun.xml.bind:jaxb-core:2.3.0") testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0") testRuntime("javax.json:javax.json-api:1.1.2") - testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.8") + testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.9") } diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index ded409908f1..0d1d7af2328 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -39,15 +39,15 @@ 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("com.fasterxml:aalto-xml:1.0.0") testCompile("org.hibernate:hibernate-validator:6.0.10.Final") testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}" testCompile("io.projectreactor:reactor-test") - testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}") + testCompile("io.undertow:undertow-core:${undertowVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") + testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}") 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.squareup.okhttp3:mockwebserver:3.10.0") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index bb025a922ec..b3886cd1b7c 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -49,14 +49,13 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") { exclude group: "javax.servlet", module: "javax.servlet" } - testCompile("org.hibernate:hibernate-validator:6.0.10.Final") testCompile("org.apache.httpcomponents:httpclient:4.5.5") { exclude group: "commons-logging", module: "commons-logging" } testCompile("commons-fileupload:commons-fileupload:1.3.3") testCompile("commons-io:commons-io:2.5") testCompile("joda-time:joda-time:2.9.9") - testCompile("org.mozilla:rhino:1.7.9") + testCompile("org.mozilla:rhino:1.7.10") testCompile("dom4j:dom4j:1.6.1") { exclude group: "xml-apis", module: "xml-apis" } @@ -66,6 +65,7 @@ dependencies { exclude group: "xerces", module: "xercesImpl" } testCompile("org.xmlunit:xmlunit-matchers:2.5.1") + testCompile("org.hibernate:hibernate-validator:6.0.10.Final") testCompile("io.projectreactor:reactor-core") testCompile("io.reactivex:rxjava:${rxjavaVersion}") testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")