svn commit: r1845150 - in /ofbiz/ofbiz-plugins/trunk: lucene/build.gradle lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java solr/build.gradle solr/home/solrdefault/conf/solrconfig.xml

Author: jleroux
Date: Mon Oct 29 17:26:25 2018
New Revision: 1845150

URL: http://svn.apache.org/viewvc?rev=1845150&view=rev
Log:
Improved: Update Solr and Lucene from 7.3.1 to Solr 7.5.0
(OFBIZ-10589)

https://lucene.apache.org/solr/guide/7_5/solr-upgrade-notes.html 
should help people to adapt to 7.5 from 7.3

There are more information in the Jira

Modified:
    ofbiz/ofbiz-plugins/trunk/lucene/build.gradle
    ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java
    ofbiz/ofbiz-plugins/trunk/solr/build.gradle
    ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml

Modified: ofbiz/ofbiz-plugins/trunk/lucene/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/lucene/build.gradle?rev=1845150&r1=1845149&r2=1845150&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/lucene/build.gradle (original)
+++ ofbiz/ofbiz-plugins/trunk/lucene/build.gradle Mon Oct 29 17:26:25 2018
@@ -17,7 +17,9 @@
  * under the License.
  */
 dependencies {
-    pluginLibsCompile 'org.apache.lucene:lucene-core:7.3.1' // Remember to change the version number in SearchWorker class when upgrading. Also Solr et Lucene should use the same version
-    pluginLibsCompile 'org.apache.lucene:lucene-queryparser:7.3.1'
-    pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:7.3.1'
+    // Remember to change the version number in SearchWorker class when upgrading.
+    // Also Solr et Lucene should use the same version, luceneMatchVersion should be updated in solrconfig.xml
+    pluginLibsCompile 'org.apache.lucene:lucene-core:7.5.0'
+    pluginLibsCompile 'org.apache.lucene:lucene-queryparser:7.5.0'
+    pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:7.5.0'
 }
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java?rev=1845150&r1=1845149&r2=1845150&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java (original)
+++ ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java Mon Oct 29 17:26:25 2018
@@ -41,7 +41,7 @@ public final class SearchWorker {
 
     public static final String module = SearchWorker.class.getName();
 
-    private static final Version LUCENE_VERSION = Version.LUCENE_7_3_1;
+    private static final Version LUCENE_VERSION = Version.LUCENE_7_5_0;
 
     private SearchWorker() {}
 

Modified: ofbiz/ofbiz-plugins/trunk/solr/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/build.gradle?rev=1845150&r1=1845149&r2=1845150&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/build.gradle (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/build.gradle Mon Oct 29 17:26:25 2018
@@ -17,7 +17,7 @@
  * under the License.
  */
 dependencies {
-    pluginLibsCompile 'org.apache.solr:solr-core:7.3.1' // Remember to change the version number in SearchWorker class when upgrading. Also Solr et Lucene should use the same version
+    pluginLibsCompile 'org.apache.solr:solr-core:7.5.0' // Remember to change the version number in SearchWorker class when upgrading. Also Solr et Lucene should use the same version
     pluginLibsCompile 'com.google.guava:guava:20.0'
 }
 
@@ -27,4 +27,4 @@ configurations.all {
           substitute module('com.google.guava:guava') with module('com.google.guava:guava:20.0')
       }
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml?rev=1845150&r1=1845149&r2=1845150&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml Mon Oct 29 17:26:25 2018
@@ -35,7 +35,8 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>6.6.0</luceneMatchVersion>
+  <luceneMatchVersion>7.5.0</luceneMatchVersion>
+  
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in