@@ -14,24 +14,26 @@ configure(allprojects) { project ->
14
14
version = qualifyVersionIfNecessary(version)
15
15
16
16
ext. aspectjVersion = " 1.7.4"
17
+ ext. eclipseLinkVersion = " 2.4.2"
17
18
ext. groovyVersion = " 1.8.9"
18
19
ext. hibernate3Version = " 3.6.10.Final"
19
20
ext. hibernate4Version = " 4.2.12.Final"
20
- ext. hibValVersion = " 4.3.1.Final"
21
+ ext. hibVal4Version = " 4.3.1.Final"
21
22
ext. hsqldbVersion = " 2.3.2"
22
23
ext. jackson1Version = " 1.9.13"
23
24
ext. jackson2Version = " 2.3.3"
24
25
ext. jasperReportsVersion = " 5.5.1"
25
26
ext. jettyVersion = " 9.1.5.v20140505"
26
27
ext. jodaVersion = " 2.3"
27
28
ext. junitVersion = " 4.11"
29
+ ext. openJpaVersion = " 2.2.2"
28
30
ext. slf4jVersion = " 1.7.7"
29
31
ext. tiles2Version = " 2.2.2"
30
32
ext. tiles3Version = " 3.0.4"
31
33
ext. tomcatVersion = " 8.0.5"
32
34
ext. xstreamVersion = " 1.4.7"
33
35
34
- ext. gradleScriptDir = " ${ rootProject.projectDir} /gradle"
36
+ ext. gradleScriptDir = " ${ rootProject.projectDir} /gradle"
35
37
36
38
apply plugin : " propdeps"
37
39
apply plugin : " java"
@@ -370,7 +372,7 @@ project("spring-context") {
370
372
optional(" javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0" )
371
373
optional(" org.eclipse.persistence:javax.persistence:2.0.0" )
372
374
optional(" javax.validation:validation-api:1.0.0.GA" )
373
- optional(" org.hibernate:hibernate-validator:${ hibValVersion } " )
375
+ optional(" org.hibernate:hibernate-validator:${ hibVal4Version } " )
374
376
optional(" joda-time:joda-time:${ jodaVersion} " )
375
377
optional(" org.aspectj:aspectjweaver:${ aspectjVersion} " )
376
378
optional(" org.codehaus.groovy:groovy-all:${ groovyVersion} " )
@@ -649,9 +651,9 @@ project("spring-orm") {
649
651
optional(project(" :spring-context" ))
650
652
optional(project(" :spring-web" ))
651
653
optional(" aopalliance:aopalliance:1.0" )
652
- optional(" org.eclipse.persistence:javax.persistence:2.0.0 " )
653
- optional(" org.eclipse.persistence:org.eclipse.persistence.core:2.4.0 " )
654
- optional(" org.eclipse.persistence:org.eclipse.persistence.jpa:2.4.0 " ) {
654
+ optional(" org.eclipse.persistence:javax.persistence:2.0.5 " )
655
+ optional(" org.eclipse.persistence:org.eclipse.persistence.core:${ eclipseLinkVersion } " )
656
+ optional(" org.eclipse.persistence:org.eclipse.persistence.jpa:${ eclipseLinkVersion } " ) {
655
657
exclude group : ' org.eclipse.persistence' , module : ' javax.persistence'
656
658
}
657
659
optional(" org.hibernate:hibernate-core:${ hibernate3Version} " ) {
@@ -661,13 +663,13 @@ project("spring-orm") {
661
663
optional(" org.hibernate:hibernate-entitymanager:${ hibernate3Version} " ) {
662
664
exclude group : ' org.hibernate.javax.persistence' , module : ' hibernate-jpa-2.0-api'
663
665
}
664
- optional(" org.apache.openjpa:openjpa:2.2.1 " ) {
666
+ optional(" org.apache.openjpa:openjpa:${ openJpaVersion } " ) {
665
667
exclude group : ' junit' , module : ' junit'
666
668
exclude group : ' org.apache.geronimo.specs' , module : ' geronimo-jpa_2.0_spec'
667
669
exclude group : ' org.apache.geronimo.specs' , module : ' geronimo-jta_1.1_spec'
668
670
exclude group : ' org.apache.geronimo.specs' , module : ' geronimo-jms_1.1_spec'
669
671
}
670
- optional(" javax.jdo:jdo-api:3.0" ) {
672
+ optional(" javax.jdo:jdo-api:3.0.1 " ) {
671
673
exclude group : ' javax.transaction' , module : ' transaction-api'
672
674
}
673
675
optional(" javax.servlet:javax.servlet-api:3.0.1" )
@@ -755,7 +757,7 @@ project("spring-webmvc") {
755
757
exclude group : " javax.servlet" , module : " javax.servlet"
756
758
}
757
759
testCompile(" javax.validation:validation-api:1.0.0.GA" )
758
- testCompile(" org.hibernate:hibernate-validator:${ hibValVersion } " )
760
+ testCompile(" org.hibernate:hibernate-validator:${ hibVal4Version } " )
759
761
testCompile(" org.apache.httpcomponents:httpclient:4.3.3" )
760
762
testCompile(" commons-fileupload:commons-fileupload:1.3.1" )
761
763
testCompile(" commons-io:commons-io:1.3" )
@@ -855,7 +857,7 @@ project("spring-test") {
855
857
exclude group : ' org.hibernate.javax.persistence' , module : ' hibernate-jpa-2.0-api'
856
858
}
857
859
testCompile(" org.hibernate:hibernate-entitymanager:${ hibernate3Version} " )
858
- testCompile(" org.hibernate:hibernate-validator:${ hibValVersion } " )
860
+ testCompile(" org.hibernate:hibernate-validator:${ hibVal4Version } " )
859
861
testCompile(" com.thoughtworks.xstream:xstream:${ xstreamVersion} " )
860
862
testCompile(" org.codehaus.jackson:jackson-mapper-asl:${ jackson1Version} " )
861
863
testCompile(" com.fasterxml.jackson.core:jackson-databind:${ jackson2Version} " )
0 commit comments