Skip to content

Commit c21664a

Browse files
jericksjericks
authored
Merge pull request #79 from geoscript/GSG-78.Groovy4
Update to Groovy 4
2 parents 36fd445 + 839c33c commit c21664a

21 files changed

Lines changed: 51 additions & 30 deletions

‎pom.xml‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<properties>
1313
<gt.version>29-SNAPSHOT</gt.version>
1414
<jts.version>1.19.0</jts.version>
15-
<groovy.version>3.0.14</groovy.version>
15+
<groovy.version>4.0.7</groovy.version>
1616
</properties>
1717
<dependencies>
1818
<dependency>
@@ -254,42 +254,53 @@
254254
<version>${gt.version}</version>
255255
</dependency>
256256
<dependency>
257-
<groupId>org.codehaus.groovy</groupId>
257+
<groupId>org.apache.groovy</groupId>
258258
<artifactId>groovy</artifactId>
259259
<version>${groovy.version}</version>
260260
</dependency>
261261
<dependency>
262-
<groupId>org.codehaus.groovy</groupId>
262+
<groupId>org.apache.groovy</groupId>
263263
<artifactId>groovy-sql</artifactId>
264264
<version>${groovy.version}</version>
265265
</dependency>
266266
<dependency>
267-
<groupId>org.codehaus.groovy</groupId>
267+
<groupId>org.apache.groovy</groupId>
268268
<artifactId>groovy-xml</artifactId>
269269
<version>${groovy.version}</version>
270270
</dependency>
271271
<dependency>
272-
<groupId>org.codehaus.groovy</groupId>
272+
<groupId>org.apache.groovy</groupId>
273273
<artifactId>groovy-json</artifactId>
274274
<version>${groovy.version}</version>
275275
</dependency>
276276
<dependency>
277-
<groupId>org.codehaus.groovy</groupId>
277+
<groupId>org.apache.groovy</groupId>
278278
<artifactId>groovy-yaml</artifactId>
279279
<version>${groovy.version}</version>
280+
<exclusions>
281+
<exclusion>
282+
<groupId>com.fasterxml.jackson.dataformat</groupId>
283+
<artifactId>jackson-dataformat-yaml</artifactId>
284+
</exclusion>
285+
</exclusions>
286+
</dependency>
287+
<dependency>
288+
<groupId>com.fasterxml.jackson.dataformat</groupId>
289+
<artifactId>jackson-dataformat-yaml</artifactId>
290+
<version>2.13.3</version>
280291
</dependency>
281292
<dependency>
282-
<groupId>org.codehaus.groovy</groupId>
293+
<groupId>org.apache.groovy</groupId>
283294
<artifactId>groovy-swing</artifactId>
284295
<version>${groovy.version}</version>
285296
</dependency>
286297
<dependency>
287-
<groupId>org.codehaus.groovy</groupId>
298+
<groupId>org.apache.groovy</groupId>
288299
<artifactId>groovy-groovysh</artifactId>
289300
<version>${groovy.version}</version>
290301
</dependency>
291302
<dependency>
292-
<groupId>org.codehaus.groovy</groupId>
303+
<groupId>org.apache.groovy</groupId>
293304
<artifactId>groovy-console</artifactId>
294305
<version>${groovy.version}</version>
295306
</dependency>
@@ -348,6 +359,10 @@
348359
<enabled>false</enabled>
349360
</snapshots>
350361
</pluginRepository>
362+
<pluginRepository>
363+
<id>groovy-plugins-release</id>
364+
<url>https://groovy.jfrog.io/artifactory/plugins-release</url>
365+
</pluginRepository>
351366
</pluginRepositories>
352367
<build>
353368
<sourceDirectory>src/main/groovy</sourceDirectory>
@@ -361,7 +376,7 @@
361376
<plugin>
362377
<groupId>org.codehaus.groovy</groupId>
363378
<artifactId>groovy-eclipse-compiler</artifactId>
364-
<version>3.7.0</version>
379+
<version>3.8.0</version>
365380
<extensions>true</extensions>
366381
</plugin>
367382
<plugin>
@@ -376,12 +391,12 @@
376391
<dependency>
377392
<groupId>org.codehaus.groovy</groupId>
378393
<artifactId>groovy-eclipse-compiler</artifactId>
379-
<version>3.7.0</version>
394+
<version>3.8.0</version>
380395
</dependency>
381396
<dependency>
382397
<groupId>org.codehaus.groovy</groupId>
383398
<artifactId>groovy-eclipse-batch</artifactId>
384-
<version>3.0.8-01</version>
399+
<version>4.0.7-02</version>
385400
</dependency>
386401
</dependencies>
387402
</plugin>
@@ -440,12 +455,12 @@
440455
</executions>
441456
<dependencies>
442457
<dependency>
443-
<groupId>org.codehaus.groovy</groupId>
458+
<groupId>org.apache.groovy</groupId>
444459
<artifactId>groovy-ant</artifactId>
445460
<version>${groovy.version}</version>
446461
</dependency>
447462
<dependency>
448-
<groupId>org.codehaus.groovy</groupId>
463+
<groupId>org.apache.groovy</groupId>
449464
<artifactId>groovy-groovydoc</artifactId>
450465
<version>${groovy.version}</version>
451466
</dependency>

‎src/main/groovy/geoscript/Application.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package geoscript
22

33
import groovy.ui.GroovyMain as Script
4-
import groovy.ui.Console
5-
import org.codehaus.groovy.tools.shell.Main as Shell
4+
import groovy.console.ui.Console
5+
import org.apache.groovy.groovysh.Main as Shell
66
import org.geotools.util.factory.GeoTools
77
import org.locationtech.jts.JTSVersion
88

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import geoscript.feature.Feature
44
import geoscript.feature.Field
55
import geoscript.feature.Schema
66
import geoscript.geom.Point
7+
import groovy.xml.XmlNodePrinter
8+
import groovy.xml.XmlParser
79

810
/**
911
* Read a Feature from a GeoRSS String

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import geoscript.feature.Schema
66
import geoscript.geom.LineString
77
import geoscript.geom.MultiLineString
88
import geoscript.geom.Point
9+
import groovy.xml.XmlNodePrinter
10+
import groovy.xml.XmlParser
911

1012
/**
1113
* Read a Feature from a GPX document

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package geoscript.feature.io
22

33
import geoscript.feature.Field
44
import geoscript.feature.Schema
5+
import groovy.xml.XmlSlurper
56

67
/**
78
* Read a Schema from an XML String.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
package geoscript.geom.io
2626

2727
import geoscript.geom.*
28+
import groovy.xml.XmlParser
2829

2930
/**
3031
* 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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package geoscript.geom.io
22

33
import geoscript.geom.*
4+
import groovy.xml.XmlParser
45

56
/**
67
* Read a {@link geoscript.geom.Geometry Geometry} from a GML Version 2 String.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package geoscript.geom.io
22

33
import geoscript.geom.*
4+
import groovy.xml.XmlParser
45

56
/**
67
* Read a {@link geoscript.geom.Geometry Geometry} from a GML Version 3 String.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import geoscript.geom.Geometry
44
import geoscript.geom.LineString
55
import geoscript.geom.MultiLineString
66
import geoscript.geom.Point
7+
import groovy.xml.XmlParser
78

89
/**
910
* Read a Geometry from a GPX String

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import geoscript.layer.Grid
55
import geoscript.layer.Pyramid
66
import geoscript.layer.TMS
77
import geoscript.proj.Projection
8+
import groovy.xml.XmlParser
89

910
/**
1011
* Read a Pyramid from a GDAL MiniDriver XML File

0 commit comments

Comments
 (0)