@@ -305,7 +305,7 @@ project("spring-context") {
305305 optional("javax.ejb:ejb-api:3.0")
306306 optional("javax.inject:javax.inject:1")
307307 optional("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
308- optional("javax. persistence:persistence-api:1 .0")
308+ optional("org.eclipse. persistence:javax. persistence:2.0 .0")
309309 optional("javax.validation:validation-api:1.0.0.GA")
310310 optional("org.beanshell:bsh:2.0b4")
311311 optional("org.codehaus.groovy:groovy-all:1.8.8")
@@ -336,7 +336,7 @@ project("spring-tx") {
336336 optional("javax.resource:connector-api:1.5")
337337 optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
338338 optional("javax.ejb:ejb-api:3.0")
339- testCompile("javax. persistence:persistence-api:1 .0")
339+ testCompile("org.eclipse. persistence:javax. persistence:2.0 .0")
340340 testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
341341 }
342342}
@@ -478,31 +478,19 @@ project("spring-web") {
478478project("spring-orm") {
479479 description = "Spring Object/Relational Mapping"
480480
481- compileTestJava {
482- // necessary to avoid java.lang.VerifyError on toplink compilation
483- // TODO: remove this block when we remove toplink
484- sourceCompatibility=1.6
485- targetCompatibility=1.6
486- }
487-
488481 dependencies {
489482 compile("aopalliance:aopalliance:1.0")
490- optional("org.hibernate:hibernate-core:3.3.2.GA")
491- optional("org.hibernate:hibernate-annotations:3.4.0.GA")
492- optional("org.hibernate:hibernate-entitymanager:3.4.0.GA")
493- optional("org.apache.openjpa:openjpa:1.1.0")
494- optional("org.eclipse.persistence:org.eclipse.persistence.core:1.0.1")
495- optional("org.eclipse.persistence:org.eclipse.persistence.jpa:1.0.1")
496- optional("toplink.essentials:toplink-essentials:2.0-41b")
483+ optional("org.eclipse.persistence:javax.persistence:2.0.0")
484+ optional("org.eclipse.persistence:org.eclipse.persistence.core:2.4.0")
485+ optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.4.0")
486+ optional("org.hibernate:hibernate-core:3.6.9.Final")
487+ optional("org.hibernate:hibernate-entitymanager:3.6.9.Final")
488+ optional("org.apache.openjpa:openjpa:2.2.1")
497489 optional("javax.jdo:jdo-api:3.0")
498- optional("org.apache.ibatis:ibatis-sqlmap:2.3.4.726")
499- optional("javax.persistence:persistence-api:1.0")
500490 provided("javax.servlet:servlet-api:2.5")
501491 testCompile("javax.servlet:javax.servlet-api:3.0.1")
502492 testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
503493 testCompile("commons-dbcp:commons-dbcp:1.2.2")
504- testCompile("org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1")
505- testCompile("org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1")
506494 testCompile("hsqldb:hsqldb:${hsqldbVersion}")
507495 compile(project(":spring-core"))
508496 compile(project(":spring-beans"))
@@ -520,8 +508,8 @@ project("spring-orm-hibernate4") {
520508 dependencies {
521509 provided(project(":spring-tx"))
522510 provided(project(":spring-jdbc"))
523- optional("org.hibernate:hibernate-core:4.1.0 .Final")
524- optional("org.hibernate:hibernate-entitymanager:4.1.0 .Final")
511+ optional("org.hibernate:hibernate-core:4.1.9 .Final")
512+ optional("org.hibernate:hibernate-entitymanager:4.1.9 .Final")
525513 optional(project(":spring-web"))
526514 optional("javax.servlet:servlet-api:2.5")
527515 }
@@ -666,9 +654,9 @@ project("spring-test") {
666654 optional("javax.servlet:servlet-api:2.5")
667655 optional("javax.servlet.jsp:jsp-api:2.1")
668656 optional("javax.portlet:portlet-api:2.0")
669- optional("javax. persistence:persistence-api:1 .0")
657+ optional("org.eclipse. persistence:javax. persistence:2.0 .0")
670658 optional("org.aspectj:aspectjweaver:${aspectjVersion}")
671- testCompile("org.hibernate:hibernate-core:3.3.2.GA ")
659+ testCompile("org.hibernate:hibernate-core:3.6.9.Final ")
672660 provided("javax.inject:javax.inject:1")
673661 provided("javax.activation:activation:1.1")
674662 provided("javax.servlet:jstl:1.2")
@@ -738,7 +726,7 @@ project("spring-aspects") {
738726 optional(project(":spring-tx")) // for JPA, @Transactional support
739727 optional(project(":spring-orm")) // for JPA exception translation support
740728 aspects(project(":spring-orm"))
741- provided("javax. persistence:persistence-api:1 .0")
729+ provided("org.eclipse. persistence:javax. persistence:2.0 .0")
742730 testCompile("javax.mail:mail:1.4")
743731 ajc("org.aspectj:aspectjtools:${aspectjVersion}")
744732 rt("org.aspectj:aspectjrt:${aspectjVersion}")
@@ -786,7 +774,7 @@ configure(rootProject) {
786774 testCompile(project(":spring-web"))
787775 testCompile(project(":spring-webmvc-portlet"))
788776 testCompile(project(":spring-orm"))
789- testCompile("org.hibernate:hibernate-core:4.1.0 .Final")
777+ testCompile("org.hibernate:hibernate-core:4.1.9 .Final")
790778 testCompile("javax.servlet:servlet-api:2.5")
791779 testCompile("javax.portlet:portlet-api:2.0")
792780 testCompile("javax.inject:javax.inject:1")
0 commit comments