You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/08/18 18:26:08 UTC
svn commit: r1618654 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/webapp/ solr/webapp/build.xml
Author: uschindler
Date: Mon Aug 18 16:26:08 2014
New Revision: 1618654
URL: http://svn.apache.org/r1618654
Log:
Merged revision(s) 1618652 from lucene/dev/trunk:
SOLR-6389: Fix spec version of WAR file
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/build.xml
Modified: lucene/dev/branches/branch_4x/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/build.xml?rev=1618654&r1=1618653&r2=1618654&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/build.xml Mon Aug 18 16:26:08 2014
@@ -45,7 +45,7 @@
depends="test, init-dist, dist-core, dist-solrj, lucene-jars-to-solr">
<build-manifest title="Apache Solr Search Server"
implementation.title="org.apache.solr"
- spec.version="${spec.version}"/>
+ spec.version="${version}"/>
<ant dir="${common-solr.dir}" inheritall="false" target="contribs-add-to-war"/>
<war destfile="${dist}/solr-${version}${solr.war.suffix}.war"
webxml="web/WEB-INF/web.xml"