diff --git a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-postgis/src/main/java/org/deegree/sqldialect/postgis/PostGISDialect.java b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-postgis/src/main/java/org/deegree/sqldialect/postgis/PostGISDialect.java index 8b8eea438f..fbf6af6649 100644 --- a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-postgis/src/main/java/org/deegree/sqldialect/postgis/PostGISDialect.java +++ b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-postgis/src/main/java/org/deegree/sqldialect/postgis/PostGISDialect.java @@ -61,7 +61,7 @@ import org.deegree.sqldialect.filter.AbstractWhereBuilder; import org.deegree.sqldialect.filter.PropertyNameMapper; import org.deegree.sqldialect.filter.UnmappableException; -import org.postgis.PGboxbase; +import net.postgis.jdbc.PGboxbase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -207,7 +207,7 @@ public Envelope getBBoxAggregateValue(ResultSet rs, int colIdx, ICRS crs) throws return env; } - private org.deegree.geometry.primitive.Point buildPoint(org.postgis.Point p, ICRS crs) { + private org.deegree.geometry.primitive.Point buildPoint(net.postgis.jdbc.geometry.Point p, ICRS crs) { double[] coords = new double[p.getDimension()]; coords[0] = p.getX(); coords[1] = p.getY(); diff --git a/deegree-services/deegree-services-wpvs/src/main/java/org/deegree/services/wpvs/io/db/PostgisBackend.java b/deegree-services/deegree-services-wpvs/src/main/java/org/deegree/services/wpvs/io/db/PostgisBackend.java index f147d5e302..c8c9174136 100644 --- a/deegree-services/deegree-services-wpvs/src/main/java/org/deegree/services/wpvs/io/db/PostgisBackend.java +++ b/deegree-services/deegree-services-wpvs/src/main/java/org/deegree/services/wpvs/io/db/PostgisBackend.java @@ -47,12 +47,12 @@ import org.deegree.rendering.r3d.persistence.RenderableStore; import org.deegree.workspace.ResourceMetadata; import org.deegree.workspace.Workspace; -import org.postgis.Geometry; -import org.postgis.LinearRing; -import org.postgis.PGbox3d; -import org.postgis.PGgeometry; -import org.postgis.Point; -import org.postgis.Polygon; +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.LinearRing; +import net.postgis.jdbc.PGbox3d; +import net.postgis.jdbc.PGgeometry; +import net.postgis.jdbc.geometry.Point; +import net.postgis.jdbc.geometry.Polygon; /** * The PostgisBackend class adds postgis specific methods to the model @@ -85,7 +85,7 @@ public Envelope createEnvelope(PGgeometry geometry) { } Polygon pgPolygon = (Polygon) geom; ICRS crs = CRSManager.getCRSRef("EPSG:" + pgPolygon.getSrid()); - org.postgis.LinearRing ring = pgPolygon.getRing(0); + net.postgis.jdbc.geometry.LinearRing ring = pgPolygon.getRing(0); Point min = ring.getPoint(0); Point max = ring.getPoint(2); double[] mi = null; @@ -145,7 +145,7 @@ public PGgeometry createBackendEnvelope(Envelope geometry, int dimension) { points[4] = new Point(minD[0], minD[1], minD[2]); } linRing[0] = new LinearRing(points); - org.postgis.Polygon pgPoly = new org.postgis.Polygon(linRing); + net.postgis.jdbc.geometry.Polygon pgPoly = new net.postgis.jdbc.geometry.Polygon(linRing); pgPoly.setSrid(parseSRID(geometry.getCoordinateSystem())); return new PGgeometry(pgPoly); diff --git a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/coverage/gridifier/index/MultiLevelMemoryTileGridIndex.java b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/coverage/gridifier/index/MultiLevelMemoryTileGridIndex.java index d59ba19d2b..4ab55b4cbe 100644 --- a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/coverage/gridifier/index/MultiLevelMemoryTileGridIndex.java +++ b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/coverage/gridifier/index/MultiLevelMemoryTileGridIndex.java @@ -50,9 +50,9 @@ import org.deegree.geometry.Envelope; import org.deegree.geometry.GeometryFactory; import org.deegree.tools.coverage.gridifier.RasterLevel; -import org.postgis.PGgeometry; -import org.postgis.Point; -import org.postgis.Polygon; +import net.postgis.jdbc.PGgeometry; +import net.postgis.jdbc.geometry.Point; +import net.postgis.jdbc.geometry.Polygon; public class MultiLevelMemoryTileGridIndex implements MultiLevelRasterTileIndex { diff --git a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/coverage/gridifier/index/PostGISRasterTileIndex.java b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/coverage/gridifier/index/PostGISRasterTileIndex.java index 3acb291bbe..47d587412b 100644 --- a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/coverage/gridifier/index/PostGISRasterTileIndex.java +++ b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/coverage/gridifier/index/PostGISRasterTileIndex.java @@ -49,9 +49,9 @@ import org.deegree.geometry.Envelope; import org.deegree.geometry.GeometryFactory; import org.deegree.tools.coverage.gridifier.RasterLevel; -import org.postgis.PGgeometry; -import org.postgis.Point; -import org.postgis.Polygon; +import net.postgis.jdbc.PGgeometry; +import net.postgis.jdbc.geometry.Point; +import net.postgis.jdbc.geometry.Polygon; public class PostGISRasterTileIndex implements MultiLevelRasterTileIndex { diff --git a/pom.xml b/pom.xml index 849f59c683..5ebb6bb39e 100644 --- a/pom.xml +++ b/pom.xml @@ -851,17 +851,17 @@ net.postgis postgis-jdbc - 2.5.1 + 2023.1.0 net.postgis postgis-geometry - 2.5.1 + 2023.1.0 org.postgresql postgresql - 42.7.2 + 42.7.3