This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit b5663ec6c24db37a616256bb5dc4d6e1afda1353 Author: Jacques Le Roux <[email protected]> AuthorDate: Wed Nov 17 19:07:58 2021 +0100 Improved: Upgrade Solr and Lucene to 8.11 (OFBIZ-12388) https://solr.apache.org/docs/8_11_0/changes/Changes.html Conflicts handled by hand in lucene/build.gradle --- lucene/build.gradle | 8 ++++---- .../main/java/org/apache/ofbiz/content/search/SearchWorker.java | 2 +- solr/build.gradle | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lucene/build.gradle b/lucene/build.gradle index c711417..3d5e084 100644 --- a/lucene/build.gradle +++ b/lucene/build.gradle @@ -17,9 +17,9 @@ * under the License. */ dependencies { - // Remember to change the version number in SearchWorker class when upgrading. + // Remember to change the LUCENE_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:8.9.0' - pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.9.0' - pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.9.0' + pluginLibsCompile 'org.apache.lucene:lucene-core:8.11.0' + pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.11.0' + pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.11.0' } diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java b/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java index 04d33ad..f88d6d8 100644 --- a/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java +++ b/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java @@ -41,7 +41,7 @@ public final class SearchWorker { public static final String module = SearchWorker.class.getName(); - private static final Version LUCENE_VERSION = Version.LUCENE_8_9_0; + private static final Version LUCENE_VERSION = Version.LUCENE_8_11_0; private SearchWorker() {} diff --git a/solr/build.gradle b/solr/build.gradle index c02184e..bc1b335 100644 --- a/solr/build.gradle +++ b/solr/build.gradle @@ -19,7 +19,7 @@ dependencies { // 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.solr:solr-core:8.9.0' + pluginLibsCompile 'org.apache.solr:solr-core:8.11.0' pluginLibsCompile 'com.google.guava:guava:28.0-jre' }
