Merge branch '5.1.x'
This commit is contained in:
@@ -36,7 +36,7 @@ ext {
|
|||||||
jettyVersion = "9.4.14.v20181114"
|
jettyVersion = "9.4.14.v20181114"
|
||||||
junit5Version = "5.4.0"
|
junit5Version = "5.4.0"
|
||||||
kotlinVersion = "1.3.21"
|
kotlinVersion = "1.3.21"
|
||||||
log4jVersion = "2.11.1"
|
log4jVersion = "2.11.2"
|
||||||
nettyVersion = "4.1.33.Final"
|
nettyVersion = "4.1.33.Final"
|
||||||
reactorVersion = "Californium-BUILD-SNAPSHOT"
|
reactorVersion = "Californium-BUILD-SNAPSHOT"
|
||||||
rxjavaVersion = "1.3.8"
|
rxjavaVersion = "1.3.8"
|
||||||
@@ -44,7 +44,7 @@ ext {
|
|||||||
rxjava2Version = "2.2.6"
|
rxjava2Version = "2.2.6"
|
||||||
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
|
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
|
||||||
tiles3Version = "3.0.8"
|
tiles3Version = "3.0.8"
|
||||||
tomcatVersion = "9.0.14"
|
tomcatVersion = "9.0.16"
|
||||||
undertowVersion = "2.0.17.Final"
|
undertowVersion = "2.0.17.Final"
|
||||||
|
|
||||||
gradleScriptDir = "${rootProject.projectDir}/gradle"
|
gradleScriptDir = "${rootProject.projectDir}/gradle"
|
||||||
|
|||||||
Reference in New Issue
Block a user