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 #77

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

Upgrade to geomatics-geotk version 1.17-SNAPSHOT #77

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
58 changes: 16 additions & 42 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<dependency>
<groupId>org.opengis.cite</groupId>
<artifactId>geomatics-geotk</artifactId>
<version>1.15</version>
<version>1.17-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -91,41 +91,15 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
<version>1.13</version>
</dependency>
<!--
Do not specify JTS, GeoAPI or Geotk dependencies. We will inherit them from
`geomatics-geotk` as transitive dependencies in order get the same versions.
-->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.geotoolkit</groupId>
<artifactId>geotk-referencing</artifactId>
<version>3.21</version>
</dependency>
<dependency>
<groupId>org.geotoolkit</groupId>
<artifactId>geotk-utility</artifactId>
<version>3.21</version>
</dependency>
<dependency>
<groupId>org.geotoolkit</groupId>
<artifactId>geotk-xml-base</artifactId>
<version>3.21</version>
</dependency>
<dependency>
<groupId>org.geotoolkit.pending</groupId>
<artifactId>geotk-xml-gml</artifactId>
<version>3.21</version>
</dependency>
<dependency>
<groupId>org.opengis</groupId>
<artifactId>geoapi-pending</artifactId>
<version>3.1-M04</version>
</dependency>
<dependency>
<groupId>org.opengis.cite.saxon</groupId>
<artifactId>saxon9</artifactId>
Expand All @@ -134,7 +108,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.10</version>
<version>7.9.0</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
Expand All @@ -144,7 +118,7 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
<version>2.0.2</version>
</dependency>
</dependencies>

Expand All @@ -153,7 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.6.3</version>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
<show>package</show>
Expand Down Expand Up @@ -206,7 +180,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.0.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
Expand All @@ -223,7 +197,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 @@ -236,7 +210,7 @@
<dependency>
<groupId>com.jgoodies</groupId>
<artifactId>forms</artifactId>
<version>1.0.7</version>
<version>1.2.1</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -261,7 +235,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 @@ -304,7 +278,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 @@ -399,7 +373,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 @@ -468,11 +442,11 @@
</distributionManagement>

<repositories>
<!-- Geotk 3.21 not available in Central repository -->
<!-- Geotk milestones are 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
100 changes: 0 additions & 100 deletions src/main/java/org/opengis/cite/iso19136/TestRunListener.java
View file
Open in desktop

This file was deleted.

21 changes: 11 additions & 10 deletions src/main/java/org/opengis/cite/iso19136/data/spatial/CurveTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,21 @@
import java.util.List;
import java.util.Map;
import java.util.logging.Level;

import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;

import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;

import org.apache.xerces.xs.XSElementDeclaration;
import org.apache.sis.xml.MarshallerPool;
import org.geotoolkit.gml.xml.v321.CurveType;
import org.geotoolkit.xml.MarshallerPool;
import org.geotoolkit.gml.xml.GMLMarshallerPool;

import org.opengis.cite.geomatics.gml.GmlUtils;
import org.opengis.cite.iso19136.GML32;
import org.opengis.cite.iso19136.data.DataFixture;
Expand All @@ -40,7 +42,7 @@
* connected to one another, with the end point of each segment (except the
* last) being the start point of the next segment.
* </p>
*
*
* <p style="margin-bottom: 0.5em">
* <strong>Sources</strong>
* </p>
Expand Down Expand Up @@ -90,7 +92,7 @@ public void findCurves() {
/**
* [{@code Test}] Verifies that a gml:Curve element has a valid CRS
* reference.
*
*
* <p style="margin-bottom: 0.5em">
* <strong>Sources</strong>
* </p>
Expand All @@ -115,7 +117,7 @@ public void curveHasValidCRS() {
* <li>the segments are connected;</li>
* <li>the segments are all located within the valid area of the CRS.</li>
* </ol>
*
*
* <p style="margin-bottom: 0.5em">
* <strong>Sources</strong>
* </p>
Expand All @@ -127,8 +129,7 @@ public void curveHasValidCRS() {
public void validCurveSegments() {
Unmarshaller gmlUnmarshaller;
try {
MarshallerPool pool = new MarshallerPool(
"org.geotoolkit.gml.xml.v321");
MarshallerPool pool = GMLMarshallerPool.getInstance();
gmlUnmarshaller = pool.acquireUnmarshaller();
} catch (JAXBException jxe) {
throw new RuntimeException(jxe);
Expand Down
Loading