You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2013/07/18 20:43:04 UTC
svn commit: r1504597 - in /lucene/dev/branches/lucene_solr_4_4: ./
dev-tools/ lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/classification/ lucene/classification/src/ lucen...
Author: hossman
Date: Thu Jul 18 18:43:03 2013
New Revision: 1504597
URL: http://svn.apache.org/r1504597
Log:
SOLR-5048: fail the build if the example solrconfig.xml files do not have an up to date luceneMatchVersion (merge r1504570)
Modified:
lucene/dev/branches/lucene_solr_4_4/ (props changed)
lucene/dev/branches/lucene_solr_4_4/dev-tools/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/BUILD.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/backwards/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/classification/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/classification/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/classification/ivy.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/classification/src/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/codecs/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestSort.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/demo/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/facet/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/grouping/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/join/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/memory/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/misc/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/module-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/replicator/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/site/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/spatial/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/suggest/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/tools/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/build.xml (contents, props changed)
lucene/dev/branches/lucene_solr_4_4/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/core/src/test/org/apache/solr/core/TestConfig.java (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/example/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/scripts/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/site/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/webapp/ (props changed)
Modified: lucene/dev/branches/lucene_solr_4_4/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_4/solr/build.xml?rev=1504597&r1=1504596&r2=1504597&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_4/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_4_4/solr/build.xml Thu Jul 18 18:43:03 2013
@@ -226,7 +226,21 @@
</target>
<!-- Validation (license/notice/api checks). -->
- <target name="validate" depends="check-licenses,rat-sources,check-forbidden-apis" description="Validate stuff." />
+ <target name="validate" depends="check-example-lucene-match-version,check-licenses,rat-sources,check-forbidden-apis" description="Validate stuff." />
+
+ <target name="check-example-lucene-match-version">
+ <fail message="Some example solrconfig.xml files do not refer to the correct luceneMatchVersion: ${tests.luceneMatchVersion}">
+ <condition>
+ <resourcecount when="greater" count="0">
+ <fileset dir="${example}" includes="**/solrconfig.xml">
+ <not>
+ <contains text="<luceneMatchVersion>${tests.luceneMatchVersion}<" casesensitive="no"/>
+ </not>
+ </fileset>
+ </resourcecount>
+ </condition>
+ </fail>
+ </target>
<target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
<license-check-macro dir="${basedir}" licensedir="${common-solr.dir}/licenses">