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

Upgrade to Tomcat 8.5.31, Undertow 1.4.25, Jetty 9.4.10, Gson 2.8.4 

Includes upgrade from Reactor snapshots to Bismuth SR9.
This commit is contained in:
Juergen Hoeller 2018-05-05 13:17:44 +02:00
parent f6275e009b
commit 9f9481ec7b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@ -46,21 +46,21 @@ configure(allprojects) { project ->
ext.groovyVersion = "2.4.15"
ext.hsqldbVersion = "2.4.0"
ext.jackson2Version = "2.9.5"
ext.jettyVersion = "9.4.9.v20180320"
ext.jettyVersion = "9.4.10.v20180503"
ext.junitJupiterVersion = "5.0.3"
ext.junitPlatformVersion = "1.0.3"
ext.junitVintageVersion = "4.12.3"
ext.kotlinVersion = "1.2.41"
ext.log4jVersion = "2.11.0"
ext.nettyVersion = "4.1.24.Final"
ext.reactorVersion = "Bismuth-BUILD-SNAPSHOT"
ext.reactorVersion = "Bismuth-SR9"
ext.rxjavaVersion = "1.3.8"
ext.rxjavaAdapterVersion = "1.2.1"
ext.rxjava2Version = "2.1.13"
ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
ext.tiles3Version = "3.0.8"
ext.tomcatVersion = "8.5.30"
ext.undertowVersion = "1.4.24.Final"
ext.tomcatVersion = "8.5.31"
ext.undertowVersion = "1.4.25.Final"
ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
@ -139,7 +139,6 @@ configure(allprojects) { project ->
repositories {
maven { url "https://repo.spring.io/libs-release" }
maven { url "https://repo.spring.io/snapshot" } // for Reactor
}
dependencies {

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

@ -60,7 +60,7 @@ dependencies {
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}")
optional("com.google.code.gson:gson:2.8.2")
optional("com.google.code.gson:gson:2.8.4")
optional("com.google.protobuf:protobuf-java-util:3.5.1")
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
optional("com.rometools:rome:1.9.0")