From 5c2a84f0fa0f20c0c536d21caa20f4f4265923d5 Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Tue, 24 Feb 2015 00:37:07 +0000
Subject: [PATCH] LUCENE-6277: Revert for a moment.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1661826 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/common-build.xml | 1 -
 lucene/ivy-settings.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index d34218b99dd..3585defcda3 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -77,7 +77,6 @@
   <property name="ivy.bootstrap.version" value="2.3.0" />
   <property name="ivy.default.configuration" value="*"/>
   <property name="ivy.sync" value="true"/>
-  <property name="ivy.resolution-cache" value="${common.build.dir}/ivy-resolution-cache"/>
 
   <property name="junit.jar" value="junit-4.10.jar"/>
   <property name="junit-location.jar" location="${common.dir}/test-framework/lib/${junit.jar}"/>
diff --git a/lucene/ivy-settings.xml b/lucene/ivy-settings.xml
index 629bb225cd4..024db07f989 100644
--- a/lucene/ivy-settings.xml
+++ b/lucene/ivy-settings.xml
@@ -28,7 +28,7 @@
   <include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
   <include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
 
-  <caches lockStrategy="artifact-lock" resolutionCacheDir="${ivy.resolution-cache}" /> 
+  <caches lockStrategy="artifact-lock" resolutionCacheDir="${common.build.dir}/ivy-resolution-cache" /> 
 
   <resolvers>
     <ibiblio name="sonatype-releases" root="https://oss.sonatype.org/content/repositories/releases" m2compatible="true" />