Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to geomatics-geotk version 1.17-SNAPSHOT #56

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to geomatics-geotk version 1.17-SNAPSHOT #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
366 changes: 0 additions & 366 deletions log-te-build-test.txt
View file
Open in desktop

This file was deleted.

49 changes: 19 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.opengis.cite</groupId>
<artifactId>ets-common</artifactId>
<version>4</version>
<version>9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengis.cite</groupId>
Expand Down Expand Up @@ -72,8 +72,12 @@
<dependency>
<groupId>org.opengis.cite</groupId>
<artifactId>geomatics-geotk</artifactId>
<version>1.15</version>
<version>1.17-SNAPSHOT</version>
</dependency>
<!--
Do not specify GeoAPI, SIS or Geotk. Inherit them from `geomatics-geotk`
transitive dependencies instead, in order to inherit the same versions.
-->
<dependency>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-spi</artifactId>
Expand All @@ -98,17 +102,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.8</version>
</dependency>
<dependency>
<groupId>org.geotoolkit</groupId>
<artifactId>geotk-referencing</artifactId>
<version>3.21</version>
</dependency>
<dependency>
<groupId>org.opengis</groupId>
<artifactId>geoapi-pending</artifactId>
<version>3.1-M04</version>
<version>7.9.0</version>
</dependency>
<dependency>
<groupId>org.opengis.cite.saxon</groupId>
Expand All @@ -118,17 +112,12 @@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.27</version>
</dependency>
<dependency>
<groupId>org.geotoolkit</groupId>
<artifactId>geotk-utility</artifactId>
<version>3.21</version>
<version>1.82</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
Expand All @@ -146,7 +135,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>3.6.3</version>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
<show>package</show>
Expand All @@ -165,7 +154,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<version>3.6.0</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -213,7 +202,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.1</version>
<version>3.2.1</version>
<configuration>
<scmBranch>gh-pages</scmBranch>
</configuration>
Expand All @@ -229,7 +218,7 @@
<dependency>
<groupId>com.jgoodies</groupId>
<artifactId>forms</artifactId>
<version>1.0.7</version>
<version>1.2.1</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -252,7 +241,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.28.0</version>
<version>0.43.4</version>
<configuration>
<images>
<image>
Expand Down Expand Up @@ -295,7 +284,7 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.0</version>
<version>3.6.1</version>
<configuration>
<artifactItems>
<artifactItem>
Expand Down Expand Up @@ -333,7 +322,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down Expand Up @@ -441,13 +430,13 @@
</build>
</profile>
</profiles>

<repositories>
<!-- Geotk 3.21 not available in Central repository -->
<!-- Geotk is not deployed in Central repository. -->
<repository>
<id>geotoolkit</id>
<name>Geotk Modules</name>
<url>http://maven.geotoolkit.org/</url>
<url>https://nexus.geomatys.com/repository/maven-public</url>
<layout>default</layout>
</repository>
</repositories>
Expand Down
81 changes: 0 additions & 81 deletions src/main/java/org/opengis/cite/cat30/TestRunListener.java
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions src/main/java/org/opengis/cite/cat30/basic/BasicSearchTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XdmItem;
import net.sf.saxon.s9api.XdmValue;
import org.geotoolkit.geometry.Envelopes;
import org.geotoolkit.geometry.GeneralEnvelope;
import org.geotoolkit.referencing.crs.DefaultGeographicCRS;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CommonCRS;
import org.opengis.cite.cat30.CAT3;
import org.opengis.cite.cat30.CommonFixture;
import org.opengis.cite.cat30.ETSAssert;
Expand Down Expand Up @@ -236,9 +236,9 @@ public void getSummaryRecordsByWGS84BBOX() {
Envelope bbox = this.geoExtent;
try {
if (!bbox.getCoordinateReferenceSystem().equals(
DefaultGeographicCRS.WGS84)) {
CommonCRS.WGS84.normalizedGeographic())) {
bbox = new GeneralEnvelope(Envelopes.transform(bbox,
DefaultGeographicCRS.WGS84));
CommonCRS.WGS84.normalizedGeographic()));
}
} catch (TransformException ex) {
throw new RuntimeException("Failed to create WGS84 envelope.", ex);
Expand Down Expand Up @@ -516,9 +516,9 @@ public void getRecordsByBBOXAndTitle() {
Envelope bbox = this.geoExtent;
try {
if (!bbox.getCoordinateReferenceSystem().equals(
DefaultGeographicCRS.WGS84)) {
CommonCRS.WGS84.normalizedGeographic())) {
bbox = new GeneralEnvelope(Envelopes.transform(bbox,
DefaultGeographicCRS.WGS84));
CommonCRS.WGS84.normalizedGeographic()));
}
} catch (TransformException ex) {
throw new RuntimeException("Failed to create WGS84 envelope.", ex);
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/opengis/cite/cat30/opensearch/OpenSearchGeoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import org.geotoolkit.geometry.Envelopes;
import org.geotoolkit.geometry.GeneralEnvelope;
import org.geotoolkit.referencing.crs.DefaultGeographicCRS;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CommonCRS;
import org.opengis.cite.cat30.CAT3;
import org.opengis.cite.cat30.CommonFixture;
import org.opengis.cite.cat30.ETSAssert;
Expand Down Expand Up @@ -254,9 +254,9 @@ public void boundingBoxQuery() {
Envelope bbox = this.geoExtent;
try {
if (!bbox.getCoordinateReferenceSystem().equals(
DefaultGeographicCRS.WGS84)) {
CommonCRS.WGS84.normalizedGeographic())) {
bbox = new GeneralEnvelope(Envelopes.transform(bbox,
DefaultGeographicCRS.WGS84));
CommonCRS.WGS84.normalizedGeographic()));
}
} catch (TransformException ex) {
throw new AssertionError("Failed to create CRS84 box from envelope in source CRS: "
Expand Down
12 changes: 3 additions & 9 deletions src/main/java/org/opengis/cite/cat30/util/SpatialUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.geotoolkit.geometry.GeneralEnvelope;
import org.geotoolkit.referencing.CRS;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CommonCRS;
import org.opengis.cite.cat30.Namespaces;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.util.FactoryException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Expand All @@ -36,12 +35,7 @@ public static Envelope envelopeFromSimpleGeoRSSBox(Node boxNode) {
if (!boxNode.getNamespaceURI().equals(Namespaces.GEORSS)) {
throw new IllegalArgumentException("Not a GeoRSS element.");
}
CoordinateReferenceSystem crs = null;
try {
crs = CRS.decode("EPSG:4326");
} catch (FactoryException ex) {
TestSuiteLogger.log(Level.WARNING, "Failed to create CRS: EPSG 4326", ex);
}
CoordinateReferenceSystem crs = CommonCRS.WGS84.geographic();
GeneralEnvelope env = new GeneralEnvelope(crs);
String[] coords = boxNode.getTextContent().trim().split("\\s+");
if (coords.length != 4) {
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/org/opengis/cite/cat30/testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<parameter name="iut" value=""/>

<listeners>
<listener class-name="org.opengis.cite.cat30.TestRunListener" />
<listener class-name="org.opengis.cite.cat30.SuiteFixtureListener" />
<listener class-name="org.opengis.cite.cat30.TestFailureListener" />
</listeners>
Expand Down