diff --git a/build.gradle b/build.gradle index 438fb88bba2d322ef6cdfa7b272456e721e74f85..afeb6d166d7a3df83332c75caaa231bd5824d69c 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ ext { aspectjVersion = "1.9.4" freemarkerVersion = "2.3.28" - groovyVersion = "2.5.7" + groovyVersion = "2.5.8" hsqldbVersion = "2.4.1" jackson2Version = "2.9.9" jettyVersion = "9.4.20.v20190813" @@ -41,8 +41,8 @@ ext { reactorVersion = "Californium-SR12" rxjavaVersion = "1.3.8" rxjavaAdapterVersion = "1.2.1" - rxjava2Version = "2.2.10" - slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps + rxjava2Version = "2.2.12" + slf4jVersion = "1.7.28" // spring-jcl + consistent 3rd party deps tiles3Version = "3.0.8" tomcatVersion = "9.0.26" undertowVersion = "2.0.26.Final" diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle index 12ac18d1d3ef8d70c9afe56c19b432a47f549408..86d3f29a7104ad43bd6f0157c117e99516bd7eed 100644 --- a/spring-context/spring-context.gradle +++ b/spring-context/spring-context.gradle @@ -19,7 +19,7 @@ dependencies { optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.codehaus.groovy:groovy:${groovyVersion}") optional("org.beanshell:bsh:2.0b5") - optional("joda-time:joda-time:2.10.1") + optional("joda-time:joda-time:2.10.4") optional("org.hibernate:hibernate-validator:5.4.3.Final") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index d4ecfbbe76ac5d35af6bf192870e6947cc5df51d..c5345278c39dd2c76d988b7c13b51cb09f4459b8 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -67,12 +67,12 @@ dependencies { testCompile("org.junit.jupiter:junit-jupiter-params") testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") testCompile("com.thoughtworks.xstream:xstream:1.4.11.1") - testCompile("com.rometools:rome:1.12.1") + testCompile("com.rometools:rome:1.12.2") testCompile("org.apache.tiles:tiles-api:${tiles3Version}") testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j) testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j) testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") - testCompile("org.apache.httpcomponents:httpclient:4.5.9") { + testCompile("org.apache.httpcomponents:httpclient:4.5.10") { exclude group: "commons-logging", module: "commons-logging" } testCompile("io.projectreactor.netty:reactor-netty") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 963d1def41c87d26f287516cfc966f24f3893f83..9e7a5c120ab5abde97cdb8fb4b4ed35298263fee 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -38,8 +38,8 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet-api" } optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") - optional("com.squareup.okhttp3:okhttp:3.14.2") - optional("org.apache.httpcomponents:httpclient:4.5.9") { + optional("com.squareup.okhttp3:okhttp:3.14.3") + optional("org.apache.httpcomponents:httpclient:4.5.10") { exclude group: "commons-logging", module: "commons-logging" } optional("org.apache.httpcomponents:httpasyncclient:4.1.4") { @@ -58,7 +58,7 @@ dependencies { optional("com.google.code.gson:gson:2.8.5") optional("com.google.protobuf:protobuf-java-util:3.6.1") optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4") - optional("com.rometools:rome:1.12.1") + optional("com.rometools:rome:1.12.2") optional("com.caucho:hessian:4.0.51") optional("org.codehaus.groovy:groovy:${groovyVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") @@ -75,7 +75,7 @@ dependencies { testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") - testCompile("com.squareup.okhttp3:mockwebserver:3.14.2") + testCompile("com.squareup.okhttp3:mockwebserver:3.14.3") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.xmlunit:xmlunit-matchers:2.6.2") @@ -83,5 +83,5 @@ dependencies { testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1") testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1") testRuntime("javax.json:javax.json-api:1.1.4") - testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.12") + testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.13") } diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index 5ac5169a60ae502d072da115210ca814f2495a58..acaf6c4d3a081ba6a78d5e57fbcec5322043c030 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -34,7 +34,7 @@ dependencies { optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") { exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec" } - optional("org.apache.httpcomponents:httpclient:4.5.9") { + optional("org.apache.httpcomponents:httpclient:4.5.10") { exclude group: "commons-logging", module: "commons-logging" } optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") @@ -51,7 +51,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") - testCompile("com.squareup.okhttp3:mockwebserver:3.14.2") + testCompile("com.squareup.okhttp3:mockwebserver:3.14.3") 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 7ba939852ccbbc68598440d1867f039fbccf21c0..ff1fd65c13134a3778eaff3deb85f59f0361dc07 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -22,7 +22,7 @@ dependencies { optional("javax.el:javax.el-api:3.0.1-b04") optional("javax.xml.bind:jaxb-api:2.3.1") optional("org.webjars:webjars-locator-core:0.37") - optional("com.rometools:rome:1.12.1") + optional("com.rometools:rome:1.12.2") optional("com.github.librepdf:openpdf:1.2.21") optional("org.apache.poi:poi-ooxml:4.1.0") optional("org.freemarker:freemarker:${freemarkerVersion}") @@ -50,12 +50,12 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server") { exclude group: "javax.servlet", module: "javax.servlet" } - testCompile("org.apache.httpcomponents:httpclient:4.5.9") { + testCompile("org.apache.httpcomponents:httpclient:4.5.10") { exclude group: "commons-logging", module: "commons-logging" } testCompile("commons-fileupload:commons-fileupload:1.4") testCompile("commons-io:commons-io:2.5") - testCompile("joda-time:joda-time:2.10.2") + testCompile("joda-time:joda-time:2.10.4") testCompile("org.mozilla:rhino:1.7.10") testCompile("dom4j:dom4j:1.6.1") { exclude group: "xml-apis", module: "xml-apis"