Updates to support groovy 4 (#439)

* JAR updates and import change (#1) Bump jars to their latest versions Update the CodeNarcServer Update linter groovy version * Revert added space
nvuillam · Dec 15, 2024 · 4d15bc9 · 4d15bc9
1 parent c0ab0d9
commit 4d15bc9
Show file tree

Hide file tree

Showing 39 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -28,7 +28,7 @@ jobs:
         uses: sdkman/sdkman-action@b1f9b696c79148b66d3d3a06f7ea801820318d0f
         with:
           candidate: groovy
-          version: 3.0.9
+          version: 4.0.24
 
       - name: Install dependencies and link
         run: |

diff --git a/groovy/src/main/MANIFEST.MF b/groovy/src/main/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
-Class-Path: CodeNarc-3.5.0.jar GMetrics-2.1.0.jar commons-compiler-3.1
- .11.jar groovy/lib/ant-1.10.11.jar groovy/lib/ant-launcher-1.10.11.ja
- r groovy/lib/commons-cli-1.4.jar groovy/lib/groovy-3.0.9.jar groovy/l
- ib/groovy-ant-3.0.9.jar groovy/lib/groovy-cli-commons-3.0.9.jar groov
- y/lib/groovy-dateutil-3.0.9.jar groovy/lib/groovy-json-3.0.9.jar groo
- vy/lib/groovy-templates-3.0.9.jar groovy/lib/groovy-xml-3.0.9.jar jac
- kson-annotations-2.16.0.jar jackson-core-2.16.0.jar jackson-databind-
- 2.16.0.jar janino-3.1.11.jar logback-classic-1.4.14.jar logback-core-
- 1.4.14.jar slf4j-api-2.0.9.jar
+Class-Path: CodeNarc-3.5.0-groovy-4.0.jar GMetrics-Groovy4-2.1.0.jar c
+ ommons-compiler-3.1.12.jar groovy/lib/ant-1.10.15.jar groovy/lib/ant-
+ launcher-1.10.15.jar groovy/lib/commons-cli-1.9.0.jar groovy/lib/groo
+ vy-4.0.24.jar groovy/lib/groovy-ant-4.0.24.jar groovy/lib/groovy-cli-
+ commons-4.0.24.jar groovy/lib/groovy-dateutil-4.0.24.jar groovy/lib/g
+ roovy-json-4.0.24.jar groovy/lib/groovy-templates-4.0.24.jar groovy/l
+ ib/groovy-xml-4.0.24.jar jackson-annotations-2.18.2.jar jackson-core-
+ 2.18.2.jar jackson-databind-2.18.2.jar janino-3.1.12.jar logback-clas
+ sic-1.5.12.jar logback-core-1.5.12.jar slf4j-api-2.0.16.jar
 Created-By: 1.8.0_144 (Oracle Corporation)
 Main-Class: com.nvuillam.CodeNarcServer
diff --git a/groovy/src/main/com/nvuillam/CodeNarcServer.groovy b/groovy/src/main/com/nvuillam/CodeNarcServer.groovy
@@ -29,6 +29,9 @@ import com.fasterxml.jackson.databind.ObjectWriter
 // Groovy Transform
 import groovy.transform.CompileDynamic
 
+// Groovy CliBuilder change for Groovy 4
+import groovy.cli.commons.CliBuilder
+
 // Logging
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

diff --git a/lib/java/CodeNarc-3.5.0-groovy-4.0.jar b/lib/java/CodeNarc-3.5.0-groovy-4.0.jar
diff --git a/lib/java/CodeNarc-3.5.0.jar b/lib/java/CodeNarc-3.5.0.jar
diff --git a/lib/java/CodeNarcServer.jar b/lib/java/CodeNarcServer.jar
diff --git a/lib/java/GMetrics-2.1.0.jar b/lib/java/GMetrics-2.1.0.jar
diff --git a/lib/java/GMetrics-Groovy4-2.1.0.jar b/lib/java/GMetrics-Groovy4-2.1.0.jar
diff --git a/lib/java/commons-compiler-3.1.11.jar b/lib/java/commons-compiler-3.1.11.jar
diff --git a/lib/java/commons-compiler-3.1.12.jar b/lib/java/commons-compiler-3.1.12.jar
diff --git a/lib/java/groovy/lib/ant-1.10.11.jar → lib/java/groovy/lib/ant-1.10.15.jar b/lib/java/groovy/lib/ant-1.10.11.jar → lib/java/groovy/lib/ant-1.10.15.jar
diff --git a/lib/java/groovy/lib/ant-launcher-1.10.11.jar b/lib/java/groovy/lib/ant-launcher-1.10.11.jar
diff --git a/lib/java/groovy/lib/ant-launcher-1.10.15.jar b/lib/java/groovy/lib/ant-launcher-1.10.15.jar
diff --git a/lib/java/groovy/lib/commons-cli-1.4.jar b/lib/java/groovy/lib/commons-cli-1.4.jar
diff --git a/lib/java/groovy/lib/commons-cli-1.9.0.jar b/lib/java/groovy/lib/commons-cli-1.9.0.jar
diff --git a/lib/java/groovy/lib/groovy-3.0.9.jar → lib/java/groovy/lib/groovy-4.0.24.jar b/lib/java/groovy/lib/groovy-3.0.9.jar → lib/java/groovy/lib/groovy-4.0.24.jar
diff --git a/lib/java/groovy/lib/groovy-ant-3.0.9.jar b/lib/java/groovy/lib/groovy-ant-3.0.9.jar
diff --git a/lib/java/groovy/lib/groovy-ant-4.0.24.jar b/lib/java/groovy/lib/groovy-ant-4.0.24.jar
diff --git a/lib/java/groovy/lib/groovy-cli-commons-3.0.9.jar b/lib/java/groovy/lib/groovy-cli-commons-3.0.9.jar
diff --git a/lib/java/groovy/lib/groovy-cli-commons-4.0.24.jar b/lib/java/groovy/lib/groovy-cli-commons-4.0.24.jar
diff --git a/lib/java/groovy/lib/groovy-dateutil-3.0.9.jar b/lib/java/groovy/lib/groovy-dateutil-3.0.9.jar
diff --git a/lib/java/groovy/lib/groovy-dateutil-4.0.24.jar b/lib/java/groovy/lib/groovy-dateutil-4.0.24.jar
diff --git a/lib/java/groovy/lib/groovy-json-3.0.9.jar b/lib/java/groovy/lib/groovy-json-3.0.9.jar
diff --git a/lib/java/groovy/lib/groovy-json-4.0.24.jar b/lib/java/groovy/lib/groovy-json-4.0.24.jar
diff --git a/lib/java/groovy/lib/groovy-templates-3.0.9.jar b/lib/java/groovy/lib/groovy-templates-3.0.9.jar
diff --git a/lib/java/groovy/lib/groovy-templates-4.0.24.jar b/lib/java/groovy/lib/groovy-templates-4.0.24.jar
diff --git a/lib/java/groovy/lib/groovy-xml-3.0.9.jar b/lib/java/groovy/lib/groovy-xml-3.0.9.jar
diff --git a/lib/java/groovy/lib/groovy-xml-4.0.24.jar b/lib/java/groovy/lib/groovy-xml-4.0.24.jar
diff --git a/lib/java/jackson-annotations-2.16.0.jar → lib/java/jackson-annotations-2.18.2.jar b/lib/java/jackson-annotations-2.16.0.jar → lib/java/jackson-annotations-2.18.2.jar
diff --git a/lib/java/jackson-core-2.16.0.jar b/lib/java/jackson-core-2.16.0.jar
diff --git a/lib/java/jackson-core-2.18.2.jar b/lib/java/jackson-core-2.18.2.jar
diff --git a/lib/java/jackson-databind-2.16.0.jar b/lib/java/jackson-databind-2.16.0.jar
diff --git a/lib/java/jackson-databind-2.18.2.jar b/lib/java/jackson-databind-2.18.2.jar
diff --git a/lib/java/janino-3.1.11.jar b/lib/java/janino-3.1.11.jar
diff --git a/lib/java/janino-3.1.12.jar b/lib/java/janino-3.1.12.jar
diff --git a/lib/java/logback-classic-1.4.14.jar → lib/java/logback-classic-1.5.12.jar b/lib/java/logback-classic-1.4.14.jar → lib/java/logback-classic-1.5.12.jar
diff --git a/lib/java/logback-core-1.4.14.jar → lib/java/logback-core-1.5.12.jar b/lib/java/logback-core-1.4.14.jar → lib/java/logback-core-1.5.12.jar
diff --git a/lib/java/slf4j-api-2.0.16.jar b/lib/java/slf4j-api-2.0.16.jar
diff --git a/lib/java/slf4j-api-2.0.9.jar b/lib/java/slf4j-api-2.0.9.jar