root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Juergen Hoeller 2019-04-25 14:32:37 +02:00
parent 168a5159b8
commit 42fda0ba15
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -33,18 +33,18 @@ ext {
groovyVersion = "2.5.6" groovyVersion = "2.5.6"
hsqldbVersion = "2.4.1" hsqldbVersion = "2.4.1"
jackson2Version = "2.9.8" jackson2Version = "2.9.8"
jettyVersion = "9.4.15.v20190215" jettyVersion = "9.4.17.v20190418"
junit5Version = "5.3.2" junit5Version = "5.3.2"
kotlinVersion = "1.2.71" kotlinVersion = "1.2.71"
log4jVersion = "2.11.2" log4jVersion = "2.11.2"
nettyVersion = "4.1.34.Final" nettyVersion = "4.1.35.Final"
reactorVersion = "Californium-BUILD-SNAPSHOT" reactorVersion = "Californium-BUILD-SNAPSHOT"
rxjavaVersion = "1.3.8" rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1" rxjavaAdapterVersion = "1.2.1"
rxjava2Version = "2.2.8" rxjava2Version = "2.2.8"
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8" tiles3Version = "3.0.8"
tomcatVersion = "9.0.17" tomcatVersion = "9.0.19"
undertowVersion = "2.0.20.Final" undertowVersion = "2.0.20.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle" gradleScriptDir = "${rootProject.projectDir}/gradle"

2
spring-orm/spring-orm.gradle
View File

@ -9,7 +9,7 @@ dependencies {
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-web")) optional(project(":spring-web"))
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.4") optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.4")
optional("org.hibernate:hibernate-core:5.3.9.Final") optional("org.hibernate:hibernate-core:5.3.10.Final")
optional("javax.servlet:javax.servlet-api:3.1.0") optional("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")

4
spring-web/spring-web.gradle
View File

@ -38,7 +38,7 @@ dependencies {
exclude group: "javax.servlet", module: "javax.servlet-api" exclude group: "javax.servlet", module: "javax.servlet-api"
} }
optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
optional("com.squareup.okhttp3:okhttp:3.14.0") optional("com.squareup.okhttp3:okhttp:3.14.1")
optional("org.apache.httpcomponents:httpclient:4.5.8") { optional("org.apache.httpcomponents:httpclient:4.5.8") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
@ -75,7 +75,7 @@ dependencies {
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.0") testCompile("com.squareup.okhttp3:mockwebserver:3.14.1")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.skyscreamer:jsonassert:1.5.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2") testCompile("org.xmlunit:xmlunit-matchers:2.6.2")

2
spring-webflux/spring-webflux.gradle
View File

@ -51,7 +51,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.0") testCompile("com.squareup.okhttp3:mockwebserver:3.14.1")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")