Skip to content

Commit c4cdb98

Browse files
committed
Upgrade to Tomcat 8.5.43, Jetty 9.4.19, Netty 4.1.37
Includes Hibernate Validator 6.0.17 and renames "withoutJclOverSlf4j".
1 parent 5291258 commit c4cdb98

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,24 @@ ext {
4141
groovyVersion = "2.4.17"
4242
hsqldbVersion = "2.4.1"
4343
jackson2Version = "2.9.9"
44-
jettyVersion = "9.4.18.v20190429"
44+
jettyVersion = "9.4.19.v20190610"
4545
junitJupiterVersion = "5.0.3"
4646
junitPlatformVersion = "1.0.3"
4747
junitVintageVersion = "4.12.3"
4848
kotlinVersion = "1.2.71"
4949
log4jVersion = "2.11.2"
50-
nettyVersion = "4.1.36.Final"
50+
nettyVersion = "4.1.37.Final"
5151
reactorVersion = "Bismuth-SR17"
5252
rxjavaVersion = "1.3.8"
5353
rxjavaAdapterVersion = "1.2.1"
5454
rxjava2Version = "2.1.17"
5555
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
5656
tiles3Version = "3.0.8"
57-
tomcatVersion = "8.5.42"
57+
tomcatVersion = "8.5.43"
5858
undertowVersion = "1.4.27.Final"
5959

6060
gradleScriptDir = "${rootProject.projectDir}/gradle"
61-
withoutJclOverSlf4J = {
61+
withoutJclOverSlf4j = {
6262
exclude group: "org.slf4j", module: "jcl-over-slf4j"
6363
}
6464
}

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.16.Final")
19+
testCompile("org.hibernate:hibernate-validator:6.0.17.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ 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.18.Final")
63-
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
63+
testCompile("org.hibernate:hibernate-validator:6.0.17.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}")
6767
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
6868
testCompile("com.thoughtworks.xstream:xstream:1.4.10")
6969
testCompile("com.rometools:rome:1.12.0")
7070
testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
71-
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
72-
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
71+
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j)
72+
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j)
7373
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
7474
testCompile("org.apache.httpcomponents:httpclient:4.5.9") {
7575
exclude group: "commons-logging", module: "commons-logging"

spring-webflux/spring-webflux.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ 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.16.Final")
43+
testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
4444
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
4545
testCompile("io.projectreactor:reactor-test")
4646
testCompile("io.undertow:undertow-core:${undertowVersion}")

spring-webmvc/spring-webmvc.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ dependencies {
2929
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
3030
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
3131
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}")
32-
optional("org.apache.tiles:tiles-api:${tiles3Version}", withoutJclOverSlf4J)
33-
optional("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
34-
optional("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
35-
optional("org.apache.tiles:tiles-jsp:${tiles3Version}", withoutJclOverSlf4J)
36-
optional("org.apache.tiles:tiles-el:${tiles3Version}", withoutJclOverSlf4J)
32+
optional("org.apache.tiles:tiles-api:${tiles3Version}", withoutJclOverSlf4j)
33+
optional("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j)
34+
optional("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j)
35+
optional("org.apache.tiles:tiles-jsp:${tiles3Version}", withoutJclOverSlf4j)
36+
optional("org.apache.tiles:tiles-el:${tiles3Version}", withoutJclOverSlf4j)
3737
optional("org.apache.tiles:tiles-extras:${tiles3Version}") {
3838
exclude group: "org.springframework", module: "spring-web"
3939
exclude group: "org.slf4j", module: "jcl-over-slf4j"
@@ -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.16.Final")
68+
testCompile("org.hibernate:hibernate-validator:6.0.17.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)