Start working on 1.21.0

Author: jericks

README.rst

@@ -151,6 +151,8 @@ Versions
 +-----------+----------+-----------+--------+----------+
 | GeoScript | GeoTools | GeoServer | JTS    | Groovy   |
 +-----------+----------+-----------+--------+----------+
+| 1.21      | 29       | 2.23      | 1.19.0 | 3.0.14   |
++-----------+----------+-----------+--------+----------+
 | 1.20      | 28       | 2.22      | 1.19.0 | 3.0.13   |
 +-----------+----------+-----------+--------+----------+
 | 1.19      | 27       | 2.21      | 1.18.2 | 3.0.11   |

pom.xml

@@ -8,11 +8,11 @@
     <groupId>org.geoscript</groupId>
     <artifactId>geoscript-groovy</artifactId>
     <packaging>jar</packaging>
-    <version>1.20.0</version>
+    <version>1.21.0-SNAPSHOT</version>
     <properties>
-        <gt.version>28.0</gt.version>
+        <gt.version>29-SNAPSHOT</gt.version>
         <jts.version>1.19.0</jts.version>
-        <groovy.version>3.0.13</groovy.version>
+        <groovy.version>3.0.14</groovy.version>
     </properties>
     <dependencies>
         <dependency>

src/test/groovy/geoscript/feature/FeatureTest.groovy

@@ -235,7 +235,7 @@ class FeatureTest {
 </gsf:geom>
 <gsf:price>12.5</gsf:price>
 </gsf:houses>
-""", f1.gml, removeXmlNS: true
+""", f1.gml, removeXmlNS: true, trim: true
     }
 
     @Test void fromGml() {

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

@@ -37,7 +37,7 @@ class GmlWriterTest {
 </gsf:houses>
 """
         String actual = writer.write(feature)
-        AssertUtil.assertStringsEqual expected, actual, removeXmlNS: true
+        AssertUtil.assertStringsEqual expected, actual, removeXmlNS: true, trim: true
     }
 
 }

src/test/groovy/geoscript/filter/FilterTest.groovy

@@ -69,7 +69,7 @@ class FilterTest {
 </ogc:PropertyIsEqualTo>
 </ogc:Filter>
 """
-        AssertUtil.assertStringsEqual expected, actual, removeXmlNS: true
+        AssertUtil.assertStringsEqual expected, actual, removeXmlNS: true, trim: true
 
         actual = f.getXml(false, 1.1)
         expected = """<ogc:Filter xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc"><ogc:PropertyIsEqualTo matchCase="true"><ogc:PropertyName>name</ogc:PropertyName><ogc:Literal>foobar</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Filter>"""