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

4
build.gradle
View File

@ -49,6 +49,7 @@ configure(allprojects) { project ->
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.interceptorApiVersion = "1.2"
ext.jackson2Version = "2.8.0" ext.jackson2Version = "2.8.0"
ext.javamailVersion = "1.5.5" ext.javamailVersion = "1.5.5"
ext.jcaVersion = "1.7" ext.jcaVersion = "1.7"
@ -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