Skip to content

Commit c706cbb

Browse files
committed
Latest possible dependency updates for spring-orm
(cherry picked from commit 0d22719)
1 parent 7bc38ac commit c706cbb

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

build.gradle

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,26 @@ configure(allprojects) { project ->
1414
version = qualifyVersionIfNecessary(version)
1515

1616
ext.aspectjVersion = "1.7.4"
17+
ext.eclipseLinkVersion = "2.4.2"
1718
ext.groovyVersion = "1.8.9"
1819
ext.hibernate3Version = "3.6.10.Final"
1920
ext.hibernate4Version = "4.2.12.Final"
20-
ext.hibValVersion = "4.3.1.Final"
21+
ext.hibVal4Version = "4.3.1.Final"
2122
ext.hsqldbVersion = "2.3.2"
2223
ext.jackson1Version = "1.9.13"
2324
ext.jackson2Version = "2.3.3"
2425
ext.jasperReportsVersion = "5.5.1"
2526
ext.jettyVersion = "9.1.5.v20140505"
2627
ext.jodaVersion = "2.3"
2728
ext.junitVersion = "4.11"
29+
ext.openJpaVersion = "2.2.2"
2830
ext.slf4jVersion = "1.7.7"
2931
ext.tiles2Version = "2.2.2"
3032
ext.tiles3Version = "3.0.4"
3133
ext.tomcatVersion = "8.0.5"
3234
ext.xstreamVersion = "1.4.7"
3335

34-
ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
36+
ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
3537

3638
apply plugin: "propdeps"
3739
apply plugin: "java"
@@ -370,7 +372,7 @@ project("spring-context") {
370372
optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
371373
optional("org.eclipse.persistence:javax.persistence:2.0.0")
372374
optional("javax.validation:validation-api:1.0.0.GA")
373-
optional("org.hibernate:hibernate-validator:${hibValVersion}")
375+
optional("org.hibernate:hibernate-validator:${hibVal4Version}")
374376
optional("joda-time:joda-time:${jodaVersion}")
375377
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
376378
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
@@ -649,9 +651,9 @@ project("spring-orm") {
649651
optional(project(":spring-context"))
650652
optional(project(":spring-web"))
651653
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}") {
655657
exclude group: 'org.eclipse.persistence', module: 'javax.persistence'
656658
}
657659
optional("org.hibernate:hibernate-core:${hibernate3Version}") {
@@ -661,13 +663,13 @@ project("spring-orm") {
661663
optional("org.hibernate:hibernate-entitymanager:${hibernate3Version}") {
662664
exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api'
663665
}
664-
optional("org.apache.openjpa:openjpa:2.2.1") {
666+
optional("org.apache.openjpa:openjpa:${openJpaVersion}") {
665667
exclude group: 'junit', module: 'junit'
666668
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jpa_2.0_spec'
667669
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec'
668670
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec'
669671
}
670-
optional("javax.jdo:jdo-api:3.0") {
672+
optional("javax.jdo:jdo-api:3.0.1") {
671673
exclude group: 'javax.transaction', module: 'transaction-api'
672674
}
673675
optional("javax.servlet:javax.servlet-api:3.0.1")
@@ -755,7 +757,7 @@ project("spring-webmvc") {
755757
exclude group: "javax.servlet", module: "javax.servlet"
756758
}
757759
testCompile("javax.validation:validation-api:1.0.0.GA")
758-
testCompile("org.hibernate:hibernate-validator:${hibValVersion}")
760+
testCompile("org.hibernate:hibernate-validator:${hibVal4Version}")
759761
testCompile("org.apache.httpcomponents:httpclient:4.3.3")
760762
testCompile("commons-fileupload:commons-fileupload:1.3.1")
761763
testCompile("commons-io:commons-io:1.3")
@@ -855,7 +857,7 @@ project("spring-test") {
855857
exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api'
856858
}
857859
testCompile("org.hibernate:hibernate-entitymanager:${hibernate3Version}")
858-
testCompile("org.hibernate:hibernate-validator:${hibValVersion}")
860+
testCompile("org.hibernate:hibernate-validator:${hibVal4Version}")
859861
testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}")
860862
testCompile("org.codehaus.jackson:jackson-mapper-asl:${jackson1Version}")
861863
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")

0 commit comments

Comments
 (0)