svn commit: r923568 - in /lucene/solr/branches/solr: CHANGES.txt example/solr/conf/solrconfig.xml src/java/org/apache/solr/core/SolrConfig.java

[markrmiller]

Author: markrmiller
Date: Tue Mar 16 03:38:38 2010
New Revision: 923568

URL: http://svn.apache.org/viewvc?rev=923568&view=rev
Log:
SOLR-1677: top of the Lucene Version issue

Modified:
    lucene/solr/branches/solr/CHANGES.txt
    lucene/solr/branches/solr/example/solr/conf/solrconfig.xml
    lucene/solr/branches/solr/src/java/org/apache/solr/core/SolrConfig.java

Modified: lucene/solr/branches/solr/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/solr/CHANGES.txt?rev=923568&r1=923567&r2=923568&view=diff
==============================================================================
--- lucene/solr/branches/solr/CHANGES.txt (original)
+++ lucene/solr/branches/solr/CHANGES.txt Tue Mar 16 03:38:38 2010
@@ -110,6 +110,9 @@ New Features
 
 * SOLR-1815: SolrJ now preserves the order of facet queries. (yonik)
 
+* SOLR-1677: Add support for choosing the Lucene Version for Lucene components 
within
+  Solr. (Uwe Schindler, Mark Miller)
+
 Optimizations
 ----------------------
 

Modified: lucene/solr/branches/solr/example/solr/conf/solrconfig.xml
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/solr/example/solr/conf/solrconfig.xml?rev=923568&r1=923567&r2=923568&view=diff
==============================================================================
--- lucene/solr/branches/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/solr/branches/solr/example/solr/conf/solrconfig.xml Tue Mar 16 
03:38:38 2010
@@ -31,6 +31,14 @@
          -Dsolr.abortOnConfigurationError=false
      -->
   
<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
+  
+  <!--
+    Controls what version of Lucene various components of Solr adhere to. 
Generally, you want
+    to use the latest version to get all bug fixes and improvements. It is 
highly recommended 
+    that you fully re-index after changing this setting as it can affect both 
how text is indexed
+    and queried.
+  -->
+  <luceneMatchVersion>LUCENE_31</luceneMatchVersion>
 
   <!-- lib directives can be used to instruct Solr to load an Jars identified
        and use them to resolve any "plugins" specified in your solrconfig.xml 
or

Modified: 
lucene/solr/branches/solr/src/java/org/apache/solr/core/SolrConfig.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/java/org/apache/solr/core/SolrConfig.java?rev=923568&r1=923567&r2=923568&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/java/org/apache/solr/core/SolrConfig.java 
(original)
+++ lucene/solr/branches/solr/src/java/org/apache/solr/core/SolrConfig.java Tue 
Mar 16 03:38:38 2010
@@ -136,6 +136,7 @@ public class SolrConfig extends Config {
     
     booleanQueryMaxClauseCount = getInt("query/maxBooleanClauses", 
BooleanQuery.getMaxClauseCount());
     luceneMatchVersion = getLuceneVersion("luceneMatchVersion", 
Version.LUCENE_24);
+    log.info("Using Lucene MatchVersion: " + luceneMatchVersion);
 
     filtOptEnabled = getBool("query/boolTofilterOptimizer/@enabled", false);
     filtOptCacheSize = getInt("query/boolTofilterOptimizer/@cacheSize",32);