From 80c15b5efafdc69fbc49ae694a5878bab59f3520 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Wed, 16 Oct 2013 13:02:16 +0000
Subject: [PATCH] alfrescoBaseSolrVersion, alfrescoTestDepsVersion now default
 to alfrescoBaseVersion.  You can still set them by a command line 
 -PalfrescoBaseSolrVersion=gethin or putting an entry in the gradle.properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 build.gradle      | 2 ++
 gradle.properties | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3b0ff8725a..725e849d9a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,8 @@ ext {
     distDir = 'dist'
     packageBaseName = "${groupid}-${packageName}-${version}-${build}"
     packageZipFile = "${packageBaseName}.zip"
+    if (!project.hasProperty('alfrescoBaseSolrVersion')) alfrescoBaseSolrVersion=alfrescoBaseVersion
+    if (!project.hasProperty('alfrescoTestDepsVersion')) alfrescoTestDepsVersion=alfrescoBaseVersion
 }
 
 /** Package Build Tasks */
diff --git a/gradle.properties b/gradle.properties
index 6930df6c82..2a21848c97 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,8 +16,6 @@ alfrescoEnterpriseMavenPwd=
 # set to org.alfresco.enterprise when enterprise version required
 alfrescoGroupId=org.alfresco
 alfrescoBaseVersion=4.2.0-RC2
-alfrescoBaseSolrVersion=4.2.c
-alfrescoTestDepsVersion=4.2.0-RC2
 
 # indicates whether this is a local build or not
 localBuild=true