You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2024/05/18 15:13:33 UTC
(sis) 03/03: Classes for comparing against a XML schema moved to a `schema` sub-packages.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit a0eac41e9ca8d1df6d46721af074fc3e69ca0a32
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat May 18 16:31:01 2024 +0200
Classes for comparing against a XML schema moved to a `schema` sub-packages.
---
.../test/org/apache/sis/xml/RenameListGenerator.java | 2 +-
.../test/org/apache/sis/xml/test/PackageVerifier.java | 8 ++++----
.../test/org/apache/sis/xml/test/SchemaCompliance.java | 8 ++++----
geoapi/snapshot | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
index 5de773c3fe..f5327f57a6 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
@@ -29,7 +29,7 @@ import java.lang.reflect.Method;
import jakarta.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
-import org.opengis.geoapi.SchemaException;
+import org.opengis.geoapi.schema.SchemaException;
import org.apache.sis.xml.privy.LegacyNamespaces;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
index 90a3185bdd..3146b3ae08 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
@@ -37,10 +37,10 @@ import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.xml.sax.SAXException;
import org.opengis.util.CodeList;
import org.opengis.annotation.UML;
-import org.opengis.geoapi.SchemaException;
-import org.opengis.geoapi.SchemaInformation;
-import static org.opengis.geoapi.SchemaInformation.ROOT_NAMESPACE;
-import static org.opengis.geoapi.SchemaInformation.SCHEMA_ROOT_URL;
+import org.opengis.geoapi.schema.SchemaException;
+import org.opengis.geoapi.schema.SchemaInformation;
+import static org.opengis.geoapi.schema.SchemaInformation.ROOT_NAMESPACE;
+import static org.opengis.geoapi.schema.SchemaInformation.SCHEMA_ROOT_URL;
import org.apache.sis.util.Classes;
import org.apache.sis.system.Modules;
import org.apache.sis.xml.Namespaces;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
index ca0d9a65d5..4847f6a665 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
@@ -28,10 +28,10 @@ import javax.xml.parsers.ParserConfigurationException;
import jakarta.xml.bind.annotation.XmlNs;
import jakarta.xml.bind.annotation.XmlElement;
import org.xml.sax.SAXException;
-import org.opengis.geoapi.Departures;
-import org.opengis.geoapi.DocumentationStyle;
-import org.opengis.geoapi.SchemaInformation;
-import org.opengis.geoapi.SchemaException;
+import org.opengis.geoapi.schema.Departures;
+import org.opengis.geoapi.schema.DocumentationStyle;
+import org.opengis.geoapi.schema.SchemaInformation;
+import org.opengis.geoapi.schema.SchemaException;
import org.apache.sis.util.StringBuilders;
diff --git a/geoapi/snapshot b/geoapi/snapshot
index 098de66054..21ba099dd3 160000
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@ -1 +1 @@
-Subproject commit 098de66054a7246dbc88aa6740e098695f668d85
+Subproject commit 21ba099dd3c6cc7b6c517e4a5c6421da0a3d003c