You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by eh...@apache.org on 2010/06/17 14:28:02 UTC
svn commit: r955569 - in /lucene/dev/trunk/solr: build.xml common-build.xml
Author: ehatcher
Date: Thu Jun 17 12:28:02 2010
New Revision: 955569
URL: http://svn.apache.org/viewvc?rev=955569&view=rev
Log:
LUCENE-2490: fix for renamed Ant property in previous commit that was not completely done
Modified:
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/common-build.xml
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=955569&r1=955568&r2=955569&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Thu Jun 17 12:28:02 2010
@@ -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>
-->
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=955569&r1=955568&r2=955569&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Thu Jun 17 12:28:02 2010
@@ -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>