From 371556ab959cef1bfc74b99f6477e9b854895291 Mon Sep 17 00:00:00 2001
From: Erik Hatcher <ehatcher@apache.org>
Date: Thu, 17 Jun 2010 12:28:02 +0000
Subject: [PATCH] LUCENE-2490: fix for renamed Ant property in previous commit
 that was not completely done

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@955569 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/build.xml        |  8 ++++----
 solr/common-build.xml | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/solr/build.xml b/solr/build.xml
index 0cc73274ca4..819c348a2b2 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -89,16 +89,16 @@
     <!-- no description, don't advertise -->
 
     <!-- Building off Lucene trunk, we don't need this
-    <available file="lib/lucene-core-${lucene_version}.jar"
+    <available file="lib/lucene-core-${version}.jar"
                property="lucene-version-ok-m2deploy-wont-fail" />
     <fail unless="lucene-version-ok-m2deploy-wont-fail">
-      lib/lucene-core-${lucene_version}.jar Missing
+      lib/lucene-core-${version}.jar Missing
 
-      lib/lucene-core-${lucene_version}.jar does not exist.
+      lib/lucene-core-${version}.jar does not exist.
       This will cause problems with m2-deploy later, so fail fast now.
       
       Probably cause: lucene jars were upgraded w/o modifying the
-      'lucene_version' property in common-build.xml
+      'version' property in common-build.xml
     </fail>
     -->
     
diff --git a/solr/common-build.xml b/solr/common-build.xml
index aec15f7bfcc..62b79889a00 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -176,28 +176,28 @@
     <mkdir dir="${lucene-libs}"/>
     <copy todir="${lucene-libs}" preservelastmodified="true" flatten="true" failonerror="true" overwrite="true">
       <fileset dir="../lucene/build/">
-        <include name="lucene-core-${lucene_version}.jar" />
+        <include name="lucene-core-${version}.jar" />
       </fileset>
       <fileset dir="../modules/analysis/build/common">
-        <include name="lucene-analyzers-common-${lucene_version}.jar" />
+        <include name="lucene-analyzers-common-${version}.jar" />
       </fileset>
       <fileset dir="../lucene/build/contrib/highlighter">
-        <include name="lucene-highlighter-${lucene_version}.jar" />
+        <include name="lucene-highlighter-${version}.jar" />
       </fileset>
       <fileset dir="../lucene/build/contrib/memory">
-        <include name="lucene-memory-${lucene_version}.jar" />
+        <include name="lucene-memory-${version}.jar" />
       </fileset>
       <fileset dir="../lucene/build/contrib/misc">
-        <include name="lucene-misc-${lucene_version}.jar" />
+        <include name="lucene-misc-${version}.jar" />
       </fileset>
       <fileset dir="../lucene/build/contrib/queries">
-        <include name="lucene-queries-${lucene_version}.jar" />
+        <include name="lucene-queries-${version}.jar" />
       </fileset>
       <fileset dir="../lucene/build/contrib/spatial">
-        <include name="lucene-spatial-${lucene_version}.jar" />
+        <include name="lucene-spatial-${version}.jar" />
       </fileset>
       <fileset dir="../lucene/build/contrib/spellchecker">
-        <include name="lucene-spellchecker-${lucene_version}.jar" />
+        <include name="lucene-spellchecker-${version}.jar" />
       </fileset>
       </copy>
   </target>