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:51:08 UTC
[ofbiz-plugins] branch release18.12 updated (3ba155e -> d0f98ef)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git.
from 3ba155e Improved: put bin in gitignore
new b5663ec Improved: Upgrade Solr and Lucene to 8.11 (OFBIZ-12388)
new d0f98ef Fixed: Update Solr and Lucene to address several CVEs (including Log4j) (OFBIZ-12464)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lucene/build.gradle | 8 ++++----
.../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(+), 8 deletions(-)
[ofbiz-plugins] 02/02: Fixed: Update Solr and Lucene to address several CVEs (including Log4j) (OFBIZ-12464)
Posted by jl...@apache.org.
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 d0f98efd7d39827e1205d0aabec4dc9b3ba3b58b
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
Conflicts handled by hand lucene/build.gradle
---
lucene/build.gradle | 6 +++---
.../src/main/java/org/apache/ofbiz/content/search/SearchWorker.java | 2 +-
solr/build.gradle | 4 ++--
solr/home/solrdefault/conf/solrconfig.xml | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lucene/build.gradle b/lucene/build.gradle
index 3d5e084..de8ead4 100644
--- a/lucene/build.gradle
+++ b/lucene/build.gradle
@@ -19,7 +19,7 @@
dependencies {
// 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.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 f88d6d8..c61a680 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_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
[ofbiz-plugins] 01/02: Improved: Upgrade Solr and Lucene to 8.11 (OFBIZ-12388)
Posted by jl...@apache.org.
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 <ja...@les7arts.com>
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'
}