mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-17 16:39:29 +00:00
Upgrade to Hibernate Validator 5.4.3 and 6.0.15
Includes Apache HttpClient 4.5.7 and Jetty 9.4.15.
This commit is contained in:
+1
-1
@@ -41,7 +41,7 @@ ext {
|
|||||||
groovyVersion = "2.4.16"
|
groovyVersion = "2.4.16"
|
||||||
hsqldbVersion = "2.4.1"
|
hsqldbVersion = "2.4.1"
|
||||||
jackson2Version = "2.9.8"
|
jackson2Version = "2.9.8"
|
||||||
jettyVersion = "9.4.14.v20181114"
|
jettyVersion = "9.4.15.v20190215"
|
||||||
junitJupiterVersion = "5.0.3"
|
junitJupiterVersion = "5.0.3"
|
||||||
junitPlatformVersion = "1.0.3"
|
junitPlatformVersion = "1.0.3"
|
||||||
junitVintageVersion = "4.12.3"
|
junitVintageVersion = "4.12.3"
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ dependencies {
|
|||||||
optional("org.freemarker:freemarker:${freemarkerVersion}")
|
optional("org.freemarker:freemarker:${freemarkerVersion}")
|
||||||
testCompile(project(":spring-context"))
|
testCompile(project(":spring-context"))
|
||||||
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
|
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")
|
testCompile("javax.annotation:javax.annotation-api:1.3.2")
|
||||||
testRuntime("org.ehcache:jcache:1.0.1")
|
testRuntime("org.ehcache:jcache:1.0.1")
|
||||||
testRuntime("org.ehcache:ehcache:3.4.0")
|
testRuntime("org.ehcache:ehcache:3.4.0")
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ dependencies {
|
|||||||
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
|
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
|
||||||
optional("org.beanshell:bsh:2.0b5")
|
optional("org.beanshell:bsh:2.0b5")
|
||||||
optional("joda-time:joda-time:2.9.9")
|
optional("joda-time:joda-time:2.9.9")
|
||||||
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-reflect:${kotlinVersion}")
|
||||||
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
|
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
|
||||||
testCompile("org.apache.commons:commons-pool2:2.5.0")
|
testCompile("org.apache.commons:commons-pool2:2.5.0")
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ dependencies {
|
|||||||
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
|
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
|
||||||
testCompile("javax.mail:javax.mail-api:1.6.1")
|
testCompile("javax.mail:javax.mail-api:1.6.1")
|
||||||
testCompile("org.hibernate:hibernate-core:5.2.18.Final")
|
testCompile("org.hibernate:hibernate-core:5.2.18.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
|
// Enable use of the JUnit Platform Runner
|
||||||
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
|
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
|
||||||
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
|
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
|
||||||
@@ -71,7 +71,7 @@ dependencies {
|
|||||||
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
|
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
|
||||||
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
|
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
|
||||||
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
|
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
|
||||||
testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
|
testCompile("org.apache.httpcomponents:httpclient:4.5.7") {
|
||||||
exclude group: "commons-logging", module: "commons-logging"
|
exclude group: "commons-logging", module: "commons-logging"
|
||||||
}
|
}
|
||||||
testCompile("io.projectreactor.ipc:reactor-netty")
|
testCompile("io.projectreactor.ipc:reactor-netty")
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ dependencies {
|
|||||||
exclude group: "javax.servlet", module: "javax.servlet-api"
|
exclude group: "javax.servlet", module: "javax.servlet-api"
|
||||||
}
|
}
|
||||||
optional("com.squareup.okhttp3:okhttp:3.12.1")
|
optional("com.squareup.okhttp3:okhttp:3.12.1")
|
||||||
optional("org.apache.httpcomponents:httpclient:4.5.6") {
|
optional("org.apache.httpcomponents:httpclient:4.5.7") {
|
||||||
exclude group: "commons-logging", module: "commons-logging"
|
exclude group: "commons-logging", module: "commons-logging"
|
||||||
}
|
}
|
||||||
optional("org.apache.httpcomponents:httpasyncclient:4.1.4") {
|
optional("org.apache.httpcomponents:httpasyncclient:4.1.4") {
|
||||||
|
|||||||
@@ -33,14 +33,14 @@ dependencies {
|
|||||||
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
|
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
|
||||||
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
|
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
|
||||||
}
|
}
|
||||||
optional("org.apache.httpcomponents:httpclient:4.5.6") {
|
optional("org.apache.httpcomponents:httpclient:4.5.7") {
|
||||||
exclude group: "commons-logging", module: "commons-logging"
|
exclude group: "commons-logging", module: "commons-logging"
|
||||||
}
|
}
|
||||||
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
|
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
|
||||||
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
|
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
|
||||||
testCompile("javax.xml.bind:jaxb-api:2.3.0")
|
testCompile("javax.xml.bind:jaxb-api:2.3.0")
|
||||||
testCompile("com.fasterxml:aalto-xml:1.0.0")
|
testCompile("com.fasterxml:aalto-xml:1.0.0")
|
||||||
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.reactivex.rxjava2:rxjava:${rxjava2Version}"
|
||||||
testCompile("io.projectreactor:reactor-test")
|
testCompile("io.projectreactor:reactor-test")
|
||||||
testCompile("io.undertow:undertow-core:${undertowVersion}")
|
testCompile("io.undertow:undertow-core:${undertowVersion}")
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ dependencies {
|
|||||||
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {
|
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {
|
||||||
exclude group: "javax.servlet", module: "javax.servlet"
|
exclude group: "javax.servlet", module: "javax.servlet"
|
||||||
}
|
}
|
||||||
testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
|
testCompile("org.apache.httpcomponents:httpclient:4.5.7") {
|
||||||
exclude group: "commons-logging", module: "commons-logging"
|
exclude group: "commons-logging", module: "commons-logging"
|
||||||
}
|
}
|
||||||
testCompile("commons-fileupload:commons-fileupload:1.3.3")
|
testCompile("commons-fileupload:commons-fileupload:1.3.3")
|
||||||
@@ -65,7 +65,7 @@ dependencies {
|
|||||||
exclude group: "xerces", module: "xercesImpl"
|
exclude group: "xerces", module: "xercesImpl"
|
||||||
}
|
}
|
||||||
testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
|
testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
|
||||||
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.projectreactor:reactor-core")
|
||||||
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
|
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
|
||||||
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
|
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
|
||||||
|
|||||||
Reference in New Issue
Block a user