[ofbiz-plugins] branch trunk updated: Improved: Update build.gradle to the latest dependencies

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-plugins] branch trunk updated: Improved: Update build.gradle to the latest dependencies

jleroux@apache.org
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


The following commit(s) were added to refs/heads/trunk by this push:
     new 1cacb15  Improved: Update build.gradle to the latest dependencies
1cacb15 is described below

commit 1cacb150000f271f6599d24146b9307f3223f446
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Tue Apr 21 12:00:32 2020 +0200

    Improved: Update build.gradle to the latest dependencies
   
    (OFBIZ-11603)
   
    I tried to update to Groovy 3 but got a compile issue with commons-cli.
    I did not dig further.
---
 example/build.gradle                                          |  4 ++--
 ldap/build.gradle                                             |  4 ++--
 lucene/build.gradle                                           | 11 ++++++-----
 .../java/org/apache/ofbiz/content/search/SearchWorker.java    |  2 +-
 pricat/build.gradle                                           |  8 ++++----
 solr/build.gradle                                             |  2 +-
 solr/home/solrdefault/conf/solrconfig.xml                     |  2 +-
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/example/build.gradle b/example/build.gradle
index d09d658..1cdb080 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -18,5 +18,5 @@
  */
 
 dependencies {
-    pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.27'
-}
\ No newline at end of file
+    pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.34'
+}
diff --git a/ldap/build.gradle b/ldap/build.gradle
index f57e38a..2998efc 100644
--- a/ldap/build.gradle
+++ b/ldap/build.gradle
@@ -18,5 +18,5 @@
  */
 
 dependencies {
-    pluginLibsCompile 'org.jasig.cas:cas-server-core:3.3.5'
-}
\ No newline at end of file
+    pluginLibsCompile 'org.jasig.cas:cas-server-core:3.3.5' // So far we did not update from 3.3.5 because of a compile issue. You may try w/ a newer version than  4.2.7
+}
diff --git a/lucene/build.gradle b/lucene/build.gradle
index a64ac6d..8c96886 100644
--- a/lucene/build.gradle
+++ b/lucene/build.gradle
@@ -17,9 +17,10 @@
  * under the License.
  */
 dependencies {
-    // Remember to change the version number in SearchWorker class when upgrading.
+    // 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.2.0'
-    pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.2.0'
-    pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.2.0'
-}
\ No newline at end of file
+    // LUCENE_VERSION in SearchWorker.java should be updated
+    pluginLibsCompile 'org.apache.lucene:lucene-core:8.5.0'
+    pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.5.0'
+    pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.5.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 835b3d3..44df97e 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_2_0;
+    private static final Version LUCENE_VERSION = Version.LUCENE_8_5_0;
 
     private SearchWorker() {}
 
diff --git a/pricat/build.gradle b/pricat/build.gradle
index d1ef887..c4aac75 100644
--- 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: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'
+    pluginLibsCompile 'org.apache.poi:poi-ooxml:4.1.2'
+    pluginLibsCompile 'org.apache.poi:poi-ooxml-schemas:4.1.2'
+    pluginLibsCompile 'org.apache.poi:poi-excelant:4.1.2'
+    pluginLibsCompile 'org.apache.poi:poi-scratchpad:4.1.2'
 }
\ No newline at end of file
diff --git a/solr/build.gradle b/solr/build.gradle
index 6d76690..4db33dc 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.2.0'
+    pluginLibsCompile 'org.apache.solr:solr-core:8.5.0'
     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 f4946f5..e139969 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.2.0</luceneMatchVersion>
+  <luceneMatchVersion>8.5.0</luceneMatchVersion>
   
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars