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 12371196a02296c3fb2bac05e17fc9f63efbf92b
Merge: ff6542a3f7 aacdba9e62
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Apr 22 16:14:58 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1:
automatic reorganization of imports.
.../org/apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++-
.../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +-
.../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java | 2 +-
.../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++---
.../main/org/apache/sis/referencing/CRS.java | 6 ++++--
.../main/org/apache/sis/referencing/CommonCRS.java | 4 +++-
.../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++-
.../org/apache/sis/referencing/EllipsoidalHeightSeparator.java | 4 +++-
.../main/org/apache/sis/referencing/StandardDefinitions.java | 4 +++-
.../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 6 ++++--
.../org/apache/sis/referencing/datum/DefaultPrimeMeridian.java | 4 +++-
.../org/apache/sis/referencing/datum/DefaultVerticalDatum.java | 6 ++++--
.../sis/referencing/factory/sql/CoordinateOperationSet.java | 4 +++-
.../org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java | 4 +++-
.../main/org/apache/sis/referencing/factory/sql/TableInfo.java | 2 +-
.../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 ++--
.../org/apache/sis/referencing/internal/VerticalDatumTypes.java | 8 ++++++--
.../sis/referencing/operation/AbstractCoordinateOperation.java | 6 ++++--
.../sis/referencing/operation/CoordinateOperationRegistry.java | 4 +++-
.../org/apache/sis/referencing/operation/DefaultConversion.java | 4 ++--
.../referencing/operation/DefaultCoordinateOperationFactory.java | 6 ++++--
.../apache/sis/referencing/operation/DefaultOperationMethod.java | 6 ++++--
.../org/apache/sis/referencing/privy/CoordinateOperations.java | 4 +++-
.../main/org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++-
.../org/apache/sis/referencing/privy/NilReferencingObject.java | 2 +-
.../test/org/apache/sis/referencing/CommonCRSTest.java | 2 +-
.../apache/sis/referencing/datum/DefaultVerticalDatumTest.java | 4 +++-
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +-
.../apache/sis/referencing/internal/VerticalDatumTypesTest.java | 8 ++++++--
.../apache/sis/referencing/operation/provider/ProvidersTest.java | 4 +++-
.../referencing/operation/transform/OperationMethodSetTest.java | 4 +++-
.../apache/sis/referencing/report/CoordinateOperationMethods.java | 2 +-
.../sis/test/integration/CoordinateReferenceSystemTest.java | 4 +++-
.../main/org/apache/sis/gui/referencing/CRSChooser.java | 4 +++-
37 files changed, 107 insertions(+), 49 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index ed14df684c,208b00e466..0ef3b23ce2
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
@@@ -47,6 -46,6 +46,9 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.util.privy.Constants;
import org.apache.sis.metadata.iso.citation.Citations;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.DistanceOperatorName;
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 4ea1c59659,5063035c46..441c62d0fd
---
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
@@@ -28,10 -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;
++import org.opengis.metadata.extent.Extent;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a
primary name.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index 7c012a1e8e,62a8e7e973..ed5a7f7f38
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
@@@ -92,6 -90,6 +90,9 @@@ import org.apache.sis.util.privy.Numeri
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.geometry.Geometry;
import org.opengis.referencing.ObjectDomain;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
index 3a799b0838,10eac1745b..fdcf1d4b52
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
@@@ -54,6 -53,9 +53,9 @@@ import org.apache.sis.setup.Installatio
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Units;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.GeodeticCRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeocentricCRS;
+
/**
* The authority factory to use as a fallback when the real EPSG factory is
not available.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java
index 2db54434df,d03a744c4f..4b70ced344
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java
@@@ -40,6 -39,6 +39,9 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.referencing.factory.GeodeticObjectFactory;
import static
org.apache.sis.referencing.privy.ReferencingUtilities.getPropertiesForModifiedCRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeographicCRS;
++
/**
* Helper class for separating the ellipsoidal height from the horizontal
part of a CRS.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
index 0438435cad,882f14cc30..958a8b1ac9
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
@@@ -74,9 -74,8 +74,11 @@@ import org.apache.sis.measure.Units
import static
org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
- import org.opengis.referencing.datum.RealizationMethod;
import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
++// Specific to the geoapi-3.1 branch:
++import org.opengis.referencing.datum.RealizationMethod;
++
/**
* Definitions of referencing objects identified by the {@link CommonCRS}
enumeration values.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
index 44dd64e661,d4de47f133..882d41b8a8
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
@@@ -44,6 -43,6 +43,9 @@@ import org.apache.sis.util.Utilities
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.resources.Errors;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.Identifier;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
index 29391a9043,84baecb771..4a8df73c0e
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
@@@ -46,6 -45,9 +45,9 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.DerivedCRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
+
/**
* A coordinate reference system that is defined by its coordinate conversion
from another CRS.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
index e616c6f151,0a812d4823..afa3bdf612
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
@@@ -30,6 -29,6 +29,9 @@@ import org.apache.sis.referencing.cs.Ab
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.io.wkt.Formatter;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeocentricCRS;
++
/**
* A 2- or 3-dimensional coordinate reference system with the origin at the
approximate centre of mass of the earth.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
index d2bfb89b47,bca03ade69..85ba117d87
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
@@@ -43,6 -41,6 +41,10 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Workaround;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeographicCRS;
++import org.opengis.referencing.operation.Projection;
++
/**
* A 2-dimensional coordinate reference system used to approximate the shape
of the earth on a planar surface.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
index 70f6950895,fcd095f42e..f60c2341ca
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
@@@ -41,6 -40,6 +40,9 @@@ import org.apache.sis.io.wkt.Convention
import org.apache.sis.measure.Units;
import static org.apache.sis.util.ArgumentChecks.ensureFinite;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.Identifier;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
index 776b9d95dd,a522a26e73..d6b73a1d3e
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
@@@ -34,7 -32,8 +32,11 @@@ import org.apache.sis.referencing.privy
import org.apache.sis.referencing.internal.VerticalDatumTypes;
import org.apache.sis.metadata.privy.ImplementationHelper;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.datum.VerticalDatumType;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+ import java.util.Optional;
import org.opengis.referencing.datum.RealizationMethod;
import org.opengis.metadata.Identifier;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java
index 607bd27cae,c52f883131..a67aad7de8
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java
@@@ -30,6 -29,9 +29,9 @@@ import org.apache.sis.metadata.iso.cita
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.factory.IdentifiedObjectSet;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.DerivedCRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
+
/**
* A lazy set of {@link CoordinateOperation} objects to be returned by the
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
index 454397cbfb,45a6228236..8a843dad15
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
@@@ -53,6 -52,9 +52,9 @@@ import org.apache.sis.referencing.facto
import org.apache.sis.referencing.factory.ConcurrentAuthorityFactory;
import static
org.apache.sis.metadata.privy.NameToIdentifier.Simplifier.ESRI_DATUM_PREFIX;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.DerivedCRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
+
/**
* An implementation of {@link IdentifiedObjectFinder} which scans over a
smaller set of authority codes.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
index fb8d75c11c,9c0c4dcd86..a4498bb8eb
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
@@@ -30,10 -28,8 +28,12 @@@ import org.opengis.referencing.crs.Vert
import org.opengis.util.FactoryException;
import org.apache.sis.referencing.CRS;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeocentricCRS;
+import org.opengis.referencing.crs.ImageCRS;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+ import org.opengis.referencing.crs.GeodeticCRS;
import org.opengis.referencing.crs.ParametricCRS;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
index 11f58d1e6d,58a22e5fb3..b28513be42
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
@@@ -28,6 -26,9 +26,12 @@@ import org.apache.sis.util.Characters
import org.apache.sis.util.CharSequences;
import org.apache.sis.measure.Units;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.datum.VerticalDatumType;
++
+ // Specific to the geoapi-3.1 and geoapi-4.0 branches:
+ import org.opengis.referencing.datum.RealizationMethod;
+
/**
* Extensions to the standard set of {@link RealizationEpoch}.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
index b61593410d,00b10374aa..ea0256a6df
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
@@@ -76,7 -74,8 +74,11 @@@ import org.apache.sis.system.Semaphores
import org.apache.sis.system.Loggers;
import static org.apache.sis.util.Utilities.deepEquals;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+ import org.opengis.referencing.crs.DerivedCRS;
import org.opengis.coordinate.CoordinateSet;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
index f4603cfa01,85ef73d67a..f2c0519332
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
@@@ -81,6 -80,9 +80,9 @@@ import org.apache.sis.util.collection.C
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.resources.Vocabulary;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.DerivedCRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
+
/**
* Base class of code that search for coordinate operation, either by looking
in a registry maintained by an authority
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
index 44cb55e6e2,669883827c..cf5cea0a00
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
@@@ -41,9 -39,8 +39,11 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.DerivedCRS;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.operation.Projection;
++import org.opengis.referencing.crs.GeneralDerivedCRS;
+import org.opengis.referencing.crs.GeographicCRS;
+import org.opengis.referencing.crs.ProjectedCRS;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
index 546f1e0f94,65fbd9cc84..d5b622bc48
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
@@@ -58,6 -56,6 +56,10 @@@ import org.apache.sis.util.collection.C
import org.apache.sis.util.iso.AbstractFactory;
import org.apache.sis.util.resources.Errors;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeographicCRS;
++import org.opengis.referencing.crs.ProjectedCRS;
++
/**
* Creates {@linkplain AbstractCoordinateOperation operations} capable to
transform coordinates
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java
index 85b9d83257,85951ffd4a..0980d5a67b
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java
@@@ -59,6 -57,9 +57,10 @@@ import org.apache.sis.io.wkt.Formatter
import org.apache.sis.io.wkt.ElementKind;
import org.apache.sis.io.wkt.FormattableObject;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.DerivedCRS;
++// Specific to the main and geoapi-3.1 branches:
++import jakarta.xml.bind.annotation.XmlSchemaType;
++import org.opengis.referencing.crs.GeneralDerivedCRS;
+
/**
* Describes the algorithm and parameters used to perform a coordinate
operation. An {@code OperationMethod}
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java
index a384398386,d3e1d13048..7c9070000d
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java
@@@ -46,6 -45,9 +45,9 @@@ import org.apache.sis.util.privy.Collec
import org.apache.sis.util.privy.Numerics;
import org.apache.sis.util.collection.Containers;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.DerivedCRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
+
/**
* Utility methods related to coordinate operations.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/DefinitionVerifier.java
index ac388d3aed,866957855b..626bfe9463
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/DefinitionVerifier.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/DefinitionVerifier.java
@@@ -43,6 -42,9 +42,9 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.Utilities;
import org.apache.sis.util.logging.Logging;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.DerivedCRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
+
/**
* Verifies the conformance of a given CRS with an authoritative description.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
index 2a12ed66a7,24d4cb655e..b04897914f
---
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
@@@ -22,9 -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;
++import org.opengis.util.InternationalString;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/VerticalDatumTypesTest.java
index 2b846e8736,28f4e0ca9f..a9be269f6a
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/VerticalDatumTypesTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/VerticalDatumTypesTest.java
@@@ -26,6 -24,9 +24,12 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.datum.VerticalDatumType;
++
+ // Specific to the geoapi-3.1 and geoapi-4.0 branches:
+ import org.opengis.referencing.datum.RealizationMethod;
+
/**
* Tests the {@link VerticalDatumTypes} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
index 9f0731a943,7ab3a9864d..2d467cbe10
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
@@@ -30,6 -29,9 +29,9 @@@ import static org.junit.jupiter.api.Ass
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.factory.TestFactorySource;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.ProjectedCRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeodeticCRS;
+
/**
* Advanced CRS constructions requiring the EPSG geodetic dataset.
diff --cc
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
index 1630a4efd2,00d4c83f5f..9a11b70914
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
@@@ -69,6 -68,6 +68,9 @@@ import org.apache.sis.metadata.iso.exte
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.resources.Vocabulary;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
