From 7a6155e12f69552d761d88e94094f054e6ae6a57 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Mon, 9 Nov 2015 23:34:22 -0800
Subject: Build: Consolidate dependencies specified in multiple places

Some dependencies must be specified in a couple places in the build.
e.g. randomized runner is specified both in buildSrc (for the gradle
wrapper plugin), as well as in the test-framework.

This change creates buildSrc/versions.properties which acts similar to
the set of shared version properties we used to have in the maven parent
pom.
---
 core/build.gradle | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'core/build.gradle')

diff --git a/core/build.gradle b/core/build.gradle
index a7fcda9ca0..bd3dd7b67e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -27,12 +27,6 @@ apply plugin: 'nebula.optional-base'
 
 archivesBaseName = 'elasticsearch'
 
-versions << [
-  jackson:  '2.6.2',
-  log4j:    '1.2.17',
-  slf4j:    '1.6.2'
-]
-
 dependencies {
 
   // lucene
@@ -76,18 +70,18 @@ dependencies {
   compile 'org.hdrhistogram:HdrHistogram:2.1.6'
 
   // lucene spatial
-  compile 'com.spatial4j:spatial4j:0.5', optional
-  compile 'com.vividsolutions:jts:1.13', optional
+  compile "com.spatial4j:spatial4j:${versions.spatial4j}", optional
+  compile "com.vividsolutions:jts:${versions.jts}", optional
 
   // templating
-  compile 'com.github.spullara.mustache.java:compiler:0.9.1', optional
+  compile "com.github.spullara.mustache.java:compiler:${versions.mustache}", optional
 
   // logging
   compile "log4j:log4j:${versions.log4j}", optional
   compile "log4j:apache-log4j-extras:${versions.log4j}", optional
   compile "org.slf4j:slf4j-api:${versions.slf4j}", optional
 
-  compile 'net.java.dev.jna:jna:4.1.0', optional
+  compile "net.java.dev.jna:jna:${versions.jna}", optional
 
   if (isEclipse == false || project.path == "${projectsPrefix}:core-tests") {
     testCompile("org.elasticsearch:test-framework:${version}") {
-- 
cgit v1.2.3