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

Fix EJB dependency upgrade

This commit is contained in:
Stephane Nicoll 2016-07-18 14:51:03 +02:00
parent cd6b5f9be0
commit 03e6eeeadc
1 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
build.gradle
View File

@ -31,58 +31,59 @@ configure(allprojects) { project ->
group = "org.springframework" group = "org.springframework"
version = qualifyVersionIfNecessary(version) version = qualifyVersionIfNecessary(version)
ext.aspectjVersion = "1.8.9" ext.aspectjVersion = "1.8.9"
ext.beanvalVersion = "1.1.0.Final" ext.beanvalVersion = "1.1.0.Final"
ext.caffeineVersion = "2.3.1" ext.caffeineVersion = "2.3.1"
ext.eclipselinkVersion = "2.6.3" ext.eclipselinkVersion = "2.6.3"
ext.ehcacheVersion = "2.10.2" ext.ehcacheVersion = "2.10.2"
ext.ehcachejcacheVersion = "1.0.1" ext.ehcachejcacheVersion = "1.0.1"
ext.ehcache3Version = "3.1.0" ext.ehcache3Version = "3.1.0"
ext.ejbVersion = "3.2" ext.ejbVersion = "3.2"
ext.fileuploadVersion = "1.3.2" ext.fileuploadVersion = "1.3.2"
ext.freemarkerVersion = "2.3.23" ext.freemarkerVersion = "2.3.23"
ext.groovyVersion = "2.4.7" ext.groovyVersion = "2.4.7"
ext.gsonVersion = "2.7" ext.gsonVersion = "2.7"
ext.hamcrestVersion = "1.3" ext.hamcrestVersion = "1.3"
ext.hibernate5Version = "5.2.1.Final" ext.hibernate5Version = "5.2.1.Final"
ext.hibval5Version = "5.2.4.Final" ext.hibval5Version = "5.2.4.Final"
ext.hsqldbVersion = "2.3.4" ext.hsqldbVersion = "2.3.4"
ext.httpasyncVersion = "4.1.2" ext.httpasyncVersion = "4.1.2"
ext.httpclientVersion = "4.5.2" ext.httpclientVersion = "4.5.2"
ext.jackson2Version = "2.8.0" ext.interceptorApiVersion = "1.2"
ext.javamailVersion = "1.5.5" ext.jackson2Version = "2.8.0"
ext.jcaVersion = "1.7" ext.javamailVersion = "1.5.5"
ext.jettyVersion = "9.3.10.v20160621" ext.jcaVersion = "1.7"
ext.jodaVersion = "2.9.4" ext.jettyVersion = "9.3.10.v20160621"
ext.jpaVersion = "2.1.1" ext.jodaVersion = "2.9.4"
ext.jspVersion = "2.3.2-b02" ext.jpaVersion = "2.1.1"
ext.jtaVersion = "1.2" ext.jspVersion = "2.3.2-b02"
ext.junitVersion = "4.12" ext.jtaVersion = "1.2"
ext.junitJupiterVersion = '5.0.0-M1' ext.junitVersion = "4.12"
ext.junitPlatformVersion = '1.0.0-M1' ext.junitJupiterVersion = '5.0.0-M1'
ext.log4jVersion = '2.6.1' ext.junitPlatformVersion = '1.0.0-M1'
ext.nettyVersion = "4.1.3.Final" ext.log4jVersion = '2.6.1'
ext.okhttpVersion = "2.7.5" ext.nettyVersion = "4.1.3.Final"
ext.okhttp3Version = "3.3.1" ext.okhttpVersion = "2.7.5"
ext.poiVersion = "3.14" ext.okhttp3Version = "3.3.1"
ext.reactorVersion = "2.0.8.RELEASE" ext.poiVersion = "3.14"
ext.reactorCoreVersion = '3.0.0.BUILD-SNAPSHOT' ext.reactorVersion = "2.0.8.RELEASE"
ext.reactorNettyVersion = '0.5.0.BUILD-SNAPSHOT' ext.reactorCoreVersion = '3.0.0.BUILD-SNAPSHOT'
ext.rxJavaVersion = '1.1.6' ext.reactorNettyVersion = '0.5.0.BUILD-SNAPSHOT'
ext.romeVersion = "1.6.0" ext.rxJavaVersion = '1.1.6'
ext.servletVersion = "3.1.0" ext.romeVersion = "1.6.0"
ext.slf4jVersion = "1.7.21" ext.servletVersion = "3.1.0"
ext.snakeyamlVersion = "1.17" ext.slf4jVersion = "1.7.21"
ext.snifferVersion = "1.15" ext.snakeyamlVersion = "1.17"
ext.testngVersion = "6.9.10" ext.snifferVersion = "1.15"
ext.tiles3Version = "3.0.5" ext.testngVersion = "6.9.10"
ext.tomcatVersion = "8.5.4" ext.tiles3Version = "3.0.5"
ext.tyrusVersion = "1.13" ext.tomcatVersion = "8.5.4"
ext.undertowVersion = "1.4.0.CR3" ext.tyrusVersion = "1.13"
ext.websocketVersion = "1.1" ext.undertowVersion = "1.4.0.CR3"
ext.woodstoxVersion = "5.0.2" ext.websocketVersion = "1.1"
ext.xmlunitVersion = "1.6" ext.woodstoxVersion = "5.0.2"
ext.xstreamVersion = "1.4.9" ext.xmlunitVersion = "1.6"
ext.xstreamVersion = "1.4.9"
ext.gradleScriptDir = "${rootProject.projectDir}/gradle" ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
@ -481,6 +482,7 @@ project("spring-context") {
optional("javax.inject:javax.inject:1") optional("javax.inject:javax.inject:1")
optional("javax.ejb:javax.ejb-api:${ejbVersion}") optional("javax.ejb:javax.ejb-api:${ejbVersion}")
optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0") optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
optional("javax.interceptor:javax.interceptor-api:${interceptorApiVersion}")
optional("javax.money:money-api:1.0") optional("javax.money:money-api:1.0")
optional("org.eclipse.persistence:javax.persistence:${jpaVersion}") optional("org.eclipse.persistence:javax.persistence:${jpaVersion}")
optional("javax.validation:validation-api:${beanvalVersion}") optional("javax.validation:validation-api:${beanvalVersion}")
@ -549,6 +551,7 @@ project("spring-tx") {
optional("javax.transaction:javax.transaction-api:${jtaVersion}") optional("javax.transaction:javax.transaction-api:${jtaVersion}")
optional("javax.resource:javax.resource-api:${jcaVersion}") optional("javax.resource:javax.resource-api:${jcaVersion}")
optional("javax.ejb:javax.ejb-api:${ejbVersion}") optional("javax.ejb:javax.ejb-api:${ejbVersion}")
optional("javax.interceptor:javax.interceptor-api:${interceptorApiVersion}")
optional("com.ibm.websphere:uow:6.0.2.17") optional("com.ibm.websphere:uow:6.0.2.17")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.eclipse.persistence:javax.persistence:${jpaVersion}") testCompile("org.eclipse.persistence:javax.persistence:${jpaVersion}")
@ -953,6 +956,7 @@ project("spring-test") {
testCompile(project(":spring-oxm")) testCompile(project(":spring-oxm"))
testCompile("javax.mail:javax.mail-api:${javamailVersion}") testCompile("javax.mail:javax.mail-api:${javamailVersion}")
testCompile("javax.ejb:javax.ejb-api:${ejbVersion}") testCompile("javax.ejb:javax.ejb-api:${ejbVersion}")
testCompile("javax.interceptor:javax.interceptor-api:${interceptorApiVersion}")
testCompile("org.hibernate:hibernate-core:${hibernate5Version}") testCompile("org.hibernate:hibernate-core:${hibernate5Version}")
testCompile("org.hibernate:hibernate-validator:${hibval5Version}") testCompile("org.hibernate:hibernate-validator:${hibval5Version}")
// Enable use of the JUnitPlatform Runner // Enable use of the JUnitPlatform Runner