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

Merge branch '5.1.x'

This commit is contained in:
Juergen Hoeller 2019-02-22 14:51:00 +01:00
parent e5a595e77d 707b8c02fe
commit 0652e4b485
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -33,7 +33,7 @@ ext {
groovyVersion = "2.5.6"
hsqldbVersion = "2.4.1"
jackson2Version = "2.9.8"
jettyVersion = "9.4.14.v20181114"
jettyVersion = "9.4.15.v20190215"
junit5Version = "5.4.0"
kotlinVersion = "1.3.21"
log4jVersion = "2.11.2"
@ -45,7 +45,7 @@ ext {
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8"
tomcatVersion = "9.0.16"
undertowVersion = "2.0.17.Final"
undertowVersion = "2.0.18.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle"
withoutJclOverSlf4J = {

2
spring-context-support/spring-context-support.gradle
View File

@ -16,7 +16,7 @@ dependencies {
optional("org.freemarker:freemarker:${freemarkerVersion}")
testCompile(project(":spring-context"))
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
testCompile("org.hibernate:hibernate-validator:6.0.15.Final")
testCompile("javax.annotation:javax.annotation-api:1.3.2")
testRuntime("org.ehcache:jcache:1.0.1")
testRuntime("org.ehcache:ehcache:3.4.0")

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

@ -20,7 +20,7 @@ dependencies {
optional("org.codehaus.groovy:groovy:${groovyVersion}")
optional("org.beanshell:bsh:2.0b5")
optional("joda-time:joda-time:2.10.1")
optional("org.hibernate:hibernate-validator:5.4.2.Final")
optional("org.hibernate:hibernate-validator:5.4.3.Final")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("org.codehaus.groovy:groovy-jsr223:${groovyVersion}")

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

@ -61,7 +61,7 @@ dependencies {
testCompile("javax.interceptor:javax.interceptor-api:1.2.2")
testCompile("javax.mail:javax.mail-api:1.6.2")
testCompile("org.hibernate:hibernate-core:5.4.1.Final")
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
testCompile("org.hibernate:hibernate-validator:6.0.15.Final")
// Enable use of the JUnit Platform Runner
testCompile("org.junit.platform:junit-platform-runner")
testCompile("org.junit.jupiter:junit-jupiter-params")

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

@ -44,7 +44,7 @@ dependencies {
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.1.1")
testCompile("javax.xml.bind:jaxb-api:2.3.1")
testCompile("com.fasterxml:aalto-xml:1.1.1")
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
testCompile("org.hibernate:hibernate-validator:6.0.15.Final")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
testCompile("io.projectreactor:reactor-test")
testCompile("io.undertow:undertow-core:${undertowVersion}")

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

@ -66,7 +66,7 @@ dependencies {
exclude group: "xerces", module: "xercesImpl"
}
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
testCompile("org.hibernate:hibernate-validator:6.0.15.Final")
testCompile("io.projectreactor:reactor-core")
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")