Improved: Update build.gradle to the latest dependencies

(OFBIZ-11151) Like for OFBIZ-10922 some updates were not possible. Please refer to the Jira for more information git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1864973 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 12, 2019 · 4f19b76 · 4f19b76
1 parent 3747e3d
commit 4f19b76
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/example/build.gradle b/example/build.gradle
@@ -18,5 +18,5 @@
  */
 
 dependencies {
-    pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.21'
+    pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.22'
 }
diff --git 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:7.5.0' 
-    pluginLibsCompile 'org.apache.lucene:lucene-queryparser:7.5.0'
-    pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:7.5.0'
+    pluginLibsCompile 'org.apache.lucene:lucene-core:8.2.0' 
+    pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.2.0'
+    pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.2.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
@@ -41,7 +41,7 @@ public final class SearchWorker {
 
     public static final String module = SearchWorker.class.getName();
 
-    private static final Version LUCENE_VERSION = Version.LUCENE_7_5_0;
+    private static final Version LUCENE_VERSION = Version.LUCENE_8_2_0;
 
     private SearchWorker() {}
 

diff --git a/lucene/src/main/java/org/apache/ofbiz/content/test/LuceneTests.java b/lucene/src/main/java/org/apache/ofbiz/content/test/LuceneTests.java
@@ -20,8 +20,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 package org.apache.ofbiz.content.test;
 
 import java.io.File;
-import java.lang.Object;
-import java.lang.String;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -36,12 +34,12 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.lucene.search.TopScoreDocCollector;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
+import org.apache.ofbiz.base.util.Debug;
 import org.apache.ofbiz.content.search.SearchWorker;
 import org.apache.ofbiz.entity.GenericValue;
 import org.apache.ofbiz.entity.util.EntityQuery;
 import org.apache.ofbiz.service.ServiceUtil;
 import org.apache.ofbiz.service.testtools.OFBizTestCase;
-import org.apache.ofbiz.base.util.Debug;
 
 public class LuceneTests extends OFBizTestCase {
 
@@ -99,7 +97,7 @@ public void testSearchTermHand() throws Exception {
         combQueryBuilder.add(query, BooleanClause.Occur.MUST);
         BooleanQuery combQuery = combQueryBuilder.build();
 
-        TopScoreDocCollector collector = TopScoreDocCollector.create(10);
+        TopScoreDocCollector collector = TopScoreDocCollector.create(10, 10);
         searcher.search(combQuery, collector);
 
         assertEquals("Only 1 result expected from the testdata", 1, collector.getTotalHits());

diff --git a/pricat/build.gradle b/pricat/build.gradle
@@ -18,8 +18,8 @@
  */
 dependencies {
     pluginLibsCompile 'org.safehaus.jug:jug:2.0.0:asl'
-    pluginLibsCompile 'org.apache.poi:poi-ooxml:3.17'
-    pluginLibsCompile 'org.apache.poi:poi-ooxml-schemas:3.17'
-    pluginLibsCompile 'org.apache.poi:poi-excelant:3.17'
-    pluginLibsCompile 'org.apache.poi:poi-scratchpad:3.17'
+    pluginLibsCompile 'org.apache.poi:poi-ooxml:4.1.0'
+    pluginLibsCompile 'org.apache.poi:poi-ooxml-schemas:4.1.0'
+    pluginLibsCompile 'org.apache.poi:poi-excelant:4.1.0'
+    pluginLibsCompile 'org.apache.poi:poi-scratchpad:4.1.0'
 }
diff --git a/solr/build.gradle b/solr/build.gradle
@@ -17,7 +17,9 @@
  * under the License.
  */
 dependencies {
-    pluginLibsCompile 'org.apache.solr:solr-core:7.5.0' // Remember to change the version number in SearchWorker class when upgrading. Also Solr et Lucene should use the same version
+    // 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.2.0'
     pluginLibsCompile 'com.google.guava:guava:20.0'
 }
 

diff --git 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>7.5.0</luceneMatchVersion>
+  <luceneMatchVersion>8.2.0</luceneMatchVersion>
 
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars