Skip to content

Commit 0dd87e8

Browse files
committed
Upgrade to Tomcat 8.5.37 and Hibernate Validator 6.0.14
Includes WebJars Locator 0.36, OkHttp 3.12.1, Apache Johnzon 1.1.11.
1 parent e0283c2 commit 0dd87e8

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ext {
5454
rxjava2Version = "2.1.17"
5555
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
5656
tiles3Version = "3.0.8"
57-
tomcatVersion = "8.5.35"
57+
tomcatVersion = "8.5.37"
5858
undertowVersion = "1.4.26.Final"
5959

6060
gradleScriptDir = "${rootProject.projectDir}/gradle"

spring-context-support/spring-context-support.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
optional("org.freemarker:freemarker:${freemarkerVersion}")
1717
testCompile(project(":spring-context"))
1818
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
19-
testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
19+
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
2020
testCompile("javax.annotation:javax.annotation-api:1.3.2")
2121
testRuntime("org.ehcache:jcache:1.0.1")
2222
testRuntime("org.ehcache:ehcache:3.4.0")

spring-test/spring-test.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies {
6060
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
6161
testCompile("javax.mail:javax.mail-api:1.6.1")
6262
testCompile("org.hibernate:hibernate-core:5.2.17.Final")
63-
testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
63+
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
6464
// Enable use of the JUnit Platform Runner
6565
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
6666
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")

spring-web/spring-web.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
3737
exclude group: "javax.servlet", module: "javax.servlet-api"
3838
}
39-
optional("com.squareup.okhttp3:okhttp:3.12.0")
39+
optional("com.squareup.okhttp3:okhttp:3.12.1")
4040
optional("org.apache.httpcomponents:httpclient:4.5.6") {
4141
exclude group: "commons-logging", module: "commons-logging"
4242
}
@@ -72,13 +72,13 @@ dependencies {
7272
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
7373
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
7474
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
75-
testCompile("com.squareup.okhttp3:mockwebserver:3.12.0")
75+
testCompile("com.squareup.okhttp3:mockwebserver:3.12.1")
7676
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
7777
testCompile("org.skyscreamer:jsonassert:1.5.0")
7878
testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
7979
testRuntime("com.sun.mail:javax.mail:1.6.1")
8080
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
8181
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
8282
testRuntime("javax.json:javax.json-api:1.1.2")
83-
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.10")
83+
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.11")
8484
}

spring-webflux/spring-webflux.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
optional(project(":spring-context-support")) // for FreeMarker support
1717
optional("javax.servlet:javax.servlet-api:3.1.0")
1818
optional("javax.websocket:javax.websocket-api:1.1")
19-
optional("org.webjars:webjars-locator-core:0.35")
19+
optional("org.webjars:webjars-locator-core:0.36")
2020
optional("org.freemarker:freemarker:${freemarkerVersion}")
2121
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
2222
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
@@ -40,15 +40,15 @@ dependencies {
4040
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
4141
testCompile("javax.xml.bind:jaxb-api:2.3.0")
4242
testCompile("com.fasterxml:aalto-xml:1.0.0")
43-
testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
43+
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
4444
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
4545
testCompile("io.projectreactor:reactor-test")
4646
testCompile("io.undertow:undertow-core:${undertowVersion}")
4747
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
4848
testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
4949
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
5050
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
51-
testCompile("com.squareup.okhttp3:mockwebserver:3.12.0")
51+
testCompile("com.squareup.okhttp3:mockwebserver:3.12.1")
5252
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
5353
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
5454
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")

spring-webmvc/spring-webmvc.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
2121
optional("javax.el:javax.el-api:3.0.1-b04")
2222
optional("javax.xml.bind:jaxb-api:2.3.0")
23-
optional("org.webjars:webjars-locator-core:0.35")
23+
optional("org.webjars:webjars-locator-core:0.36")
2424
optional("com.rometools:rome:1.12.0")
2525
optional("com.github.librepdf:openpdf:1.0.5")
2626
optional("org.apache.poi:poi-ooxml:3.17")
@@ -65,7 +65,7 @@ dependencies {
6565
exclude group: "xerces", module: "xercesImpl"
6666
}
6767
testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
68-
testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
68+
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
6969
testCompile("io.projectreactor:reactor-core")
7070
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
7171
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")

0 commit comments

Comments
 (0)