You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2023/07/31 09:27:21 UTC

[groovy] branch master updated (b9436de382 -> f3e29ad42f)

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

paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


    from b9436de382 GROOVY-11139: Bump checkstyle to 10.12.2 (build dependency)
     new 60a188c975 align quote style
     new 2d6c61e5dc add comment to assist with future upgrading
     new e3823c7a12 minor refactor: used moved method not deprecated one
     new bb8eb83be3 GROOVY-11140: Bump Codenarc to 3.3.0-groovy-4.0 (build dependency)
     new 79efc4f71b remove unnecessary semicolon
     new f3e29ad42f align import style

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.gradle                                             |  2 +-
 src/main/groovy/groovy/cli/CliBuilderException.groovy    |  2 +-
 src/main/groovy/groovy/grape/GrapeIvy.groovy             | 16 ++++++++++++----
 .../java/org/apache/groovy/antlr/GroovydocVisitor.java   |  4 ++--
 subprojects/groovy-json/build.gradle                     |  2 +-
 versions.properties                                      |  2 +-
 6 files changed, 18 insertions(+), 10 deletions(-)


[groovy] 04/06: GROOVY-11140: Bump Codenarc to 3.3.0-groovy-4.0 (build dependency)

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit bb8eb83be34c8fc667d52268a2f082ec0d773ace
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 31 19:21:17 2023 +1000

    GROOVY-11140: Bump Codenarc to 3.3.0-groovy-4.0 (build dependency)
---
 versions.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.properties b/versions.properties
index 2c8565eda0..f0519a15dc 100644
--- a/versions.properties
+++ b/versions.properties
@@ -21,7 +21,7 @@ asciidoctorGroovyDsl=2.0.2
 asm=9.5
 antlr4=4.11.1.4
 bridger=1.6.Final
-codenarc=3.0.0
+codenarc=3.3.0-groovy-4.0
 cobertura=1.9.4.1
 commonsCli=1.5.0
 commonsMath3=3.6.1


[groovy] 05/06: remove unnecessary semicolon

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 79efc4f71b206c8ef6c22f12940f17e87e1ac140
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 31 19:22:05 2023 +1000

    remove unnecessary semicolon
---
 src/main/groovy/groovy/cli/CliBuilderException.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/groovy/groovy/cli/CliBuilderException.groovy b/src/main/groovy/groovy/cli/CliBuilderException.groovy
index 7bd864857f..81b8150407 100644
--- a/src/main/groovy/groovy/cli/CliBuilderException.groovy
+++ b/src/main/groovy/groovy/cli/CliBuilderException.groovy
@@ -22,5 +22,5 @@ import groovy.transform.InheritConstructors
 
 @InheritConstructors
 class CliBuilderException extends RuntimeException {
-    private static final long serialVersionUID = 3996705753888714632L;
+    private static final long serialVersionUID = 3996705753888714632L
 }


[groovy] 01/06: align quote style

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 60a188c9750c0b87a2f84d76453a7e050c7e42b2
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 31 19:10:07 2023 +1000

    align quote style
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f30b791abc..ebb476fe67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id 'me.champeau.buildscan-recipes' version '0.2.3'
     id 'com.github.ben-manes.versions' version '0.47.0'
     id 'com.github.blindpirate.osgi' version '0.0.7'
-    id "com.github.jk1.dependency-license-report" version "2.5"
+    id 'com.github.jk1.dependency-license-report' version '2.5'
     id 'org.sonarqube' version '4.2.1.3168'
     id 'org.apache.groovy-core'
     id 'java-test-fixtures'


[groovy] 06/06: align import style

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit f3e29ad42ffe2bdb450990226222e069f050bdce
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 31 19:27:09 2023 +1000

    align import style
---
 src/main/groovy/groovy/grape/GrapeIvy.groovy | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/groovy/groovy/grape/GrapeIvy.groovy b/src/main/groovy/groovy/grape/GrapeIvy.groovy
index f942fc84de..94778f5cb6 100644
--- a/src/main/groovy/groovy/grape/GrapeIvy.groovy
+++ b/src/main/groovy/groovy/grape/GrapeIvy.groovy
@@ -18,7 +18,12 @@
  */
 package groovy.grape
 
-import groovy.transform.*
+import groovy.transform.AutoFinal
+import groovy.transform.CompileDynamic
+import groovy.transform.CompileStatic
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NamedParam
+import groovy.transform.NamedParams
 import org.apache.groovy.plugin.GroovyRunner
 import org.apache.groovy.plugin.GroovyRunnerRegistry
 import org.apache.ivy.Ivy
@@ -49,7 +54,10 @@ import org.codehaus.groovy.reflection.ClassInfo
 import org.codehaus.groovy.reflection.ReflectionUtils
 import org.codehaus.groovy.runtime.m12n.ExtensionModuleScanner
 import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl
+import org.w3c.dom.Element
 
+import javax.xml.parsers.DocumentBuilderFactory
+import java.text.ParseException
 import java.util.jar.JarFile
 import java.util.regex.Pattern
 import java.util.zip.ZipEntry
@@ -97,7 +105,7 @@ class GrapeIvy implements GrapeEngine {
         if (grapeConfig.exists()) {
             try {
                 settings.load(grapeConfig)
-            } catch (java.text.ParseException e) {
+            } catch (ParseException e) {
                 System.err.println("Local Ivy config file '${grapeConfig.getCanonicalPath()}' appears corrupt - ignoring it and using default config instead\nError was: ${e.getMessage()}")
                 settings.load(GrapeIvy.getResource('defaultGrapeConfig.xml'))
             }
@@ -525,11 +533,11 @@ class GrapeIvy implements GrapeEngine {
                         // TODO: handle other types? e.g. 'dlls'
                         def jardir = new File(moduleDir, 'jars')
                         if (!jardir.exists()) return
-                        def db = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder()
+                        def db = DocumentBuilderFactory.newInstance().newDocumentBuilder()
                         def root = db.parse(ivyFile).getDocumentElement()
                         def publis = root.getElementsByTagName('publications')
                         for (int i = 0; i < publis.length; i += 1) {
-                            def artifacts = ((org.w3c.dom.Element) publis.item(i)).getElementsByTagName('artifact')
+                            def artifacts = ((Element) publis.item(i)).getElementsByTagName('artifact')
                             processArtifacts(artifacts, rev, jardir)
                         }
                         ivyFile.delete()


[groovy] 03/06: minor refactor: used moved method not deprecated one

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit e3823c7a12828dd1ab0174c277ad8f746807b012
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 31 19:14:56 2023 +1000

    minor refactor: used moved method not deprecated one
---
 .../src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java b/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
index f5f0882064..4369f03bcf 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
@@ -38,7 +38,7 @@ import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.groovydoc.GroovyClassDoc;
 import org.codehaus.groovy.groovydoc.GroovyFieldDoc;
 import org.codehaus.groovy.groovydoc.GroovyMethodDoc;
-import org.codehaus.groovy.runtime.DefaultGroovyMethods;
+import org.codehaus.groovy.runtime.ArrayGroovyMethods;
 import org.codehaus.groovy.tools.groovydoc.LinkArgument;
 import org.codehaus.groovy.tools.groovydoc.SimpleGroovyAnnotationRef;
 import org.codehaus.groovy.tools.groovydoc.SimpleGroovyClassDoc;
@@ -234,7 +234,7 @@ public class GroovydocVisitor extends ClassCodeVisitorSupport {
     private String genericTypesAsString(GenericsType[] genericsTypes) {
         if (genericsTypes == null || genericsTypes.length == 0)
             return "";
-        return "<" + DefaultGroovyMethods.join(genericsTypes, ", ") + ">";
+        return "<" + ArrayGroovyMethods.join(genericsTypes, ", ") + ">";
     }
 
     private void processPropertiesFromGetterSetter(SimpleGroovyMethodDoc currentMethodDoc) {


[groovy] 02/06: add comment to assist with future upgrading

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 2d6c61e5dc073c91691be151ea7779a6bcabaac0
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 31 19:10:42 2023 +1000

    add comment to assist with future upgrading
---
 subprojects/groovy-json/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subprojects/groovy-json/build.gradle b/subprojects/groovy-json/build.gradle
index eb7d6b2007..ea2874b92c 100644
--- a/subprojects/groovy-json/build.gradle
+++ b/subprojects/groovy-json/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 
     testImplementation projects.groovyTest
     testImplementation projects.groovyDateutil
-    testImplementation 'net.javacrumbs.json-unit:json-unit:2.38.0'
+    testImplementation 'net.javacrumbs.json-unit:json-unit:2.38.0' // 3.0.0 requires JDK17
 
     testRuntimeOnly project(':'), {
         because "Tests are using Grapes"