Fixed: Announce 17.12.09 EOL (OFBIZ-12479)
Includes:
Update Solr and Lucene to address several CVEs (including Log4j) (OFBIZ-12464)
diff --git a/lucene/build.gradle b/lucene/build.gradle
index c711417..6c15da8 100644
--- a/lucene/build.gradle
+++ b/lucene/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.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.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 04d33ad..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 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_1;
private SearchWorker() {}
diff --git a/solr/build.gradle b/solr/build.gradle
index c02184e..4cd8b0a 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.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