Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2019-06-22 17:11:31 +02:00
parent 21267e56b7 29dcd19971
commit e2d01bb783
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,11 +30,11 @@ dependencies {
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}")
optional("org.apache.tiles:tiles-api:${tiles3Version}", withoutJclOverSlf4J)
optional("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
optional("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
optional("org.apache.tiles:tiles-jsp:${tiles3Version}", withoutJclOverSlf4J)
optional("org.apache.tiles:tiles-el:${tiles3Version}", withoutJclOverSlf4J)
optional("org.apache.tiles:tiles-api:${tiles3Version}", withoutJclOverSlf4j)
optional("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j)
optional("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j)
optional("org.apache.tiles:tiles-jsp:${tiles3Version}", withoutJclOverSlf4j)
optional("org.apache.tiles:tiles-el:${tiles3Version}", withoutJclOverSlf4j)
optional("org.apache.tiles:tiles-extras:${tiles3Version}") {
exclude group: "org.springframework", module: "spring-web"
exclude group: "org.slf4j", module: "jcl-over-slf4j"
@@ -67,7 +67,7 @@ dependencies {
}
testCompile("org.xmlunit:xmlunit-assertj:2.6.2")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
testCompile("io.projectreactor:reactor-core")
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")