Skip to content

Commit 8e3a55b

Browse files
committed
Latest applicable dependency updates (Tomcat 8.5.21, JRuby 1.7.27, Rhino 1.7.7.2, WebJars Locator 0.32-1)
1 parent a839477 commit 8e3a55b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ configure(allprojects) { project ->
5858
ext.jettyVersion = "9.3.14.v20161028" // as of 9.3.15, Jetty has hard Servlet 3.1 requirement
5959
ext.jetty94Version = "9.4.6.v20170531" // for spring-websocket support, optimized for Jetty 9.4
6060
ext.jodaVersion = "2.9.9"
61-
ext.jrubyVersion = "1.7.26" // JRuby 9000 primarily supported through JSR-223 (StandardScriptFactory)
61+
ext.jrubyVersion = "1.7.27" // JRuby 9000 primarily supported through JSR-223 (StandardScriptFactory)
6262
ext.jtaVersion = "1.2"
6363
ext.junitVersion = "4.12"
6464
ext.log4jVersion = "1.2.17"
@@ -75,7 +75,7 @@ configure(allprojects) { project ->
7575
ext.testngVersion = "6.9.10"
7676
ext.tiles2Version = "2.2.2"
7777
ext.tiles3Version = "3.0.7"
78-
ext.tomcatVersion = "8.5.16"
78+
ext.tomcatVersion = "8.5.21"
7979
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
8080
ext.undertowVersion = "1.3.31.Final"
8181
ext.xmlunitVersion = "1.6"
@@ -475,8 +475,8 @@ project("spring-context") {
475475
dependencies {
476476
compile(project(":spring-aop"))
477477
compile(project(":spring-beans"))
478-
compile(project(":spring-expression"))
479478
compile(project(":spring-core"))
479+
compile(project(":spring-expression"))
480480
compile(files(project(":spring-core").cglibRepackJar))
481481
optional(project(":spring-instrument"))
482482
optional("javax.inject:javax.inject:1")
@@ -726,7 +726,7 @@ project("spring-web") {
726726
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda:${jackson2Version}")
727727
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2Version}")
728728
testCompile("com.fasterxml.jackson.module:jackson-module-kotlin:${jackson2Version}")
729-
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
729+
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
730730
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
731731
}
732732
}
@@ -856,7 +856,7 @@ project("spring-webmvc") {
856856
exclude group: "org.slf4j", module: "jcl-over-slf4j"
857857
exclude group: "org.springframework", module: "spring-web"
858858
}
859-
optional('org.webjars:webjars-locator:0.32')
859+
optional('org.webjars:webjars-locator:0.32-1')
860860
testCompile("xmlunit:xmlunit:${xmlunitVersion}")
861861
testCompile("dom4j:dom4j:1.6.1") {
862862
exclude group: "xml-apis", module: "xml-apis"
@@ -879,7 +879,7 @@ project("spring-webmvc") {
879879
testCompile("commons-io:commons-io:1.4")
880880
testCompile("joda-time:joda-time:${jodaVersion}")
881881
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
882-
testCompile("org.mozilla:rhino:1.7.7.1")
882+
testCompile("org.mozilla:rhino:1.7.7.2")
883883
testRuntime("org.jruby:jruby:${jrubyVersion}")
884884
testRuntime("org.python:jython-standalone:2.5.3")
885885
testRuntime("org.webjars:underscorejs:1.8.3")

spring-oxm/oxm.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
configurations {
22
castor
3+
jibx
34
xjc
45
xmlbeans
5-
jibx
66
}
77

88
dependencies {

0 commit comments

Comments
 (0)