Skip to content

Commit 42fda0b

Browse files
committed
Upgrade to Tomcat 9.0.19, Jetty 9.4.17, Netty 4.1.35, OkHttp 3.14.1
Includes upgrade to Hibernate ORM 5.3.10 (for branch 5.1.x)
1 parent 168a515 commit 42fda0b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ ext {
3333
groovyVersion = "2.5.6"
3434
hsqldbVersion = "2.4.1"
3535
jackson2Version = "2.9.8"
36-
jettyVersion = "9.4.15.v20190215"
36+
jettyVersion = "9.4.17.v20190418"
3737
junit5Version = "5.3.2"
3838
kotlinVersion = "1.2.71"
3939
log4jVersion = "2.11.2"
40-
nettyVersion = "4.1.34.Final"
40+
nettyVersion = "4.1.35.Final"
4141
reactorVersion = "Californium-BUILD-SNAPSHOT"
4242
rxjavaVersion = "1.3.8"
4343
rxjavaAdapterVersion = "1.2.1"
4444
rxjava2Version = "2.2.8"
4545
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
4646
tiles3Version = "3.0.8"
47-
tomcatVersion = "9.0.17"
47+
tomcatVersion = "9.0.19"
4848
undertowVersion = "2.0.20.Final"
4949

5050
gradleScriptDir = "${rootProject.projectDir}/gradle"

spring-orm/spring-orm.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
optional(project(":spring-context"))
1010
optional(project(":spring-web"))
1111
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.4")
12-
optional("org.hibernate:hibernate-core:5.3.9.Final")
12+
optional("org.hibernate:hibernate-core:5.3.10.Final")
1313
optional("javax.servlet:javax.servlet-api:3.1.0")
1414
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
1515
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")

spring-web/spring-web.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
exclude group: "javax.servlet", module: "javax.servlet-api"
3939
}
4040
optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
41-
optional("com.squareup.okhttp3:okhttp:3.14.0")
41+
optional("com.squareup.okhttp3:okhttp:3.14.1")
4242
optional("org.apache.httpcomponents:httpclient:4.5.8") {
4343
exclude group: "commons-logging", module: "commons-logging"
4444
}
@@ -75,7 +75,7 @@ dependencies {
7575
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
7676
testCompile("org.eclipse.jetty:jetty-server")
7777
testCompile("org.eclipse.jetty:jetty-servlet")
78-
testCompile("com.squareup.okhttp3:mockwebserver:3.14.0")
78+
testCompile("com.squareup.okhttp3:mockwebserver:3.14.1")
7979
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
8080
testCompile("org.skyscreamer:jsonassert:1.5.0")
8181
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")

spring-webflux/spring-webflux.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
testCompile("org.eclipse.jetty:jetty-server")
5252
testCompile("org.eclipse.jetty:jetty-servlet")
5353
testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
54-
testCompile("com.squareup.okhttp3:mockwebserver:3.14.0")
54+
testCompile("com.squareup.okhttp3:mockwebserver:3.14.1")
5555
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
5656
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
5757
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")

0 commit comments

Comments
 (0)