This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/release22.01 by this push:
     new b852bd7ce Revert "Fixed: In Solr fixe NPE in FieldLengthFeature with 
non-stored/missing fields." (OFBIZ-12898)
b852bd7ce is described below

commit b852bd7cee6121a0093e1ec9d006e6da594a75c9
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Feb 12 17:56:19 2024 +0100

    Revert "Fixed: In Solr fixe NPE in FieldLengthFeature with 
non-stored/missing fields."
    (OFBIZ-12898)
    
    At least testAddListToSolrIndex does not pass. It's a weird error. But as we
    no longer intent to release this branch, it's easier to revert this commit 
than
    to investigate the reason...
    
    [JUNIT (error)] - testAddListToSolrIndex : 
org.apache.ofbiz.service.GenericServiceException:
    Service [addListToSolrIndex] target threw an unexpected exception
    (Error from server at https://localhost:8443/solr/solrdefault:
    SolrCore 'solrdefault' is not available due to init failure:
    Could not load conf for core solrdefault: Error loading solr config from
    plugins/solr/home/solrdefault/conf/solrconfig.xml
---
 lucene/build.gradle                                                 | 6 +++---
 .../src/main/java/org/apache/ofbiz/content/search/SearchWorker.java | 2 +-
 solr/build.gradle                                                   | 2 +-
 solr/home/solrdefault/conf/solrconfig.xml                           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lucene/build.gradle b/lucene/build.gradle
index b2e165156..ac9c98ef2 100644
--- a/lucene/build.gradle
+++ b/lucene/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     // 1. Remember to change the version LUCENE_VERSION in SearchWorker class 
when upgrading.
     // 2. luceneMatchVersion should be updated in solrconfig.xml
     // 3. Also Solr et Lucene should use the same version, 
-    pluginLibsCompile 'org.apache.lucene:lucene-core:8.11.3'
-    pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.11.3'
-    pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.11.3'
+    pluginLibsCompile 'org.apache.lucene:lucene-core:8.11.2'
+    pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.11.2'
+    pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.11.2'
 }
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 0fd586355..c7f90ac81 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_3;
+    private static final Version LUCENE_VERSION = Version.LUCENE_8_11_2;
 
     private SearchWorker() { }
 
diff --git a/solr/build.gradle b/solr/build.gradle
index 011c81f2b..fc57456dc 100644
--- a/solr/build.gradle
+++ b/solr/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     // 1. Remember to change the version LUCENE_VERSION in SearchWorker class 
when upgrading.
     // 2. luceneMatchVersion should be updated in solrconfig.xml
     // 3. Also Solr et Lucene should use the same version, 
-    pluginLibsCompile 'org.apache.solr:solr-core:8.11.3'
+    pluginLibsCompile 'org.apache.solr:solr-core:8.11.2'
     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 9f2cee511..e9e9ae6e0 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.11.3/luceneMatchVersion>
+  <luceneMatchVersion>8.11.2</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

Reply via email to