Browse Source

Upgrade framework build to JPA 2.2 and JTA 1.3

Issue: SPR-16685
pull/1785/merge
Juergen Hoeller 8 years ago
parent
commit
e170cb0f79
  1. 2
      spring-aspects/spring-aspects.gradle
  2. 2
      spring-context-indexer/spring-context-indexer.gradle
  3. 2
      spring-jdbc/spring-jdbc.gradle
  4. 2
      spring-jms/spring-jms.gradle
  5. 2
      spring-orm/spring-orm.gradle
  6. 4
      spring-tx/spring-tx.gradle

2
spring-aspects/spring-aspects.gradle

@ -90,7 +90,7 @@ dependencies {
optional(project(":spring-orm")) // for JPA exception translation support optional(project(":spring-orm")) // for JPA exception translation support
optional(project(":spring-tx")) // for JPA, @Transactional support optional(project(":spring-tx")) // for JPA, @Transactional support
optional("javax.cache:cache-api:1.1.0") // for JCache aspect 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-core")) // for CodeStyleAspect
testCompile(project(":spring-test")) testCompile(project(":spring-test"))
testCompile("javax.mail:javax.mail-api:1.6.1") testCompile("javax.mail:javax.mail-api:1.6.1")

2
spring-context-indexer/spring-context-indexer.gradle

@ -4,5 +4,5 @@ dependencies {
testCompile(project(":spring-context")) testCompile(project(":spring-context"))
testCompile("javax.inject:javax.inject:1") testCompile("javax.inject:javax.inject:1")
testCompile("javax.annotation:javax.annotation-api:1.3.2") 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")
} }

2
spring-jdbc/spring-jdbc.gradle

@ -5,7 +5,7 @@ dependencies {
compile(project(":spring-core")) compile(project(":spring-core"))
compile(project(":spring-tx")) compile(project(":spring-tx"))
optional(project(":spring-context")) // for JndiDataSourceLookup 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("org.hsqldb:hsqldb:${hsqldbVersion}")
optional("com.h2database:h2:1.4.197") optional("com.h2database:h2:1.4.197")
optional("org.apache.derby:derby:10.14.1.0") optional("org.apache.derby:derby:10.14.1.0")

2
spring-jms/spring-jms.gradle

@ -10,6 +10,6 @@ dependencies {
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-oxm")) optional(project(":spring-oxm"))
optional("javax.resource:javax.resource-api:1.7") 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}") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
} }

2
spring-orm/spring-orm.gradle

@ -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.1") 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") 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-tx/spring-tx.gradle

@ -8,9 +8,9 @@ dependencies {
optional("javax.ejb:javax.ejb-api:3.2") optional("javax.ejb:javax.ejb-api:3.2")
optional("javax.interceptor:javax.interceptor-api:1.2.1") optional("javax.interceptor:javax.interceptor-api:1.2.1")
optional("javax.resource:javax.resource-api:1.7") 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") optional("com.ibm.websphere:uow:6.0.2.17")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}") 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…
Cancel
Save