Upgrade framework build to JPA 2.2 and JTA 1.3
Issue: SPR-16685
This commit is contained in:
parent
f28a5d0cf7
commit
e170cb0f79
|
@ -90,7 +90,7 @@ dependencies {
|
|||
optional(project(":spring-orm")) // for JPA exception translation support
|
||||
optional(project(":spring-tx")) // for JPA, @Transactional support
|
||||
optional("javax.cache:cache-api:1.1.0") // for JCache aspect
|
||||
optional("javax.transaction:javax.transaction-api:1.2") // for @javax.transaction.Transactional support
|
||||
optional("javax.transaction:javax.transaction-api:1.3") // for @javax.transaction.Transactional support
|
||||
testCompile(project(":spring-core")) // for CodeStyleAspect
|
||||
testCompile(project(":spring-test"))
|
||||
testCompile("javax.mail:javax.mail-api:1.6.1")
|
||||
|
|
|
@ -4,5 +4,5 @@ dependencies {
|
|||
testCompile(project(":spring-context"))
|
||||
testCompile("javax.inject:javax.inject:1")
|
||||
testCompile("javax.annotation:javax.annotation-api:1.3.2")
|
||||
testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
|
||||
testCompile("org.eclipse.persistence:javax.persistence:2.2.0")
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@ dependencies {
|
|||
compile(project(":spring-core"))
|
||||
compile(project(":spring-tx"))
|
||||
optional(project(":spring-context")) // for JndiDataSourceLookup
|
||||
optional("javax.transaction:javax.transaction-api:1.2")
|
||||
optional("javax.transaction:javax.transaction-api:1.3")
|
||||
optional("org.hsqldb:hsqldb:${hsqldbVersion}")
|
||||
optional("com.h2database:h2:1.4.197")
|
||||
optional("org.apache.derby:derby:10.14.1.0")
|
||||
|
|
|
@ -10,6 +10,6 @@ dependencies {
|
|||
optional(project(":spring-context"))
|
||||
optional(project(":spring-oxm"))
|
||||
optional("javax.resource:javax.resource-api:1.7")
|
||||
optional("javax.transaction:javax.transaction-api:1.2")
|
||||
optional("javax.transaction:javax.transaction-api:1.3")
|
||||
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@ dependencies {
|
|||
optional(project(":spring-context"))
|
||||
optional(project(":spring-web"))
|
||||
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.1")
|
||||
optional("org.hibernate:hibernate-core:5.2.16.Final")
|
||||
optional("org.hibernate:hibernate-core:5.3.0.CR1")
|
||||
optional("javax.servlet:javax.servlet-api:3.1.0")
|
||||
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
|
||||
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
|
||||
|
|
|
@ -8,9 +8,9 @@ dependencies {
|
|||
optional("javax.ejb:javax.ejb-api:3.2")
|
||||
optional("javax.interceptor:javax.interceptor-api:1.2.1")
|
||||
optional("javax.resource:javax.resource-api:1.7")
|
||||
optional("javax.transaction:javax.transaction-api:1.2")
|
||||
optional("javax.transaction:javax.transaction-api:1.3")
|
||||
optional("com.ibm.websphere:uow:6.0.2.17")
|
||||
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
|
||||
testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
|
||||
testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
|
||||
testCompile("org.eclipse.persistence:javax.persistence:2.2.0")
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue