Skip to content

Commit efe2539

Browse files
committed
Upgrade to Tomcat 8.5.28 and Jackson 2.8.11.1
1 parent 0030ff8 commit efe2539

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ configure(allprojects) { project ->
5252
ext.hsqldbVersion = "2.3.4"
5353
ext.httpasyncVersion = "4.1.3"
5454
ext.httpclientVersion = "4.5.5"
55-
ext.jackson2Version = "2.8.11"
55+
ext.jackson2Version = "2.8.11.1"
5656
ext.jasperreportsVersion = "6.2.1" // our tests fail with JR-internal NPEs against 6.2.2 and higher
5757
ext.javamailVersion = "1.5.6"
5858
ext.jettyVersion = "9.3.14.v20161028" // as of 9.3.15, Jetty has hard Servlet 3.1 requirement
@@ -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.27"
78+
ext.tomcatVersion = "8.5.28"
7979
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
8080
ext.undertowVersion = "1.3.33.Final"
8181
ext.xmlunitVersion = "1.6"
@@ -704,7 +704,7 @@ project("spring-web") {
704704
optional("com.squareup.okhttp:okhttp:${okhttpVersion}")
705705
optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
706706
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
707-
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
707+
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.8.11")
708708
optional("com.google.code.gson:gson:${gsonVersion}")
709709
optional("com.rometools:rome:${romeVersion}")
710710
optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
@@ -724,8 +724,8 @@ project("spring-web") {
724724
testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
725725
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
726726
}
727-
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda:${jackson2Version}")
728-
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2Version}")
727+
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda:2.8.11")
728+
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.11")
729729
testCompile("com.fasterxml.jackson.module:jackson-module-kotlin:${jackson2Version}")
730730
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
731731
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
@@ -837,7 +837,7 @@ project("spring-webmvc") {
837837
exclude group: "org.springframework", module: "spring-context"
838838
}
839839
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
840-
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
840+
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.8.11")
841841
optional("com.rometools:rome:${romeVersion}")
842842
optional("javax.el:javax.el-api:2.2.5")
843843
optional("org.apache.tiles:tiles-api:${tiles3Version}")

0 commit comments

Comments
 (0)