GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Upgrade to Netty 4.1.33, Undertow 1.4.27, Hibernate ORM 5.2.18/5.1.17 

Includes consistent upgrade to Rome 1.12.
pull/22521/head
Juergen Hoeller 7 years ago
parent
25e9f0fad1
commit
e7dbae84a5
4 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      build.gradle
  2. 2
      spring-orm/spring-orm.gradle
  3. 4
      spring-test/spring-test.gradle
  4. 2
      spring-web/spring-web.gradle

6
build.gradle
Unescape View File

@ -47,7 +47,7 @@ ext {
junitVintageVersion = "4.12.3" junitVintageVersion = "4.12.3"
kotlinVersion = "1.2.71" kotlinVersion = "1.2.71"
log4jVersion = "2.11.1" log4jVersion = "2.11.1"
nettyVersion = "4.1.32.Final" nettyVersion = "4.1.33.Final"
reactorVersion = "Bismuth-SR15" reactorVersion = "Bismuth-SR15"
rxjavaVersion = "1.3.8" rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1" rxjavaAdapterVersion = "1.2.1"
@ -55,7 +55,7 @@ ext {
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8" tiles3Version = "3.0.8"
tomcatVersion = "8.5.37" tomcatVersion = "8.5.37"
undertowVersion = "1.4.26.Final" undertowVersion = "1.4.27.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle" gradleScriptDir = "${rootProject.projectDir}/gradle"
withoutJclOverSlf4J = { withoutJclOverSlf4J = {
@ -281,7 +281,7 @@ configure(rootProject) {
testCompile("javax.servlet:javax.servlet-api:3.1.0") testCompile("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-core:5.1.16.Final") testCompile("org.hibernate:hibernate-core:5.1.17.Final")
} }
artifacts { artifacts {

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

@ -9,7 +9,7 @@ dependencies {
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-web")) optional(project(":spring-web"))
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.3") optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.3")
optional("org.hibernate:hibernate-core:5.2.17.Final") optional("org.hibernate:hibernate-core:5.2.18.Final")
optional("javax.servlet:javax.servlet-api:3.1.0") optional("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")

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

@ -59,14 +59,14 @@ dependencies {
testCompile("javax.ejb:javax.ejb-api:3.2") testCompile("javax.ejb:javax.ejb-api:3.2")
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.17.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.14.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}")
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
testCompile("com.thoughtworks.xstream:xstream:1.4.10") testCompile("com.thoughtworks.xstream:xstream:1.4.10")
testCompile("com.rometools:rome:1.9.0") testCompile("com.rometools:rome:1.12.0")
testCompile("org.apache.tiles:tiles-api:${tiles3Version}") testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
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)

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

@ -56,7 +56,7 @@ dependencies {
optional("com.google.code.gson:gson:2.8.5") optional("com.google.code.gson:gson:2.8.5")
optional("com.google.protobuf:protobuf-java-util:3.5.1") optional("com.google.protobuf:protobuf-java-util:3.5.1")
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4") optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
optional("com.rometools:rome:1.9.0") optional("com.rometools:rome:1.12.0")
optional("com.caucho:hessian:4.0.51") optional("com.caucho:hessian:4.0.51")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")

Write Preview
Loading…
Cancel
Save