Index: dev-tools/maven/solr/contrib/clustering/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/clustering/pom.xml.template	(revision 1136967)
+++ dev-tools/maven/solr/contrib/clustering/pom.xml.template	(working copy)
@@ -34,7 +34,6 @@
   <properties>
     <module-directory>solr/contrib/clustering</module-directory>
     <build-directory>build</build-directory>
-    <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
   </properties>
   <dependencies>
     <dependency>
Index: dev-tools/maven/solr/contrib/extraction/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/extraction/pom.xml.template	(revision 1136967)
+++ dev-tools/maven/solr/contrib/extraction/pom.xml.template	(working copy)
@@ -37,7 +37,6 @@
   <properties>
     <module-directory>solr/contrib/extraction</module-directory>
     <build-directory>build</build-directory>
-    <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
   </properties>
   <dependencies>
     <dependency>
Index: dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template	(revision 1136967)
+++ dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template	(working copy)
@@ -34,7 +34,6 @@
   <properties>
     <module-directory>solr/contrib/dataimporthandler</module-directory>
     <build-directory>../target</build-directory>
-    <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
   </properties>
   <dependencies>
     <dependency>
Index: dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template	(revision 1136967)
+++ dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template	(working copy)
@@ -34,7 +34,6 @@
   <properties>
     <module-directory>solr/contrib/dataimporthandler/src/extras</module-directory>
     <build-directory>../../target/extras</build-directory>
-    <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
   </properties>
   <dependencies>
     <dependency>
Index: dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template	(revision 1136967)
+++ dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template	(working copy)
@@ -34,7 +34,6 @@
   <properties>
     <module-directory>solr/contrib/analysis-extras</module-directory>
     <build-directory>build</build-directory>
-    <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
   </properties>
   <dependencies>
     <dependency>
Index: dev-tools/maven/solr/contrib/uima/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/uima/pom.xml.template	(revision 1136967)
+++ dev-tools/maven/solr/contrib/uima/pom.xml.template	(working copy)
@@ -34,7 +34,6 @@
   <properties>
     <module-directory>solr/contrib/uima</module-directory>
     <build-directory>build</build-directory>
-    <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
   </properties>
   <dependencies>
     <dependency>
Index: dev-tools/maven/solr/pom.xml.template
===================================================================
--- dev-tools/maven/solr/pom.xml.template	(revision 1136995)
+++ dev-tools/maven/solr/pom.xml.template	(working copy)
@@ -38,6 +38,9 @@
     <module>src/test-framework</module>
     <module>contrib</module>
   </modules>
+  <properties>
+    <tests.luceneMatchVersion>LUCENE_CURRENT</tests.luceneMatchVersion>
+  </properties>
   <issueManagement>
     <system>JIRA</system>
     <url>http://issues.apache.org/jira/browse/SOLR</url>
Index: dev-tools/maven/solr/src/pom.xml.template
===================================================================
--- dev-tools/maven/solr/src/pom.xml.template	(revision 1136967)
+++ dev-tools/maven/solr/src/pom.xml.template	(working copy)
@@ -34,7 +34,6 @@
   <properties>
     <module-directory>solr</module-directory>
     <build-directory>../build</build-directory>
-    <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
   </properties>
   <dependencies>
     <dependency>
Index: dev-tools/maven/solr/src/solrj/pom.xml.template
===================================================================
--- dev-tools/maven/solr/src/solrj/pom.xml.template	(revision 1136967)
+++ dev-tools/maven/solr/src/solrj/pom.xml.template	(working copy)
@@ -34,7 +34,6 @@
   <properties>
     <module-directory>solr/src/solrj</module-directory>
     <build-directory>../../build/solrj</build-directory>
-    <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
   </properties>
   <dependencies>
     <dependency>