Merge branch '5.1.x'
This commit is contained in:
commit
ea51270895
|
@ -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.15.Final")
|
||||
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
|
||||
testCompile("javax.annotation:javax.annotation-api:1.3.2")
|
||||
testRuntime("org.ehcache:jcache:1.0.1")
|
||||
testRuntime("org.ehcache:ehcache:3.4.0")
|
||||
|
|
|
@ -7,7 +7,7 @@ dependencies {
|
|||
optional(project(":spring-context")) // for JndiDataSourceLookup
|
||||
optional("javax.transaction:javax.transaction-api:1.3")
|
||||
optional("org.hsqldb:hsqldb:${hsqldbVersion}")
|
||||
optional("com.h2database:h2:1.4.198")
|
||||
optional("com.h2database:h2:1.4.199")
|
||||
optional("org.apache.derby:derby:10.14.2.0")
|
||||
optional("org.apache.derby:derbyclient:10.14.2.0")
|
||||
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
|
||||
|
|
|
@ -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.15.Final")
|
||||
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
|
||||
// Enable use of the JUnit Platform Runner
|
||||
testCompile("org.junit.platform:junit-platform-runner")
|
||||
testCompile("org.junit.jupiter:junit-jupiter-params")
|
||||
|
|
|
@ -45,7 +45,7 @@ dependencies {
|
|||
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}")
|
||||
testCompile("javax.xml.bind:jaxb-api:2.3.1")
|
||||
testCompile("com.fasterxml:aalto-xml:1.1.1")
|
||||
testCompile("org.hibernate:hibernate-validator:6.0.15.Final")
|
||||
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
|
||||
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
|
||||
testCompile("io.projectreactor:reactor-test")
|
||||
testCompile("io.undertow:undertow-core:${undertowVersion}")
|
||||
|
|
|
@ -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.15.Final")
|
||||
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
|
||||
testCompile("io.projectreactor:reactor-core")
|
||||
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
|
||||
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
|
||||
|
|
Loading…
Reference in New Issue