Commit 1ad030b4 authored by Matija Obreza's avatar Matija Obreza

Updated to geotools 23.1

parent 10d11156
Pipeline #14276 passed with stage
in 1 minute and 16 seconds
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<jdk.target>1.8</jdk.target> <jdk.target>1.8</jdk.target>
<jdk.source>1.8</jdk.source> <jdk.source>1.8</jdk.source>
<!-- use the latest snapshot --> <!-- use the latest snapshot -->
<geotools.version>15-SNAPSHOT</geotools.version> <geotools.version>23.1</geotools.version>
<jar.mainclass>org.genesys.geotools.cli.CLI</jar.mainclass> <jar.mainclass>org.genesys.geotools.cli.CLI</jar.mainclass>
</properties> </properties>
...@@ -59,17 +59,17 @@ ...@@ -59,17 +59,17 @@
<dependency> <dependency>
<groupId>org.geotools</groupId> <groupId>org.geotools</groupId>
<artifactId>gt-shapefile</artifactId> <artifactId>gt-shapefile</artifactId>
<version>17.2</version> <version>${geotools.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.geotools</groupId> <groupId>org.geotools</groupId>
<artifactId>gt-cql</artifactId> <artifactId>gt-cql</artifactId>
<version>17.2</version> <version>${geotools.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.geotools</groupId> <groupId>org.geotools</groupId>
<artifactId>gt-epsg-wkt</artifactId> <artifactId>gt-epsg-wkt</artifactId>
<version>17.2</version> <version>${geotools.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
...@@ -165,23 +165,7 @@ ...@@ -165,23 +165,7 @@
<repository> <repository>
<id>osgeo</id> <id>osgeo</id>
<name>Open Source Geospatial Foundation Repository</name> <name>Open Source Geospatial Foundation Repository</name>
<url>http://download.osgeo.org/webdav/geotools/</url> <url>https://repo.osgeo.org/repository/release/</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>boundless</id>
<name>Boundless Maven Repository</name>
<url>http://repo.boundlessgeo.com/main</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>boundless-art</id>
<name>Boundless Artifactory Repository</name>
<url>https://boundless.artifactoryonline.com/boundless/main/</url>
</repository> </repository>
</repositories> </repositories>
</project> </project>
\ No newline at end of file
...@@ -28,14 +28,14 @@ import org.geotools.data.DataStoreFinder; ...@@ -28,14 +28,14 @@ import org.geotools.data.DataStoreFinder;
import org.geotools.geometry.jts.JTSFactoryFinder; import org.geotools.geometry.jts.JTSFactoryFinder;
import org.geotools.referencing.GeodeticCalculator; import org.geotools.referencing.GeodeticCalculator;
import org.geotools.referencing.crs.DefaultGeographicCRS; import org.geotools.referencing.crs.DefaultGeographicCRS;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.Polygon;
import org.opengis.geometry.MismatchedDimensionException; import org.opengis.geometry.MismatchedDimensionException;
import org.opengis.referencing.FactoryException; import org.opengis.referencing.FactoryException;
import org.opengis.referencing.operation.TransformException; import org.opengis.referencing.operation.TransformException;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.Polygon;
/** /**
* The Class ShapefileUtils. * The Class ShapefileUtils.
......
...@@ -37,6 +37,11 @@ import org.geotools.geometry.jts.JTSFactoryFinder; ...@@ -37,6 +37,11 @@ import org.geotools.geometry.jts.JTSFactoryFinder;
import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.referencing.GeodeticCalculator; import org.geotools.referencing.GeodeticCalculator;
import org.geotools.referencing.crs.DefaultGeographicCRS; import org.geotools.referencing.crs.DefaultGeographicCRS;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.MultiPolygon;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.operation.distance.DistanceOp;
import org.opengis.feature.simple.SimpleFeature; import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType; import org.opengis.feature.simple.SimpleFeatureType;
import org.opengis.filter.Filter; import org.opengis.filter.Filter;
...@@ -48,11 +53,6 @@ import com.google.common.cache.CacheBuilder; ...@@ -48,11 +53,6 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.CacheStats; import com.google.common.cache.CacheStats;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.MultiPolygon;
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jts.operation.distance.DistanceOp;
/** /**
* Polygons used here are derived from OSM data, © OpenStreetMap contributors. * Polygons used here are derived from OSM data, © OpenStreetMap contributors.
......
...@@ -31,6 +31,9 @@ import org.geotools.factory.CommonFactoryFinder; ...@@ -31,6 +31,9 @@ import org.geotools.factory.CommonFactoryFinder;
import org.geotools.feature.FeatureCollection; import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator; import org.geotools.feature.FeatureIterator;
import org.geotools.geometry.jts.JTSFactoryFinder; import org.geotools.geometry.jts.JTSFactoryFinder;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.Point;
import org.opengis.feature.simple.SimpleFeature; import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType; import org.opengis.feature.simple.SimpleFeatureType;
import org.opengis.filter.Filter; import org.opengis.filter.Filter;
...@@ -41,9 +44,6 @@ import org.slf4j.LoggerFactory; ...@@ -41,9 +44,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.Point;
/** /**
* Polygons used here are derived from OSM data, © OpenStreetMap contributors. * Polygons used here are derived from OSM data, © OpenStreetMap contributors.
......
...@@ -17,13 +17,12 @@ ...@@ -17,13 +17,12 @@
package org.genesys.geotools.service; package org.genesys.geotools.service;
import org.junit.Test; import org.junit.Test;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Polygon;
import org.opengis.geometry.MismatchedDimensionException; import org.opengis.geometry.MismatchedDimensionException;
import org.opengis.referencing.FactoryException; import org.opengis.referencing.FactoryException;
import org.opengis.referencing.operation.TransformException; import org.opengis.referencing.operation.TransformException;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Polygon;
public class PointBufferTest { public class PointBufferTest {
@Test @Test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment