diff --git a/build.gradle b/build.gradle index c51d64bb83..07df8c6f73 100644 --- a/build.gradle +++ b/build.gradle @@ -30,10 +30,10 @@ ext { aspectjVersion = "1.9.2" freemarkerVersion = "2.3.28" - groovyVersion = "2.5.3" + groovyVersion = "2.5.4" hsqldbVersion = "2.4.1" jackson2Version = "2.9.7" - jettyVersion = "9.4.12.v20180830" + jettyVersion = "9.4.14.v20181114" junit5Version = "5.3.1" kotlinVersion = "1.2.71" log4jVersion = "2.11.1" @@ -44,7 +44,7 @@ ext { rxjava2Version = "2.2.3" slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps tiles3Version = "3.0.8" - tomcatVersion = "9.0.12" + tomcatVersion = "9.0.13" undertowVersion = "2.0.15.Final" gradleScriptDir = "${rootProject.projectDir}/gradle" diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle index a0498224ba..38a71e02d1 100644 --- a/spring-context/spring-context.gradle +++ b/spring-context/spring-context.gradle @@ -15,7 +15,7 @@ dependencies { optional("javax.interceptor:javax.interceptor-api:1.2.2") optional("javax.money:money-api:1.0.3") optional("javax.validation:validation-api:1.1.0.Final") - optional("javax.xml.ws:jaxws-api:2.3.0") + optional("javax.xml.ws:jaxws-api:2.3.1") optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.codehaus.groovy:groovy:${groovyVersion}") optional("org.beanshell:bsh:2.0b5") @@ -28,8 +28,8 @@ dependencies { testCompile("org.codehaus.groovy:groovy-xml:${groovyVersion}") testCompile("org.apache.commons:commons-pool2:2.6.0") testCompile("javax.inject:javax.inject-tck:1") - testCompile("org.awaitility:awaitility:3.1.2") - testRuntime("javax.xml.bind:jaxb-api:2.3.0") + testCompile("org.awaitility:awaitility:3.1.3") + testRuntime("javax.xml.bind:jaxb-api:2.3.1") testRuntime("org.glassfish:javax.el:3.0.1-b08") testRuntime("org.javamoney:moneta:1.3") } diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index d7e6a705a7..bce36cd6d4 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -81,8 +81,8 @@ dependencies { testCompile("io.projectreactor:reactor-test") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.xmlunit:xmlunit-matchers:2.6.2") - testCompile("javax.xml.bind:jaxb-api:2.3.0") - testCompile("com.fasterxml.woodstox:woodstox-core:5.1.0") { + testCompile("javax.xml.bind:jaxb-api:2.3.1") + testCompile("com.fasterxml.woodstox:woodstox-core:5.2.0") { exclude group: "stax", module: "stax-api" } } diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle index bd6a5e8c1a..b8e29c0960 100644 --- a/spring-messaging/spring-messaging.gradle +++ b/spring-messaging/spring-messaging.gradle @@ -14,7 +14,7 @@ dependencies { optional(project(":spring-oxm")) optional("io.projectreactor.netty:reactor-netty") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") - optional("javax.xml.bind:jaxb-api:2.3.0") + optional("javax.xml.bind:jaxb-api:2.3.1") testCompile("javax.inject:javax.inject-tck:1") testCompile("javax.servlet:javax.servlet-api:4.0.1") testCompile("javax.validation:validation-api:1.1.0.Final") diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle index dbe9bab4f2..0d17c262c3 100644 --- a/spring-orm/spring-orm.gradle +++ b/spring-orm/spring-orm.gradle @@ -13,5 +13,5 @@ dependencies { optional("javax.servlet:javax.servlet-api:3.1.0") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") - testRuntime("javax.xml.bind:jaxb-api:2.3.0") + testRuntime("javax.xml.bind:jaxb-api:2.3.1") } diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle index 9b667486fb..b401ac6be0 100644 --- a/spring-oxm/spring-oxm.gradle +++ b/spring-oxm/spring-oxm.gradle @@ -10,10 +10,10 @@ dependencies { castor "org.codehaus.castor:castor-anttasks:1.4.1" jibx "org.jibx:jibx-bind:1.3.1" jibx "org.apache.bcel:bcel:6.0" - xjc "javax.xml.bind:jaxb-api:2.3.0" + xjc "javax.xml.bind:jaxb-api:2.3.1" xjc "com.sun.xml.bind:jaxb-core:2.3.0.1" xjc "com.sun.xml.bind:jaxb-impl:2.3.0.1" - xjc "com.sun.xml.bind:jaxb-xjc:2.2.11" // 2.3.0 breaks with "xjc failed" + xjc "com.sun.xml.bind:jaxb-xjc:2.3.1" xjc "com.sun.activation:javax.activation:1.2.0" } @@ -98,7 +98,7 @@ task genJaxb { dependencies { compile(project(":spring-beans")) compile(project(":spring-core")) - optional("javax.xml.bind:jaxb-api:2.3.0") + optional("javax.xml.bind:jaxb-api:2.3.1") optional("javax.activation:javax.activation-api:1.2.0") optional("org.codehaus.castor:castor-xml:1.4.1") { exclude group: "stax", module: "stax-api" diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 1798ad2c9b..b088b56efc 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -26,7 +26,7 @@ dependencies { optional("javax.servlet:javax.servlet-api:4.0.1") optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02") optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1") - optional("javax.xml.bind:jaxb-api:2.3.0") + optional("javax.xml.bind:jaxb-api:2.3.1") optional("javax.websocket:javax.websocket-api:1.1") optional("junit:junit:4.12") optional("org.junit.jupiter:junit-jupiter-api") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 3c4d18f44e..63c4b8beab 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -21,8 +21,8 @@ dependencies { optional("javax.json.bind:javax.json.bind-api:1.0") optional("javax.mail:javax.mail-api:1.6.2") optional("javax.validation:validation-api:1.1.0.Final") - optional("javax.xml.bind:jaxb-api:2.3.0") - optional("javax.xml.ws:jaxws-api:2.3.0") + optional("javax.xml.bind:jaxb-api:2.3.1") + optional("javax.xml.ws:jaxws-api:2.3.1") optional("org.glassfish.main:javax.jws:4.0-b33") optional("io.reactivex:rxjava:${rxjavaVersion}") optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}") @@ -38,7 +38,7 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet-api" } optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.1") - optional("com.squareup.okhttp3:okhttp:3.11.0") + optional("com.squareup.okhttp3:okhttp:3.12.0") optional("org.apache.httpcomponents:httpclient:4.5.6") { exclude group: "commons-logging", module: "commons-logging" } @@ -47,7 +47,7 @@ dependencies { } optional("commons-fileupload:commons-fileupload:1.3.3") optional("org.synchronoss.cloud:nio-multipart-parser:1.1.0") - optional("com.fasterxml.woodstox:woodstox-core:5.1.0") { // woodstox before aalto + optional("com.fasterxml.woodstox:woodstox-core:5.2.0") { // woodstox before aalto exclude group: "stax", module: "stax-api" } optional("com.fasterxml:aalto-xml:1.1.1") @@ -74,7 +74,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.11.0") + testCompile("com.squareup.okhttp3:mockwebserver:3.12.0") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.xmlunit:xmlunit-matchers:2.6.2") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index ccec0fa4c2..23ae670a53 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -40,7 +40,7 @@ dependencies { optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("com.google.protobuf:protobuf-java-util:3.6.1") - testCompile("javax.xml.bind:jaxb-api:2.3.0") + testCompile("javax.xml.bind:jaxb-api:2.3.1") testCompile("com.fasterxml:aalto-xml:1.1.1") testCompile("org.hibernate:hibernate-validator:6.0.13.Final") testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}" @@ -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.1") - testCompile("com.squareup.okhttp3:mockwebserver:3.11.0") + testCompile("com.squareup.okhttp3:mockwebserver:3.12.0") 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 6e7963a3eb..2046a0649a 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -20,7 +20,7 @@ dependencies { optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02") 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("javax.xml.bind:jaxb-api:2.3.1") optional("org.webjars:webjars-locator-core:0.35") optional("com.rometools:rome:1.11.1") optional("com.github.librepdf:openpdf:1.2.5")