Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2019-06-22 17:11:31 +02:00
parent 21267e56b7 29dcd19971
commit e2d01bb783
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -28,13 +28,13 @@ ext {
(it.name != "spring-build-src") && (it.name != "spring-framework-bom") && (it.name != "spring-core-coroutines")
}
aspectjVersion = "1.9.3"
aspectjVersion = "1.9.4"
coroutinesVersion = "1.2.1"
freemarkerVersion = "2.3.28"
groovyVersion = "2.5.7"
hsqldbVersion = "2.4.1"
jackson2Version = "2.9.9"
jettyVersion = "9.4.18.v20190429"
jettyVersion = "9.4.19.v20190610"
junit5Version = "5.5.0-RC2"
kotlinVersion = "1.3.40"
log4jVersion = "2.11.2"
@@ -43,14 +43,14 @@ ext {
rsocketVersion = "0.12.2-RC4"
rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1"
rxjava2Version = "2.2.9"
rxjava2Version = "2.2.10"
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8"
tomcatVersion = "9.0.21"
undertowVersion = "2.0.21.Final"
undertowVersion = "2.0.22.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle"
withoutJclOverSlf4J = {
withoutJclOverSlf4j = {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
}