This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit e111cc6c47ef23db83975025c4a7dbbb23bd596b
Merge: abe39d4ffc ecf5857313
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Apr 9 14:35:16 2024 +0200
Post-merge automatic import reorganization.
.../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java | 2 +-
.../test/org/apache/sis/test/mock/VerticalCRSMock.java | 6 ++++--
.../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java | 6 +++---
.../main/org/apache/sis/referencing/Properties.java | 4 ++--
.../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +-
.../org/apache/sis/referencing/privy/NilReferencingObject.java | 2 +-
.../org/apache/sis/referencing/AbstractReferenceSystemTest.java | 8 ++++----
.../test/org/apache/sis/referencing/CRSTest.java | 6 +++---
.../test/org/apache/sis/referencing/GeodeticObjectVerifier.java | 8 ++++----
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 6 +++---
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 6 +++---
.../test/org/apache/sis/test/TestUtilities.java | 8 ++++----
13 files changed, 34 insertions(+), 32 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index bee7ecae16,09e22bcf63..d75dbdb9db
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@@ -29,9 -28,6 +28,10 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.privy.Constants;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a
primary name.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
index e3e3e59eea,93a0221081..e189a2e320
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
@@@ -25,9 -24,8 +24,12 @@@ import org.opengis.referencing.cs.Range
import org.opengis.referencing.cs.VerticalCS;
import org.opengis.referencing.datum.VerticalDatum;
import org.opengis.referencing.datum.VerticalDatumType;
- import org.opengis.util.InternationalString;
import org.apache.sis.measure.Units;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.metadata.extent.Extent;
++import org.opengis.util.InternationalString;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Optional;
import org.opengis.referencing.datum.RealizationMethod;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
index 2726522a23,289b12216a..5a3d432312
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
@@@ -33,9 -31,6 +31,11 @@@ import org.apache.sis.util.Deprecable
import org.apache.sis.util.privy.AbstractMap;
import org.apache.sis.referencing.privy.CoordinateOperations;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.ReferenceSystem;
+import org.opengis.referencing.ReferenceIdentifier;
++import org.opengis.referencing.datum.Datum;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
index 6d95249674,24d4cb655e..2a12ed66a7
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
@@@ -23,8 -22,8 +22,9 @@@ import org.apache.sis.xml.NilObject
import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.util.resources.Vocabulary;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.Identifier;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.util.InternationalString;
+import org.opengis.referencing.ReferenceIdentifier;
/**
