Upgrade to Rhino 1.7.10

Includes reordering of web dependency declarations.

spring-web/spring-web.gradle

@@ -29,6 +29,7 @@ dependencies {
 	optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
 	optional("io.netty:netty-all")
 	optional("io.projectreactor.netty:reactor-netty")
+	optional("io.undertow:undertow-core:${undertowVersion}")
 	optional("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 	optional("org.eclipse.jetty:jetty-server") {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
@@ -36,7 +37,7 @@ dependencies {
 	optional("org.eclipse.jetty:jetty-servlet") {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
 	}
-	optional("io.undertow:undertow-core:${undertowVersion}")
+	optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.1")
 	optional("com.squareup.okhttp3:okhttp:3.11.0")
 	optional("org.apache.httpcomponents:httpclient:4.5.6") {
 		exclude group: "commons-logging", module: "commons-logging"
@@ -62,7 +63,6 @@ dependencies {
 	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-	optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.1")
 	testCompile("io.projectreactor:reactor-test")
 	testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
 		exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"

spring-webflux/spring-webflux.gradle

@@ -41,16 +41,16 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	optional("com.google.protobuf:protobuf-java-util:3.6.1")
 	testCompile("javax.xml.bind:jaxb-api:2.3.0")
+	testCompile("com.fasterxml:aalto-xml:1.1.0")
 	testCompile("org.hibernate:hibernate-validator:6.0.13.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.eclipse.jetty:jetty-reactive-httpclient:1.0.1")
+	testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
 	testCompile("org.eclipse.jetty:jetty-server")
 	testCompile("org.eclipse.jetty:jetty-servlet")
-	testCompile("io.undertow:undertow-core:${undertowVersion}")
-	testCompile("com.fasterxml:aalto-xml:1.1.0")
+	testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.1")
 	testCompile("com.squareup.okhttp3:mockwebserver:3.11.0")
 	testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
 	testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")

spring-webmvc/spring-webmvc.gradle

@@ -50,14 +50,13 @@ dependencies {
 	testCompile("org.eclipse.jetty:jetty-server") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
-	testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
 	testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
 		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.10")
-	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"
 	}
@@ -67,6 +66,7 @@ dependencies {
 		exclude group: "xerces", module: "xercesImpl"
 	}
 	testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
+	testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
 	testCompile("io.projectreactor:reactor-core")
 	testCompile("io.reactivex:rxjava:${rxjavaVersion}")
 	testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")