GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Latest possible dependency updates for spring-orm 

(cherry picked from commit 0d22719)
pull/555/head
Juergen Hoeller 12 years ago
parent
7bc38acbf6
commit
c706cbbed4
1 changed files with 12 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      build.gradle

22
build.gradle
Unescape View File

@ -14,10 +14,11 @@ configure(allprojects) { project ->
version = qualifyVersionIfNecessary(version) version = qualifyVersionIfNecessary(version)
ext.aspectjVersion = "1.7.4" ext.aspectjVersion = "1.7.4"
ext.eclipseLinkVersion = "2.4.2"
ext.groovyVersion = "1.8.9" ext.groovyVersion = "1.8.9"
ext.hibernate3Version = "3.6.10.Final" ext.hibernate3Version = "3.6.10.Final"
ext.hibernate4Version = "4.2.12.Final" ext.hibernate4Version = "4.2.12.Final"
ext.hibValVersion = "4.3.1.Final" ext.hibVal4Version = "4.3.1.Final"
ext.hsqldbVersion = "2.3.2" ext.hsqldbVersion = "2.3.2"
ext.jackson1Version = "1.9.13" ext.jackson1Version = "1.9.13"
ext.jackson2Version = "2.3.3" ext.jackson2Version = "2.3.3"
@ -25,13 +26,14 @@ configure(allprojects) { project ->
ext.jettyVersion = "9.1.5.v20140505" ext.jettyVersion = "9.1.5.v20140505"
ext.jodaVersion = "2.3" ext.jodaVersion = "2.3"
ext.junitVersion = "4.11" ext.junitVersion = "4.11"
ext.openJpaVersion = "2.2.2"
ext.slf4jVersion = "1.7.7" ext.slf4jVersion = "1.7.7"
ext.tiles2Version = "2.2.2" ext.tiles2Version = "2.2.2"
ext.tiles3Version = "3.0.4" ext.tiles3Version = "3.0.4"
ext.tomcatVersion = "8.0.5" ext.tomcatVersion = "8.0.5"
ext.xstreamVersion = "1.4.7" ext.xstreamVersion = "1.4.7"
ext.gradleScriptDir = "${rootProject.projectDir}/gradle" ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
apply plugin: "propdeps" apply plugin: "propdeps"
apply plugin: "java" apply plugin: "java"
@ -370,7 +372,7 @@ project("spring-context") {
optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0") optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
optional("org.eclipse.persistence:javax.persistence:2.0.0") optional("org.eclipse.persistence:javax.persistence:2.0.0")
optional("javax.validation:validation-api:1.0.0.GA") optional("javax.validation:validation-api:1.0.0.GA")
optional("org.hibernate:hibernate-validator:${hibValVersion}") optional("org.hibernate:hibernate-validator:${hibVal4Version}")
optional("joda-time:joda-time:${jodaVersion}") optional("joda-time:joda-time:${jodaVersion}")
optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
@ -649,9 +651,9 @@ project("spring-orm") {
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-web")) optional(project(":spring-web"))
optional("aopalliance:aopalliance:1.0") optional("aopalliance:aopalliance:1.0")
optional("org.eclipse.persistence:javax.persistence:2.0.0") optional("org.eclipse.persistence:javax.persistence:2.0.5")
optional("org.eclipse.persistence:org.eclipse.persistence.core:2.4.0") optional("org.eclipse.persistence:org.eclipse.persistence.core:${eclipseLinkVersion}")
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.4.0") { optional("org.eclipse.persistence:org.eclipse.persistence.jpa:${eclipseLinkVersion}") {
exclude group: 'org.eclipse.persistence', module: 'javax.persistence' exclude group: 'org.eclipse.persistence', module: 'javax.persistence'
} }
optional("org.hibernate:hibernate-core:${hibernate3Version}") { optional("org.hibernate:hibernate-core:${hibernate3Version}") {
@ -661,13 +663,13 @@ project("spring-orm") {
optional("org.hibernate:hibernate-entitymanager:${hibernate3Version}") { optional("org.hibernate:hibernate-entitymanager:${hibernate3Version}") {
exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api' exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api'
} }
optional("org.apache.openjpa:openjpa:2.2.1") { optional("org.apache.openjpa:openjpa:${openJpaVersion}") {
exclude group: 'junit', module: 'junit' exclude group: 'junit', module: 'junit'
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jpa_2.0_spec' exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jpa_2.0_spec'
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec' exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec'
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec' exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec'
} }
optional("javax.jdo:jdo-api:3.0") { optional("javax.jdo:jdo-api:3.0.1") {
exclude group: 'javax.transaction', module: 'transaction-api' exclude group: 'javax.transaction', module: 'transaction-api'
} }
optional("javax.servlet:javax.servlet-api:3.0.1") optional("javax.servlet:javax.servlet-api:3.0.1")
@ -755,7 +757,7 @@ project("spring-webmvc") {
exclude group: "javax.servlet", module: "javax.servlet" exclude group: "javax.servlet", module: "javax.servlet"
} }
testCompile("javax.validation:validation-api:1.0.0.GA") testCompile("javax.validation:validation-api:1.0.0.GA")
testCompile("org.hibernate:hibernate-validator:${hibValVersion}") testCompile("org.hibernate:hibernate-validator:${hibVal4Version}")
testCompile("org.apache.httpcomponents:httpclient:4.3.3") testCompile("org.apache.httpcomponents:httpclient:4.3.3")
testCompile("commons-fileupload:commons-fileupload:1.3.1") testCompile("commons-fileupload:commons-fileupload:1.3.1")
testCompile("commons-io:commons-io:1.3") testCompile("commons-io:commons-io:1.3")
@ -855,7 +857,7 @@ project("spring-test") {
exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api' exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api'
} }
testCompile("org.hibernate:hibernate-entitymanager:${hibernate3Version}") testCompile("org.hibernate:hibernate-entitymanager:${hibernate3Version}")
testCompile("org.hibernate:hibernate-validator:${hibValVersion}") testCompile("org.hibernate:hibernate-validator:${hibVal4Version}")
testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}") testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}")
testCompile("org.codehaus.jackson:jackson-mapper-asl:${jackson1Version}") testCompile("org.codehaus.jackson:jackson-mapper-asl:${jackson1Version}")
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")

Write Preview
Loading…
Cancel
Save