diff --git a/pom.xml b/pom.xml index 535f621..6e51949 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ ogcapi-edr10 1.0 - 3.21 5.4 @@ -67,7 +66,7 @@ io.rest-assured rest-assured - 4.5.1 + 5.4.0 com.reprezen.kaizen @@ -77,7 +76,7 @@ com.google.inject guice - 4.0 + 7.0.0 junit @@ -90,61 +89,37 @@ net.jadler jadler-core - 1.3.0 + 1.3.1 test net.jadler jadler-jetty - 1.3.0 + 1.3.1 test - - javax.xml.bind - jaxb-api - 2.3.1 - - - - org.opengis - geoapi-pending - 3.1-M04 - - - - com.github.erosb - everit-json-schema - 1.14.1 - - - org.geotoolkit - geotk-utility - 3.21 + com.github.erosb + everit-json-schema + 1.14.4 - org.geotoolkit - geotk-referencing - 3.21 + org.apache.sis.core + sis-referencing + 1.4 - org.geotoolkit.pending - geotk-geometry - 3.21 + org.apache.sis.non-free + sis-embedded-data + 1.4 - - org.geotoolkit.pending - geotk-temporal - 3.21 - - maven-javadoc-plugin - 2.10.4 + 3.6.3 8 true @@ -196,7 +171,7 @@ maven-release-plugin - 2.5.3 + 3.0.1 true @{project.version} @@ -206,7 +181,7 @@ org.apache.maven.plugins maven-site-plugin - 3.7.1 + 3.12.1 site-package @@ -234,7 +209,7 @@ maven-scm-publish-plugin - 1.1 + 3.2.1 gh-pages @@ -245,7 +220,7 @@ io.fabric8 docker-maven-plugin - 0.28.0 + 0.43.4 @@ -288,7 +263,7 @@ maven-dependency-plugin - 3.0.0 + 3.6.1 @@ -325,7 +300,7 @@ maven-failsafe-plugin - 2.22.0 + 3.2.5 @@ -379,7 +354,7 @@ maven-gpg-plugin - 1.6 + 3.1.0 sign-artifacts @@ -400,15 +375,6 @@ - - - - geotoolkit - Geotk Modules - http://maven.geotoolkit.org - default - - diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/corecollections/CollectionsResponse.java b/src/main/java/org/opengis/cite/ogcapiedr10/corecollections/CollectionsResponse.java index 0454897..43f1fd3 100644 --- a/src/main/java/org/opengis/cite/ogcapiedr10/corecollections/CollectionsResponse.java +++ b/src/main/java/org/opengis/cite/ogcapiedr10/corecollections/CollectionsResponse.java @@ -29,13 +29,13 @@ import java.util.Objects; import java.util.Set; -import org.geotoolkit.referencing.CRS; -import org.geotoolkit.referencing.crs.DefaultGeographicCRS; +import org.apache.sis.referencing.CRS; import org.opengis.cite.ogcapiedr10.CommonFixture; import org.opengis.cite.ogcapiedr10.openapi3.TestPoint; import org.opengis.cite.ogcapiedr10.openapi3.UriBuilder; import org.opengis.cite.ogcapiedr10.util.TemporalExtent; import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.opengis.referencing.crs.GeographicCRS; import org.testng.ITestContext; import org.testng.SkipException; import org.testng.annotations.DataProvider; @@ -240,13 +240,13 @@ private void crsChecking_NotUsed(ArrayList crsList) try { - source = CRS.parseWKT(crsMap.get("wkt").toString()); + source = CRS.fromWKT(crsMap.get("wkt").toString()); } catch (Exception e) { e.printStackTrace(); } - DefaultGeographicCRS crs = (DefaultGeographicCRS) source; + GeographicCRS crs = (GeographicCRS) source; if (crs.getDatum().getEllipsoid().getName().toString().equals("WGS 84") || crs.getDatum().getEllipsoid().getName().toString().equals("WGS_1984")