You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2021/12/16 16:18:25 UTC
[ofbiz-plugins] 02/02: Fixed: Update Solr and Lucene to address several CVEs (including Log4j) (OFBIZ-12464)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit 4f26a91aec721122a78fcc3d960f06a33a4d10fb
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Thu Dec 16 17:18:14 2021 +0100
Fixed: Update Solr and Lucene to address several CVEs (including Log4j) (OFBIZ-12464)
See SOLR-15843 and
https://solr.apache.org/guide/8_11/solr-upgrade-notes.html
https://solr.apache.org/docs/8_11_1/changes/Changes.html#v8.11.1.bug_fixes
Also fixes luceneMatchVersion in solrconfig.xml, was forgotten last times
And clarifies comments about that
---
lucene/build.gradle | 9 ++++-----
.../main/java/org/apache/ofbiz/content/search/SearchWorker.java | 2 +-
solr/build.gradle | 4 ++--
solr/home/solrdefault/conf/solrconfig.xml | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/lucene/build.gradle b/lucene/build.gradle
index da0d8ff..406289d 100644
--- a/lucene/build.gradle
+++ b/lucene/build.gradle
@@ -17,10 +17,9 @@
* under the License.
*/
dependencies {
- // Remember to change the version number in SearchWorker class when upgrading.
+ // Remember to change the version LUCENE_VERSION in SearchWorker class when upgrading.
// Also Solr et Lucene should use the same version, luceneMatchVersion should be updated in solrconfig.xml
- // LUCENE_VERSION in SearchWorker.java should be updated
- 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'
+ pluginLibsCompile 'org.apache.lucene:lucene-core:8.11.1'
+ pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.11.1'
+ pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.11.1'
}
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 6275e5a..41d2d69 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 {
private static final String MODULE = SearchWorker.class.getName();
- private static final Version LUCENE_VERSION = Version.LUCENE_8_11_0;
+ private static final Version LUCENE_VERSION = Version.LUCENE_8_11_1;
private SearchWorker() { }
diff --git a/solr/build.gradle b/solr/build.gradle
index bc1b335..7e57866 100644
--- a/solr/build.gradle
+++ b/solr/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 version LUCENE_VERSION 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.11.0'
+ pluginLibsCompile 'org.apache.solr:solr-core:8.11.1'
pluginLibsCompile 'com.google.guava:guava:28.0-jre'
}
diff --git a/solr/home/solrdefault/conf/solrconfig.xml b/solr/home/solrdefault/conf/solrconfig.xml
index a64e004..b9e8e06 100644
--- a/solr/home/solrdefault/conf/solrconfig.xml
+++ b/solr/home/solrdefault/conf/solrconfig.xml
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>8.9.0</luceneMatchVersion>
+ <luceneMatchVersion>8.11.1</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in