From 3cd5210b94592c1ed494323b4ee0d78e70b9b154 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 10 Aug 2015 17:41:26 +0200 Subject: [PATCH] Polish usage of global versions in Gradle build --- build.gradle | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index e31ffd1487..ab8ff14035 100644 --- a/build.gradle +++ b/build.gradle @@ -31,10 +31,12 @@ configure(allprojects) { project -> ext.eclipselinkVersion = "2.4.2" ext.ehcacheVersion = "2.10.0" ext.ehcachejcacheVersion = "1.0.1" + ext.ejbApiVersion = "3.0" ext.fileuploadVersion = "1.3.1" ext.freemarkerVersion = "2.3.23" ext.groovyVersion = "2.4.4" ext.gsonVersion = "2.3.1" + ext.hamcrestVersion = "1.3" ext.hibernate3Version = "3.6.10.Final" ext.hibernate4Version = "4.3.10.Final" ext.hibernate5Version = "5.0.0.CR3" @@ -44,6 +46,8 @@ configure(allprojects) { project -> ext.httpclientVersion = "4.5" ext.httpasyncVersion = "4.1" ext.jackson2Version = "2.6.0" + ext.jsonassertVersion = "1.2.3" + ext.jsonpathVersion = "2.0.0" ext.htmlunitVersion = "2.18" ext.jasperreportsVersion = "6.1.0" ext.javamailVersion = "1.5.4" @@ -57,6 +61,7 @@ configure(allprojects) { project -> ext.poiVersion = "3.12" ext.protobufVersion = "2.6.1" ext.reactorVersion = "2.0.4.RELEASE" + ext.romeVersion = "1.5.1" ext.seleniumVersion = "2.47.1" ext.slf4jVersion = "1.7.12" ext.snakeyamlVersion = "1.15" @@ -132,7 +137,7 @@ configure(allprojects) { project -> testCompile("org.mockito:mockito-core:1.10.19") { exclude group:'org.hamcrest', module:'hamcrest-core' } - testCompile("org.hamcrest:hamcrest-all:1.3") + testCompile("org.hamcrest:hamcrest-all:${hamcrestVersion}") sniffer("org.codehaus.mojo:animal-sniffer-ant-tasks:${snifferVersion}") javaApiSignature("org.codehaus.mojo.signature:java16:1.1@signature") // as from JDK 6 update 18 @@ -468,7 +473,7 @@ project("spring-context") { compile(files(project(":spring-core").cglibRepackJar)) optional(project(":spring-instrument")) optional("javax.inject:javax.inject:1") - optional("javax.ejb:ejb-api:3.0") + optional("javax.ejb:ejb-api:${ejbApiVersion}") optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0") optional("javax.money:money-api:1.0") optional("org.eclipse.persistence:javax.persistence:2.0.0") @@ -540,7 +545,7 @@ project("spring-tx") { optional("aopalliance:aopalliance:1.0") optional("javax.transaction:javax.transaction-api:${jtaVersion}") optional("javax.resource:connector-api:1.5") - optional("javax.ejb:ejb-api:3.0") + optional("javax.ejb:ejb-api:${ejbApiVersion}") optional("com.ibm.websphere:uow:6.0.2.17") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.eclipse.persistence:javax.persistence:2.0.0") @@ -707,7 +712,7 @@ project("spring-web") { optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}") optional("com.google.code.gson:gson:${gsonVersion}") - optional("com.rometools:rome:1.5.1") + optional("com.rometools:rome:${romeVersion}") optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") { exclude group: "javax.servlet", module: "javax.servlet-api" } @@ -884,7 +889,7 @@ project("spring-webmvc") { } optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}") - optional("com.rometools:rome:1.5.0") + optional("com.rometools:rome:${romeVersion}") optional("javax.el:javax.el-api:2.2.5") optional("org.apache.tiles:tiles-api:${tiles3Version}") optional("org.apache.tiles:tiles-core:${tiles3Version}") { @@ -1007,22 +1012,22 @@ project("spring-test") { optional("javax.el:javax.el-api:2.2.5") optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}") - optional("org.hamcrest:hamcrest-core:1.3") - optional("com.jayway.jsonpath:json-path:2.0.0") - optional("org.skyscreamer:jsonassert:1.2.3") + optional("org.hamcrest:hamcrest-core:${hamcrestVersion}") + optional("com.jayway.jsonpath:json-path:${jsonpathVersion}") + optional("org.skyscreamer:jsonassert:${jsonassertVersion}") optional("xmlunit:xmlunit:${xmlunitVersion}") - optional("net.sourceforge.htmlunit:htmlunit:$htmlunitVersion") - optional("org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion") + optional("net.sourceforge.htmlunit:htmlunit:${htmlunitVersion}") + optional("org.seleniumhq.selenium:selenium-htmlunit-driver:${seleniumVersion}") testCompile(project(":spring-context-support")) testCompile(project(":spring-oxm")) testCompile("javax.mail:javax.mail-api:${javamailVersion}") - testCompile("javax.ejb:ejb-api:3.0") + testCompile("javax.ejb:ejb-api:${ejbApiVersion}") testCompile("org.hibernate:hibernate-core:${hibernate4Version}") testCompile("org.hibernate:hibernate-entitymanager:${hibernate4Version}") testCompile("org.hibernate:hibernate-validator:${hibval5Version}") testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}") testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") - testCompile("com.rometools:rome:1.5.0") + testCompile("com.rometools:rome:${romeVersion}") testCompile("org.apache.tiles:tiles-api:${tiles3Version}") testCompile("org.apache.tiles:tiles-core:${tiles3Version}") { exclude group: "org.slf4j", module: "jcl-over-slf4j" @@ -1032,7 +1037,7 @@ project("spring-test") { } testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") - testCompile("org.apache.httpcomponents:httpclient:$httpclientVersion") + testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}") } task testNG(type: Test) {