Start working on 0.21.0

jericks · Oct 26, 2023 · 42c83d0 · 42c83d0
1 parent 47d79de
commit 42c83d0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.geocommands</groupId>
     <artifactId>geocommands</artifactId>
     <packaging>jar</packaging>
-    <version>0.20.0</version>
+    <version>0.21.0-SNAPSHOT</version>
     <name>GeoCommands</name>
     <description>A collection of geospatial command line applications</description>
     <properties>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.geoscript</groupId>
             <artifactId>geoscript-groovy</artifactId>
-            <version>1.21.0</version>
+            <version>1.22.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>args4j</groupId>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.9.3</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.1</version>
                 <configuration>
                     <forkMode>once</forkMode>
                     <argLine>@{argLine} -Xms512m -Xmx1024m</argLine>
@@ -127,7 +127,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

diff --git a/src/main/groovy/org/geocommands/vector/DataStoreListCommand.groovy b/src/main/groovy/org/geocommands/vector/DataStoreListCommand.groovy
@@ -2,7 +2,7 @@ package org.geocommands.vector
 
 import org.geocommands.Command
 import org.geocommands.Options
-import org.geotools.data.DataStoreFinder
+import org.geotools.api.data.DataStoreFinder
 
 /**
  * Get a list of available DataStores

diff --git a/src/main/groovy/org/geocommands/vector/DataStoreParametersCommand.groovy b/src/main/groovy/org/geocommands/vector/DataStoreParametersCommand.groovy
@@ -2,7 +2,7 @@ package org.geocommands.vector
 
 import org.geocommands.Command
 import org.geocommands.Options
-import org.geotools.data.DataStoreFinder
+import org.geotools.api.data.DataStoreFinder
 import org.kohsuke.args4j.Option
 
 /**

diff --git a/src/test/groovy/org/geocommands/doc/RasterTest.groovy b/src/test/groovy/org/geocommands/doc/RasterTest.groovy
@@ -172,12 +172,12 @@ class RasterTest extends DocTest {
 
         // Random Points
         String randomCommand = "geoc vector randompoints -n 10 -g -180,-90,180,90 -o target/locations.shp"
-        println runApp(randomCommand, "")
+        runApp(randomCommand, "")
         writeTextFile("geoc_raster_crop_with_layer_random_points_command", randomCommand)
 
         // Buffer Points
         String bufferCommand = "geoc vector buffer -d 10 -i target/locations.shp -o target/buffers.shp"
-        println runApp(bufferCommand, "")
+        runApp(bufferCommand, "")
         writeTextFile("geoc_raster_crop_with_layer_buffer_command", bufferCommand)
 
         // Crop

diff --git a/src/test/groovy/org/geocommands/style/SaveStyleRepositoryCommandTest.groovy b/src/test/groovy/org/geocommands/style/SaveStyleRepositoryCommandTest.groovy
@@ -88,14 +88,13 @@ class SaveStyleRepositoryCommandTest extends BaseTest {
         File databaseFile = createTemporaryFile("states", "db")
         String sld = createStyle(new Color("blue"))
 
-        String result = runApp([
+        runApp([
                 "style repository save",
                 "-t", "h2",
                 "-o", "file=${databaseFile.absolutePath}",
                 "-l", "states",
                 "-s", "states-blue"
         ], sld)
-        println result
 
         Sql sql = Sql.newInstance("jdbc:h2:file:${databaseFile.absolutePath}", "org.h2.Driver")
         List results = sql.rows(

diff --git a/src/test/groovy/org/geocommands/style/UniqueValuesStyleFromTextCommandTest.groovy b/src/test/groovy/org/geocommands/style/UniqueValuesStyleFromTextCommandTest.groovy
@@ -327,7 +327,7 @@ AHt3=#e76161
 Aa1=#fcedcd
 Aa2=#94474b
 """)
-        assertStringsEqual('''<?xml version="1.0" encoding="UTF-8"?><sld:StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:sld="http://www.opengis.net/sld" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" version="1.0.0">
+        assertStringsEqual('''<?xml version="1.0" encoding="UTF-8"?><sld:StyledLayerDescriptor xmlns:sld="http://www.opengis.net/sld" xmlns="http://www.opengis.net/sld" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" version="1.0.0">
   <sld:NamedLayer>
     <sld:Name/>
     <sld:UserStyle>