tchekai704
/
src-spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Upgrade to Tomcat 8.5.43, Jetty 9.4.19, Netty 4.1.37 

Includes Hibernate Validator 6.0.17 and renames "withoutJclOverSlf4j".
pull/29033/head
Juergen Hoeller 5 years ago
parent
529125898a
commit
c4cdb98d8d
5 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      build.gradle
  2. 2
      spring-context-support/spring-context-support.gradle
  3. 6
      spring-test/spring-test.gradle
  4. 2
      spring-webflux/spring-webflux.gradle
  5. 12
      spring-webmvc/spring-webmvc.gradle

8
build.gradle
Unescape View File

@ -41,24 +41,24 @@ ext { @@ -41,24 +41,24 @@ ext {
groovyVersion = "2.4.17"
hsqldbVersion = "2.4.1"
jackson2Version = "2.9.9"
jettyVersion = "9.4.18.v20190429"
jettyVersion = "9.4.19.v20190610"
junitJupiterVersion = "5.0.3"
junitPlatformVersion = "1.0.3"
junitVintageVersion = "4.12.3"
kotlinVersion = "1.2.71"
log4jVersion = "2.11.2"
nettyVersion = "4.1.36.Final"
nettyVersion = "4.1.37.Final"
reactorVersion = "Bismuth-SR17"
rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1"
rxjava2Version = "2.1.17"
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8"
tomcatVersion = "8.5.42"
tomcatVersion = "8.5.43"
undertowVersion = "1.4.27.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle"
withoutJclOverSlf4J = {
withoutJclOverSlf4j = {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
}

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

@ -16,7 +16,7 @@ dependencies { @@ -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.16.Final")
testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
testCompile("javax.annotation:javax.annotation-api:1.3.2")
testRuntime("org.ehcache:jcache:1.0.1")
testRuntime("org.ehcache:ehcache:3.4.0")

6
spring-test/spring-test.gradle
Unescape View File

@ -60,7 +60,7 @@ dependencies { @@ -60,7 +60,7 @@ dependencies {
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
testCompile("javax.mail:javax.mail-api:1.6.1")
testCompile("org.hibernate:hibernate-core:5.2.18.Final")
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
// Enable use of the JUnit Platform Runner
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
@ -68,8 +68,8 @@ dependencies { @@ -68,8 +68,8 @@ dependencies {
testCompile("com.thoughtworks.xstream:xstream:1.4.10")
testCompile("com.rometools:rome:1.12.0")
testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j)
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j)
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.apache.httpcomponents:httpclient:4.5.9") {
exclude group: "commons-logging", module: "commons-logging"

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

@ -40,7 +40,7 @@ dependencies { @@ -40,7 +40,7 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("javax.xml.bind:jaxb-api:2.3.0")
testCompile("com.fasterxml:aalto-xml:1.0.0")
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
testCompile("io.projectreactor:reactor-test")
testCompile("io.undertow:undertow-core:${undertowVersion}")

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

@ -29,11 +29,11 @@ dependencies { @@ -29,11 +29,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"
@ -65,7 +65,7 @@ dependencies { @@ -65,7 +65,7 @@ dependencies {
exclude group: "xerces", module: "xercesImpl"
}
testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
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}")

Write Preview
Loading…
Cancel
Save