From 836873d7799c764ee0e8fe7340ce0e0cdb82123f Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 1 Dec 2010 12:37:01 +0000
Subject: [PATCH] SOLR-2259: use $tests.luceneMatchVersion in all test files,
 make this parameter mandatory in trunk

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1040982 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/test/resources/solr/conf/solrconfig.xml      |  1 +
 .../resources/solr/conf/dataimport-solrconfig.xml    |  1 +
 .../resources/solr/conf/contentstream-solrconfig.xml |  1 +
 .../solr/conf/dataimport-nodatasource-solrconfig.xml |  1 +
 .../resources/solr/conf/dataimport-solrconfig.xml    |  1 +
 .../src/test/resources/solr/conf/schema.xml          | 12 ++++++------
 .../src/test/resources/solr/conf/solrconfig.xml      |  2 +-
 solr/example/multicore/core0/conf/solrconfig.xml     |  2 +-
 solr/example/multicore/core1/conf/solrconfig.xml     |  1 +
 solr/src/java/org/apache/solr/core/SolrConfig.java   |  2 +-
 .../src/test/test-files/solr/conf/bad_solrconfig.xml |  1 +
 .../test-files/solr/conf/solrconfig-SOLR-749.xml     |  2 +-
 .../test-files/solr/conf/solrconfig-altdirectory.xml |  1 +
 .../test-files/solr/conf/solrconfig-delpolicy1.xml   |  2 +-
 .../test-files/solr/conf/solrconfig-delpolicy2.xml   |  1 +
 .../test-files/solr/conf/solrconfig-duh-optimize.xml |  2 +-
 .../test/test-files/solr/conf/solrconfig-elevate.xml |  2 +-
 .../test-files/solr/conf/solrconfig-enableplugin.xml |  2 +-
 .../solr/conf/solrconfig-functionquery.xml           |  2 +-
 .../test-files/solr/conf/solrconfig-highlight.xml    |  2 +-
 .../test/test-files/solr/conf/solrconfig-legacy.xml  |  2 +-
 .../test/test-files/solr/conf/solrconfig-master.xml  |  2 +-
 .../test/test-files/solr/conf/solrconfig-master1.xml |  2 +-
 .../test/test-files/solr/conf/solrconfig-master2.xml |  2 +-
 .../test/test-files/solr/conf/solrconfig-nocache.xml |  2 +-
 .../solr/conf/solrconfig-propinject-indexdefault.xml |  2 +-
 .../test-files/solr/conf/solrconfig-propinject.xml   |  2 +-
 .../test-files/solr/conf/solrconfig-querysender.xml  |  1 +
 .../test/test-files/solr/conf/solrconfig-slave.xml   |  2 +-
 .../test/test-files/solr/conf/solrconfig-slave1.xml  |  2 +-
 .../solr/conf/solrconfig-solcoreproperties.xml       |  2 +-
 .../solr/conf/solrconfig-spellcheckcomponent.xml     |  2 +-
 .../test-files/solr/conf/solrconfig-spellchecker.xml |  2 +-
 .../test-files/solr/conf/solrconfig-termindex.xml    |  2 +-
 .../test-files/solr/conf/solrconfig-transformers.xml |  2 +-
 .../test-files/solr/conf/solrconfig-xinclude.xml     |  2 +-
 solr/src/test/test-files/solr/conf/solrconfig.xml    |  2 +-
 .../test/test-files/solr/conf/solrconfig_perf.xml    |  1 +
 .../test/test-files/solr/crazy-path-to-config.xml    |  1 +
 .../test/test-files/solr/shared/conf/solrconfig.xml  |  1 +
 40 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml b/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
index 7690974262f..c59cc9b63fd 100644
--- a/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
+++ b/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
@@ -17,6 +17,7 @@
 -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Set this to 'false' if you want solr to continue working after it has 
        encountered an severe configuration error.  In a production environment, 
        you may want solr to keep working even if one handler is mis-configured.
diff --git a/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml
index 4b5a06ede92..ea390b9a8f3 100644
--- a/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml
@@ -17,6 +17,7 @@
 -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Set this to 'false' if you want solr to continue working after it has 
        encountered an severe configuration error.  In a production environment, 
        you may want solr to keep working even if one handler is mis-configured.
diff --git a/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml b/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml
index ac23bf786a8..366bf912288 100644
--- a/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml
@@ -17,6 +17,7 @@
 -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Set this to 'false' if you want solr to continue working after it has 
        encountered an severe configuration error.  In a production environment, 
        you may want solr to keep working even if one handler is mis-configured.
diff --git a/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml b/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml
index 4b7054a2159..f59081ef057 100644
--- a/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml
@@ -17,6 +17,7 @@
 -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Set this to 'false' if you want solr to continue working after it has 
        encountered an severe configuration error.  In a production environment, 
        you may want solr to keep working even if one handler is mis-configured.
diff --git a/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml
index 4e1d718c965..093416d40dd 100644
--- a/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml
@@ -17,6 +17,7 @@
 -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Set this to 'false' if you want solr to continue working after it has 
        encountered an severe configuration error.  In a production environment, 
        you may want solr to keep working even if one handler is mis-configured.
diff --git a/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml b/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
index de8e7c76695..4d53a8f3391 100644
--- a/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
+++ b/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
@@ -117,8 +117,8 @@
       -->
     <fieldtype name="text" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
+        <tokenizer class="solr.ClassicTokenizerFactory"/>
+        <filter class="solr.ClassicFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory"/>
         <filter class="solr.PorterStemFilterFactory"/>
@@ -133,7 +133,7 @@
     <fieldtype name="teststop" class="solr.TextField">
        <analyzer>
         <tokenizer class="solr.LowerCaseTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
+        <filter class="solr.ClassicFilterFactory"/>
         <filter class="solr.StopFilterFactory" words="stopwords.txt"/>
       </analyzer>
     </fieldtype>
@@ -168,14 +168,14 @@
     </fieldtype>
     <fieldtype name="standardtokfilt" class="solr.TextField">
       <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
+        <tokenizer class="solr.ClassicTokenizerFactory"/>
+        <filter class="solr.ClassicFilterFactory"/>
       </analyzer>
     </fieldtype>
     <fieldtype name="standardfilt" class="solr.TextField">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
+        <filter class="solr.ClassicFilterFactory"/>
       </analyzer>
     </fieldtype>
     <fieldtype name="lowerfilt" class="solr.TextField">
diff --git a/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml b/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml
index 4b18605427e..30401b1a320 100644
--- a/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml
+++ b/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <jmx />
 
   <!-- Used to specify an alternate directory to hold all index data.
diff --git a/solr/example/multicore/core0/conf/solrconfig.xml b/solr/example/multicore/core0/conf/solrconfig.xml
index 69b534e6324..f8ba12efc37 100644
--- a/solr/example/multicore/core0/conf/solrconfig.xml
+++ b/solr/example/multicore/core0/conf/solrconfig.xml
@@ -21,7 +21,7 @@
  It is *not* a good example to work from. 
 -->
 <config>
-
+  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
diff --git a/solr/example/multicore/core1/conf/solrconfig.xml b/solr/example/multicore/core1/conf/solrconfig.xml
index 11be4843e2d..f92d54e8f9c 100644
--- a/solr/example/multicore/core1/conf/solrconfig.xml
+++ b/solr/example/multicore/core1/conf/solrconfig.xml
@@ -21,6 +21,7 @@
  It is *not* a good example to work from. 
 -->
 <config>
+  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
diff --git a/solr/src/java/org/apache/solr/core/SolrConfig.java b/solr/src/java/org/apache/solr/core/SolrConfig.java
index 0d5e97439f7..6834026645d 100644
--- a/solr/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/src/java/org/apache/solr/core/SolrConfig.java
@@ -138,7 +138,7 @@ public class SolrConfig extends Config {
     reopenReaders = getBool("mainIndex/reopenReaders", true);
     
     booleanQueryMaxClauseCount = getInt("query/maxBooleanClauses", BooleanQuery.getMaxClauseCount());
-    luceneMatchVersion = getLuceneVersion("luceneMatchVersion", Version.LUCENE_30);
+    luceneMatchVersion = getLuceneVersion("luceneMatchVersion");
     log.info("Using Lucene MatchVersion: " + luceneMatchVersion);
 
     filtOptEnabled = getBool("query/boolTofilterOptimizer/@enabled", false);
diff --git a/solr/src/test/test-files/solr/conf/bad_solrconfig.xml b/solr/src/test/test-files/solr/conf/bad_solrconfig.xml
index 6f6213ee5d5..b14aad5af2c 100644
--- a/solr/src/test/test-files/solr/conf/bad_solrconfig.xml
+++ b/solr/src/test/test-files/solr/conf/bad_solrconfig.xml
@@ -23,6 +23,7 @@
   -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <indexDefaults>
     <useCompoundFile>${unset.sys.property}</useCompoundFile>
   </indexDefaults>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml b/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
index 1ede86536bb..87687fe43fa 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <jmx />
 
   <!-- Used to specify an alternate directory to hold all index data.
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml b/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
index ecb9a136eb2..96cfd2d1592 100755
--- a/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
@@ -18,6 +18,7 @@
 -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
   <directoryFactory name="DirectoryFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestFSDirectoryFactory"></directoryFactory>
   <indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestIndexReaderFactory"></indexReaderFactory >
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
index 0ba439003d0..3efbb4ee66d 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <jmx />
 
   <!-- Used to specify an alternate directory to hold all index data.
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
index ad4e376f4e4..d16a2c9325c 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
@@ -18,6 +18,7 @@
 -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <mainIndex>
     <deletionPolicy class="org.apache.solr.core.FakeDeletionPolicy">
       <str name="var1">value1</str>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml b/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
index 711d9a20128..cff9b91de45 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Used to specify an alternate directory to hold all index data.
        It defaults to "index" if not present, and should probably
        not be changed if replication is in use. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml b/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
index f08afc9650f..ad74c86908c 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <jmx />
 
   <!-- Used to specify an alternate directory to hold all index data.
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml b/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
index a8dc6e47aff..6b7fc206e12 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
   <!--  The DirectoryFactory to use for indexes.
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml b/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
index 3ea4716ce0b..e56f5bbe634 100755
--- a/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Used to specify an alternate directory to hold all index data.
        It defaults to "index" if not present, and should probably
        not be changed if replication is in use. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml b/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
index b9ae888d013..aca9aba90df 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Used to specify an alternate directory to hold all index data.
        It defaults to "index" if not present, and should probably
        not be changed if replication is in use. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml b/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
index 37ae72065d4..4ea3bcb52e2 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
@@ -37,7 +37,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <jmx />
 
   <!-- Used to specify an alternate directory to hold all index data.
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-master.xml b/solr/src/test/test-files/solr/conf/solrconfig-master.xml
index 9514397ea45..ec02bd19ddc 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-master.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-master.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-  <luceneMatchVersion>4.0</luceneMatchVersion>  
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>  
 
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-master1.xml b/solr/src/test/test-files/solr/conf/solrconfig-master1.xml
index c227f6371f6..12e4012817c 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-master1.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-master1.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
   <indexDefaults>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-master2.xml b/solr/src/test/test-files/solr/conf/solrconfig-master2.xml
index f8e94d246fe..79aae444a29 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-master2.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-master2.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
   <indexDefaults>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml b/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
index 78a6e180639..7bb80c6e9e6 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Used to specify an alternate directory to hold all index data.
        It defaults to "index" if not present, and should probably
        not be changed if replication is in use. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml b/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
index ee223f0f868..7a0baeb1a05 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
@@ -37,7 +37,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <jmx />
 
   <!-- Used to specify an alternate directory to hold all index data.
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml b/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
index 43d51272605..b942f169aff 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
@@ -37,7 +37,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <jmx />
 
   <!-- Used to specify an alternate directory to hold all index data.
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml b/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
index 918783158c6..d1d66c119fa 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
@@ -23,6 +23,7 @@
   -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
     <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-slave.xml b/solr/src/test/test-files/solr/conf/solrconfig-slave.xml
index 9720e3bfb06..88e8a8cbbec 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-slave.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-slave.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-  <luceneMatchVersion>4.0</luceneMatchVersion>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
 
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml b/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml
index 3b9bd5eb096..004c036cf3c 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
   <indexDefaults>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml b/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
index 4308cf6af4a..0ddce37bf8a 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
   <!--  The DirectoryFactory to use for indexes.
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml b/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
index b0009882875..102e89af20b 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
@@ -25,7 +25,7 @@ Config for testing spellcheck component
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <requestHandler name="standard"
      class="solr.StandardRequestHandler"></requestHandler>
 
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml b/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
index ece18d8d7b3..f985ee568d2 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
@@ -22,7 +22,7 @@
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
 
-  <luceneMatchVersion>4.0</luceneMatchVersion>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
 
   <indexDefaults>
     <useCompoundFile>false</useCompoundFile>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml b/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
index 5f440277635..59d13566a5b 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- see TestConfig.testLib() -->
   <lib dir="../lib-dirs/a" />
   <lib dir="../lib-dirs/b" regex="b." />
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml b/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
index 5dbbed94e67..fc44036944e 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
@@ -18,7 +18,7 @@
 -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml b/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
index 1167df89bb8..d99463704d0 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
@@ -23,7 +23,7 @@
   -->
 
 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <jmx />
 
   <!-- Used to specify an alternate directory to hold all index data.
diff --git a/solr/src/test/test-files/solr/conf/solrconfig.xml b/solr/src/test/test-files/solr/conf/solrconfig.xml
index 81e6a075f66..4c5aa77b88d 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig.xml
@@ -50,7 +50,7 @@
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
 
-  <luceneMatchVersion>4.0</luceneMatchVersion>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
 
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
diff --git a/solr/src/test/test-files/solr/conf/solrconfig_perf.xml b/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
index 119ec09157c..42740fe93c3 100755
--- a/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
@@ -17,6 +17,7 @@
 -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <!-- Used to specify an alternate directory to hold all index data
        other than the default ./data under the Solr home.
        If replication is in use, this should match the replication configuration. -->
diff --git a/solr/src/test/test-files/solr/crazy-path-to-config.xml b/solr/src/test/test-files/solr/crazy-path-to-config.xml
index d9ba0e13093..321008927f9 100644
--- a/solr/src/test/test-files/solr/crazy-path-to-config.xml
+++ b/solr/src/test/test-files/solr/crazy-path-to-config.xml
@@ -24,6 +24,7 @@
   -->
 
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <indexDefaults>
     <useCompoundFile>false</useCompoundFile>
     <mergeFactor>10</mergeFactor>
diff --git a/solr/src/test/test-files/solr/shared/conf/solrconfig.xml b/solr/src/test/test-files/solr/shared/conf/solrconfig.xml
index b95eeb36830..031fbb02e5c 100644
--- a/solr/src/test/test-files/solr/shared/conf/solrconfig.xml
+++ b/solr/src/test/test-files/solr/shared/conf/solrconfig.xml
@@ -21,6 +21,7 @@
  It is *not* a good example to work from. 
 -->
 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <dataDir>${solr.solr.home}/data/${l10n}-${version}</dataDir>