root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Upgrade to Hibernate ORM 5.2.2 and Undertow 1.4 GA / XNIO 3.4

This commit is contained in:
Juergen Hoeller 2016-08-08 16:01:02 +02:00
parent 36143692ac
commit 526ce28ef0
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build.gradle
View File

@ -47,7 +47,7 @@ configure(allprojects) { project ->
ext.groovyVersion = "2.4.7"
ext.gsonVersion = "2.7"
ext.hamcrestVersion = "1.3"
ext.hibernate5Version = "5.2.1.Final"
ext.hibernate5Version = "5.2.2.Final"
ext.hibval5Version = "5.2.4.Final"
ext.hsqldbVersion = "2.3.4"
ext.httpasyncVersion = "4.1.2"
@ -87,10 +87,11 @@ configure(allprojects) { project ->
ext.tiles3Version = "3.0.5"
ext.tomcatVersion = "8.5.4"
ext.tyrusVersion = "1.13"
ext.undertowVersion = "1.4.0.CR4"
ext.undertowVersion = "1.4.0.Final"
ext.websocketVersion = "1.1"
ext.woodstoxVersion = "5.0.2"
ext.xmlunitVersion = "2.2.1"
ext.xnioVersion = "3.4.0.Final"
ext.xstreamVersion = "1.4.9"
ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
@ -712,7 +713,7 @@ project("spring-web") {
}
optional("io.reactivex:rxjava:${rxjavaVersion}")
optional("io.undertow:undertow-core:${undertowVersion}")
optional("org.jboss.xnio:xnio-api:3.3.7.Final")
optional("org.jboss.xnio:xnio-api:${xnioVersion}")
optional("io.netty:netty-buffer:${nettyVersion}") // Temporarily for JsonObjectDecoder
optional("com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}") { // woodstox before aalto
exclude group: "stax", module: "stax-api"
@ -756,7 +757,7 @@ project("spring-web") {
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
testRuntime("org.jboss.xnio:xnio-nio:3.3.7.Final")
testRuntime("org.jboss.xnio:xnio-nio:${xnioVersion}")
testRuntime("org.jboss.logging:jboss-logging:3.3.0.Final")
}
}
@ -774,7 +775,7 @@ project("spring-web-reactive") {
optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
optional("org.freemarker:freemarker:${freemarkerVersion}")
optional "org.apache.httpcomponents:httpclient:4.5.1" // Needed to run Javadoc without error
optional "org.apache.httpcomponents:httpclient:${httpclientVersion}"
testCompile("javax.validation:validation-api:${beanvalVersion}")
testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
@ -786,14 +787,14 @@ project("spring-web-reactive") {
}
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
testCompile("io.undertow:undertow-core:${undertowVersion}")
testCompile("org.jboss.xnio:xnio-api:3.3.7.Final")
testCompile("org.jboss.xnio:xnio-api:${xnioVersion}")
testCompile("com.fasterxml:aalto-xml:1.0.0")
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
testRuntime("javax.activation:activation:${activationApiVersion}")
testRuntime("org.jboss.xnio:xnio-nio:3.3.7.Final")
testRuntime("org.jboss.xnio:xnio-nio:${xnioVersion}")
testRuntime("org.jboss.logging:jboss-logging:3.3.0.Final")
}
}
@ -934,7 +935,7 @@ project("spring-websocket") {
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
}
optional("org.jboss.xnio:xnio-api:3.3.7.Final")
optional("org.jboss.xnio:xnio-api:${xnioVersion}")
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
@ -944,7 +945,7 @@ project("spring-websocket") {
testCompile("io.projectreactor:reactor-net:${reactorVersion}")
testCompile("io.netty:netty-all:${nettyVersion}")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
testRuntime("org.jboss.xnio:xnio-nio:3.3.7.Final")
testRuntime("org.jboss.xnio:xnio-nio:${xnioVersion}")
testRuntime("org.jboss.logging:jboss-logging:3.3.0.Final")
}
}