Skip to content

Commit e170cb0

Browse files
committed
Upgrade framework build to JPA 2.2 and JTA 1.3
Issue: SPR-16685
1 parent f28a5d0 commit e170cb0

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

spring-aspects/spring-aspects.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ dependencies {
9090
optional(project(":spring-orm")) // for JPA exception translation support
9191
optional(project(":spring-tx")) // for JPA, @Transactional support
9292
optional("javax.cache:cache-api:1.1.0") // for JCache aspect
93-
optional("javax.transaction:javax.transaction-api:1.2") // for @javax.transaction.Transactional support
93+
optional("javax.transaction:javax.transaction-api:1.3") // for @javax.transaction.Transactional support
9494
testCompile(project(":spring-core")) // for CodeStyleAspect
9595
testCompile(project(":spring-test"))
9696
testCompile("javax.mail:javax.mail-api:1.6.1")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ dependencies {
44
testCompile(project(":spring-context"))
55
testCompile("javax.inject:javax.inject:1")
66
testCompile("javax.annotation:javax.annotation-api:1.3.2")
7-
testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
7+
testCompile("org.eclipse.persistence:javax.persistence:2.2.0")
88
}

spring-jdbc/spring-jdbc.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies {
55
compile(project(":spring-core"))
66
compile(project(":spring-tx"))
77
optional(project(":spring-context")) // for JndiDataSourceLookup
8-
optional("javax.transaction:javax.transaction-api:1.2")
8+
optional("javax.transaction:javax.transaction-api:1.3")
99
optional("org.hsqldb:hsqldb:${hsqldbVersion}")
1010
optional("com.h2database:h2:1.4.197")
1111
optional("org.apache.derby:derby:10.14.1.0")

spring-jms/spring-jms.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ dependencies {
1010
optional(project(":spring-context"))
1111
optional(project(":spring-oxm"))
1212
optional("javax.resource:javax.resource-api:1.7")
13-
optional("javax.transaction:javax.transaction-api:1.2")
13+
optional("javax.transaction:javax.transaction-api:1.3")
1414
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
1515
}

spring-orm/spring-orm.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
optional(project(":spring-context"))
1010
optional(project(":spring-web"))
1111
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.1")
12-
optional("org.hibernate:hibernate-core:5.2.16.Final")
12+
optional("org.hibernate:hibernate-core:5.3.0.CR1")
1313
optional("javax.servlet:javax.servlet-api:3.1.0")
1414
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
1515
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")

spring-tx/spring-tx.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ dependencies {
88
optional("javax.ejb:javax.ejb-api:3.2")
99
optional("javax.interceptor:javax.interceptor-api:1.2.1")
1010
optional("javax.resource:javax.resource-api:1.7")
11-
optional("javax.transaction:javax.transaction-api:1.2")
11+
optional("javax.transaction:javax.transaction-api:1.3")
1212
optional("com.ibm.websphere:uow:6.0.2.17")
1313
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
1414
testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
15-
testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
15+
testCompile("org.eclipse.persistence:javax.persistence:2.2.0")
1616
}

0 commit comments

Comments
 (0)