Skip to content

Commit 0652e4b

Browse files
committed
Merge branch '5.1.x'
2 parents e5a595e + 707b8c0 commit 0652e4b

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ext {
3333
groovyVersion = "2.5.6"
3434
hsqldbVersion = "2.4.1"
3535
jackson2Version = "2.9.8"
36-
jettyVersion = "9.4.14.v20181114"
36+
jettyVersion = "9.4.15.v20190215"
3737
junit5Version = "5.4.0"
3838
kotlinVersion = "1.3.21"
3939
log4jVersion = "2.11.2"
@@ -45,7 +45,7 @@ ext {
4545
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
4646
tiles3Version = "3.0.8"
4747
tomcatVersion = "9.0.16"
48-
undertowVersion = "2.0.17.Final"
48+
undertowVersion = "2.0.18.Final"
4949

5050
gradleScriptDir = "${rootProject.projectDir}/gradle"
5151
withoutJclOverSlf4J = {

spring-context-support/spring-context-support.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
optional("org.freemarker:freemarker:${freemarkerVersion}")
1717
testCompile(project(":spring-context"))
1818
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
19-
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
19+
testCompile("org.hibernate:hibernate-validator:6.0.15.Final")
2020
testCompile("javax.annotation:javax.annotation-api:1.3.2")
2121
testRuntime("org.ehcache:jcache:1.0.1")
2222
testRuntime("org.ehcache:ehcache:3.4.0")

spring-context/spring-context.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
optional("org.codehaus.groovy:groovy:${groovyVersion}")
2121
optional("org.beanshell:bsh:2.0b5")
2222
optional("joda-time:joda-time:2.10.1")
23-
optional("org.hibernate:hibernate-validator:5.4.2.Final")
23+
optional("org.hibernate:hibernate-validator:5.4.3.Final")
2424
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
2525
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
2626
testCompile("org.codehaus.groovy:groovy-jsr223:${groovyVersion}")

spring-test/spring-test.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161
testCompile("javax.interceptor:javax.interceptor-api:1.2.2")
6262
testCompile("javax.mail:javax.mail-api:1.6.2")
6363
testCompile("org.hibernate:hibernate-core:5.4.1.Final")
64-
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
64+
testCompile("org.hibernate:hibernate-validator:6.0.15.Final")
6565
// Enable use of the JUnit Platform Runner
6666
testCompile("org.junit.platform:junit-platform-runner")
6767
testCompile("org.junit.jupiter:junit-jupiter-params")

spring-webflux/spring-webflux.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies {
4444
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.1.1")
4545
testCompile("javax.xml.bind:jaxb-api:2.3.1")
4646
testCompile("com.fasterxml:aalto-xml:1.1.1")
47-
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
47+
testCompile("org.hibernate:hibernate-validator:6.0.15.Final")
4848
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
4949
testCompile("io.projectreactor:reactor-test")
5050
testCompile("io.undertow:undertow-core:${undertowVersion}")

spring-webmvc/spring-webmvc.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666
exclude group: "xerces", module: "xercesImpl"
6767
}
6868
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
69-
testCompile("org.hibernate:hibernate-validator:6.0.14.Final")
69+
testCompile("org.hibernate:hibernate-validator:6.0.15.Final")
7070
testCompile("io.projectreactor:reactor-core")
7171
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
7272
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")

0 commit comments

Comments
 (0)