diff --git a/build.gradle b/build.gradle index e1387085cf6..ae07c8049b3 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ ext { rxjavaVersion = "1.3.8" rxjavaAdapterVersion = "1.2.1" rxjava2Version = "2.1.17" - slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps + slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps tiles3Version = "3.0.8" tomcatVersion = "8.5.38" undertowVersion = "1.4.27.Final" diff --git a/spring-jdbc/spring-jdbc.gradle b/spring-jdbc/spring-jdbc.gradle index 1103b0c4cb8..61fdd0b8b74 100644 --- a/spring-jdbc/spring-jdbc.gradle +++ b/spring-jdbc/spring-jdbc.gradle @@ -7,7 +7,7 @@ dependencies { optional(project(":spring-context")) // for JndiDataSourceLookup optional("javax.transaction:javax.transaction-api:1.2") optional("org.hsqldb:hsqldb:${hsqldbVersion}") - optional("com.h2database:h2:1.4.197") + optional("com.h2database:h2:1.4.198") optional("org.apache.derby:derby:10.14.2.0") optional("org.apache.derby:derbyclient:10.14.2.0") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 3bbda32dad8..8403ff05c6f 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -36,7 +36,7 @@ dependencies { optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") { exclude group: "javax.servlet", module: "javax.servlet-api" } - optional("com.squareup.okhttp3:okhttp:3.12.1") + optional("com.squareup.okhttp3:okhttp:3.13.1") optional("org.apache.httpcomponents:httpclient:4.5.7") { exclude group: "commons-logging", module: "commons-logging" } @@ -72,7 +72,7 @@ dependencies { testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") - testCompile("com.squareup.okhttp3:mockwebserver:3.12.1") + testCompile("com.squareup.okhttp3:mockwebserver:3.13.1") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.xmlunit:xmlunit-matchers:2.5.1") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index b6a3562513e..789ad9e19c6 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -16,7 +16,7 @@ dependencies { optional(project(":spring-context-support")) // for FreeMarker support optional("javax.servlet:javax.servlet-api:3.1.0") optional("javax.websocket:javax.websocket-api:1.1") - optional("org.webjars:webjars-locator-core:0.36") + optional("org.webjars:webjars-locator-core:0.37") optional("org.freemarker:freemarker:${freemarkerVersion}") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}") @@ -48,7 +48,7 @@ dependencies { testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}") testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") - testCompile("com.squareup.okhttp3:mockwebserver:3.12.1") + testCompile("com.squareup.okhttp3:mockwebserver:3.13.1") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 4cb8298f46b..7678fa23c1f 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -20,7 +20,7 @@ dependencies { optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1") optional("javax.el:javax.el-api:3.0.1-b04") optional("javax.xml.bind:jaxb-api:2.3.0") - optional("org.webjars:webjars-locator-core:0.36") + optional("org.webjars:webjars-locator-core:0.37") optional("com.rometools:rome:1.12.0") optional("com.github.librepdf:openpdf:1.0.5") optional("org.apache.poi:poi-ooxml:3.17")