[ofbiz-framework] branch trunk updated: Improved: Upgrade to gradle 7.6 - support jdk 11 -> 17 (OFBIZ-12400)

[jl...@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-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 4044b86460 Improved: Upgrade to gradle 7.6 - support jdk 11 -> 17 (OFBIZ-12400)
4044b86460 is described below

commit 4044b86460894d6d1dcea6e374c1b18c63054c7b
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Wed Nov 30 14:33:47 2022 +0100

    Improved: Upgrade to gradle 7.6 - support jdk 11 -> 17 (OFBIZ-12400)
    
    Upgrades Groovy from 2.5.18 to 3.0.13 (no longer compile issue, UI tests OK)
    
    Thanks: Ioan Eugen Stan for testing
---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 373a6fac09..87b8b897da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -107,7 +107,7 @@ javadoc {
         links(
             'https://docs.oracle.com/javase/11/docs/api',
             'https://tomcat.apache.org/tomcat-9.0-doc/servletapi/',
-            'http://docs.groovy-lang.org/docs/groovy-2.5.18/html/api',
+            'http://docs.groovy-lang.org/docs/groovy-3.0.13/html/api',
             'https://commons.apache.org/proper/commons-cli/apidocs'
         )
     }
@@ -255,7 +255,7 @@ dependencies {
     implementation 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
     implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
     implementation 'org.clojure:clojure:1.11.1'
-    implementation 'org.codehaus.groovy:groovy-all:2.5.18' // Compile issue with commons-cli and Groovy 3. Remember to change the version number in javadoc block.
+    implementation 'org.codehaus.groovy:groovy-all:3.0.13'
     implementation 'org.freemarker:freemarker:2.3.31' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4
     implementation 'org.owasp.esapi:esapi:2.5.0.0'
     implementation 'org.cyberneko:html:1.9.8'