Browse Source

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.
pull/23430/head
Juergen Hoeller 6 years ago
parent
commit
0dd87e8339
  1. 2
      build.gradle
  2. 2
      spring-context-support/spring-context-support.gradle
  3. 2
      spring-test/spring-test.gradle
  4. 6
      spring-web/spring-web.gradle
  5. 6
      spring-webflux/spring-webflux.gradle
  6. 4
      spring-webmvc/spring-webmvc.gradle

2
build.gradle

@ -54,7 +54,7 @@ ext { @@ -54,7 +54,7 @@ ext {
rxjava2Version = "2.1.17"
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8"
tomcatVersion = "8.5.35"
tomcatVersion = "8.5.37"
undertowVersion = "1.4.26.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle"

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

@ -16,7 +16,7 @@ dependencies { @@ -16,7 +16,7 @@ dependencies {
optional("org.freemarker:freemarker:${freemarkerVersion}")
testCompile(project(":spring-context"))
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
testCompile("javax.annotation:javax.annotation-api:1.3.2")
testRuntime("org.ehcache:jcache:1.0.1")
testRuntime("org.ehcache:ehcache:3.4.0")

2
spring-test/spring-test.gradle

@ -60,7 +60,7 @@ dependencies { @@ -60,7 +60,7 @@ dependencies {
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
testCompile("javax.mail:javax.mail-api:1.6.1")
testCompile("org.hibernate:hibernate-core:5.2.17.Final")
testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
// Enable use of the JUnit Platform Runner
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")

6
spring-web/spring-web.gradle

@ -36,7 +36,7 @@ dependencies { @@ -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.0")
optional("com.squareup.okhttp3:okhttp:3.12.1")
optional("org.apache.httpcomponents:httpclient:4.5.6") {
exclude group: "commons-logging", module: "commons-logging"
}
@ -72,7 +72,7 @@ dependencies { @@ -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.0")
testCompile("com.squareup.okhttp3:mockwebserver:3.12.1")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0")
testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
@ -80,5 +80,5 @@ dependencies { @@ -80,5 +80,5 @@ dependencies {
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
testRuntime("javax.json:javax.json-api:1.1.2")
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.10")
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.11")
}

6
spring-webflux/spring-webflux.gradle

@ -16,7 +16,7 @@ dependencies { @@ -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.35")
optional("org.webjars:webjars-locator-core:0.36")
optional("org.freemarker:freemarker:${freemarkerVersion}")
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
@ -40,7 +40,7 @@ dependencies { @@ -40,7 +40,7 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("javax.xml.bind:jaxb-api:2.3.0")
testCompile("com.fasterxml:aalto-xml:1.0.0")
testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
testCompile("io.projectreactor:reactor-test")
testCompile("io.undertow:undertow-core:${undertowVersion}")
@ -48,7 +48,7 @@ dependencies { @@ -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.0")
testCompile("com.squareup.okhttp3:mockwebserver:3.12.1")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")

4
spring-webmvc/spring-webmvc.gradle

@ -20,7 +20,7 @@ dependencies { @@ -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.35")
optional("org.webjars:webjars-locator-core:0.36")
optional("com.rometools:rome:1.12.0")
optional("com.github.librepdf:openpdf:1.0.5")
optional("org.apache.poi:poi-ooxml:3.17")
@ -65,7 +65,7 @@ dependencies { @@ -65,7 +65,7 @@ dependencies {
exclude group: "xerces", module: "xercesImpl"
}
testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
testCompile("io.projectreactor:reactor-core")
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")

Loading…
Cancel
Save