Update to Groovy 4

pom.xml

@@ -12,7 +12,7 @@
     <properties>
         <gt.version>29-SNAPSHOT</gt.version>
         <jts.version>1.19.0</jts.version>
-        <groovy.version>3.0.14</groovy.version>
+        <groovy.version>4.0.7</groovy.version>
     </properties>
     <dependencies>
         <dependency>
@@ -254,42 +254,53 @@
             <version>${gt.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
             <version>${groovy.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-sql</artifactId>
             <version>${groovy.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-xml</artifactId>
             <version>${groovy.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-json</artifactId>
             <version>${groovy.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-yaml</artifactId>
             <version>${groovy.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                    <artifactId>jackson-dataformat-yaml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.13.3</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-swing</artifactId>
             <version>${groovy.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-groovysh</artifactId>
             <version>${groovy.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-console</artifactId>
             <version>${groovy.version}</version>
         </dependency>
@@ -348,6 +359,10 @@
                 <enabled>false</enabled>
             </snapshots>
         </pluginRepository>
+        <pluginRepository>
+            <id>groovy-plugins-release</id>
+            <url>https://groovy.jfrog.io/artifactory/plugins-release</url>
+        </pluginRepository>
     </pluginRepositories>
     <build>
         <sourceDirectory>src/main/groovy</sourceDirectory>
@@ -361,7 +376,7 @@
             <plugin>
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy-eclipse-compiler</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.0</version>
                 <extensions>true</extensions>
             </plugin>
             <plugin>
@@ -376,12 +391,12 @@
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-eclipse-compiler</artifactId>
-                        <version>3.7.0</version>
+                        <version>3.8.0</version>
                     </dependency>
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-eclipse-batch</artifactId>
-                        <version>3.0.8-01</version>
+                        <version>4.0.7-02</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -440,12 +455,12 @@
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
+                        <groupId>org.apache.groovy</groupId>
                         <artifactId>groovy-ant</artifactId>
                         <version>${groovy.version}</version>
                     </dependency>
                     <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
+                        <groupId>org.apache.groovy</groupId>
                         <artifactId>groovy-groovydoc</artifactId>
                         <version>${groovy.version}</version>
                     </dependency>

src/main/groovy/geoscript/Application.groovy

@@ -1,8 +1,8 @@
 package geoscript
 
 import groovy.ui.GroovyMain as Script
-import groovy.ui.Console
-import org.codehaus.groovy.tools.shell.Main as Shell
+import groovy.console.ui.Console
+import org.apache.groovy.groovysh.Main as Shell
 import org.geotools.util.factory.GeoTools
 import org.locationtech.jts.JTSVersion
 

src/main/groovy/geoscript/feature/io/GeoRSSReader.groovy

@@ -4,6 +4,8 @@ import geoscript.feature.Feature
 import geoscript.feature.Field
 import geoscript.feature.Schema
 import geoscript.geom.Point
+import groovy.xml.XmlNodePrinter
+import groovy.xml.XmlParser
 
 /**
  * Read a Feature from a GeoRSS String

src/main/groovy/geoscript/feature/io/GpxReader.groovy

@@ -6,6 +6,8 @@ import geoscript.feature.Schema
 import geoscript.geom.LineString
 import geoscript.geom.MultiLineString
 import geoscript.geom.Point
+import groovy.xml.XmlNodePrinter
+import groovy.xml.XmlParser
 
 /**
  * Read a Feature from a GPX document

src/main/groovy/geoscript/feature/io/XmlSchemaReader.groovy

@@ -2,6 +2,7 @@ package geoscript.feature.io
 
 import geoscript.feature.Field
 import geoscript.feature.Schema
+import groovy.xml.XmlSlurper
 
 /**
  * Read a Schema from an XML String.

src/main/groovy/geoscript/geom/io/GeoRSSReader.groovy

@@ -25,6 +25,7 @@
 package geoscript.geom.io
 
 import geoscript.geom.*
+import groovy.xml.XmlParser
 
 /**
  * A GeoRSS Simple Reader. See the <a href="http://www.georss.org/simple">GeoRSS spec</a> for more details.

src/main/groovy/geoscript/geom/io/Gml2Reader.groovy

@@ -1,6 +1,7 @@
 package geoscript.geom.io
 
 import geoscript.geom.*
+import groovy.xml.XmlParser
 
 /**
  * Read a {@link geoscript.geom.Geometry Geometry} from a GML Version 2 String.

src/main/groovy/geoscript/geom/io/Gml3Reader.groovy

@@ -1,6 +1,7 @@
 package geoscript.geom.io
 
 import geoscript.geom.*
+import groovy.xml.XmlParser
 
 /**
  * Read a {@link geoscript.geom.Geometry Geometry} from a GML Version 3 String.

src/main/groovy/geoscript/geom/io/GpxReader.groovy

@@ -4,6 +4,7 @@ import geoscript.geom.Geometry
 import geoscript.geom.LineString
 import geoscript.geom.MultiLineString
 import geoscript.geom.Point
+import groovy.xml.XmlParser
 
 /**
  * Read a Geometry from a GPX String

src/main/groovy/geoscript/layer/io/GdalTmsPyramidReader.groovy

@@ -5,6 +5,7 @@ import geoscript.layer.Grid
 import geoscript.layer.Pyramid
 import geoscript.layer.TMS
 import geoscript.proj.Projection
+import groovy.xml.XmlParser
 
 /**
  * Read a Pyramid from a GDAL MiniDriver XML File

src/main/groovy/geoscript/layer/io/GeoRSSReader.groovy

@@ -6,7 +6,7 @@ import geoscript.layer.Layer
 import geoscript.proj.Projection
 import geoscript.workspace.Memory
 import geoscript.workspace.Workspace
-
+import groovy.xml.XmlParser
 import java.nio.charset.Charset
 
 /**

src/main/groovy/geoscript/layer/io/GpxReader.groovy

@@ -3,14 +3,12 @@ package geoscript.layer.io
 import geoscript.feature.Feature
 import geoscript.feature.Field
 import geoscript.feature.Schema
-import geoscript.geom.LineString
-import geoscript.geom.MultiLineString
 import geoscript.geom.Point
 import geoscript.layer.Layer
 import geoscript.proj.Projection
 import geoscript.workspace.Memory
 import geoscript.workspace.Workspace
-
+import groovy.xml.XmlParser
 import java.nio.charset.Charset
 
 /**

src/main/groovy/geoscript/layer/io/XmlPyramidReader.groovy

@@ -4,6 +4,7 @@ import geoscript.geom.Bounds
 import geoscript.layer.Grid
 import geoscript.layer.Pyramid
 import geoscript.proj.Projection
+import groovy.xml.XmlParser
 
 /**
  * Read a Pyramid from an XML String

src/main/groovy/geoscript/style/Symbolizer.groovy

@@ -3,6 +3,7 @@ package geoscript.style
 import geoscript.feature.Field
 import geoscript.filter.Filter
 import geoscript.style.io.SLDWriter
+import groovy.transform.AutoClone
 import org.geotools.styling.Style as GtStyle
 import org.geotools.styling.Rule
 import org.geotools.factory.CommonFactoryFinder
@@ -28,6 +29,7 @@ import org.geotools.styling.FeatureTypeStyle
  * </pre></blockquote></p>
  * @author Jared Erickson
  */
+@AutoClone
 class Symbolizer implements Style, Cloneable {
 
     /**

src/main/groovy/geoscript/workspace/Directory.groovy

@@ -5,7 +5,6 @@ import geoscript.layer.Layer
 import geoscript.style.DirectoryStyleRepository
 import geoscript.style.Style
 import geoscript.style.StyleRepository
-import geoscript.style.io.Readers
 import org.geotools.data.DataStore
 import org.geotools.data.directory.DirectoryDataStore
 import org.geotools.data.shapefile.ShapefileDataStore

src/main/groovy/geoscript/workspace/Memory.groovy

@@ -57,7 +57,7 @@ class Memory extends Workspace {
 
         @Override
         Memory create(Map params) {
-            if (params.type && params.type.equalsIgnoreCase("memory")) {
+            if (params.type && params.type.toString().equalsIgnoreCase("memory")) {
                 create(new org.geotools.data.memory.MemoryDataStore())
             } else {
                 super.create(params)

src/main/groovy/geoscript/workspace/Sqlite.groovy

@@ -195,7 +195,7 @@ class Sqlite extends Database {
 
         @Override
         protected void setupParameters(Map parameters) {
-            super.setupParameters(parameters);
+            super.setupParameters(parameters)
             parameters.remove(HOST.key)
             parameters.remove(PORT.key)
             parameters.remove(SCHEMA.key)

src/main/groovy/geoscript/workspace/Workspace.groovy

@@ -101,7 +101,6 @@ class Workspace {
         new Layer(this, ds.getFeatureSource(name))
     }
 
-
     /**
      * Another way to get a Layer by name.
      * <p><code>Layer layer = workspace["hospitals"]</code><p>

src/test/groovy/geoscript/feature/io/GeoRSSWriterTest.groovy

@@ -7,6 +7,7 @@ import geoscript.feature.Schema
 import geoscript.geom.Point
 import org.junit.jupiter.api.Test
 import static org.junit.jupiter.api.Assertions.*
+import groovy.xml.XmlSlurper
 
 /**
  * The GeoRSSWriter Unit Test

src/test/groovy/geoscript/geom/io/GeoRSSReaderTest.groovy

@@ -27,8 +27,7 @@ package geoscript.geom.io
 import org.junit.jupiter.api.Test
 import static org.junit.jupiter.api.Assertions.*
 import geoscript.geom.*
-
-import static org.junit.jupiter.api.Assertions.assertNull
+import groovy.xml.XmlParser
 
 /**
  * The GeoRSSReader UnitTest

src/test/groovy/geoscript/geom/io/KmlReaderTest.groovy

@@ -3,10 +3,7 @@ package geoscript.geom.io
 import org.junit.jupiter.api.Test
 import static org.junit.jupiter.api.Assertions.assertEquals
 import geoscript.geom.*
-
-import static org.junit.jupiter.api.Assertions.assertNotNull
-import static org.junit.jupiter.api.Assertions.assertTrue
-
+import groovy.xml.XmlParser
 
 /**
  * The KmlReader UnitTest