This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit dadfde5d17da6cb0d59969bc9633e1b4bb71f61e
Merge: 428919e44a 12371196a0
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Apr 22 16:17:21 2024 +0200
Merge branch 'geoapi-3.1': automatic imports reorganization.
.../apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++-
.../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +-
.../apache/sis/metadata/simple/SimpleIdentifiedObject.java | 2 +-
.../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++---
.../test/org/apache/sis/test/mock/VerticalCRSMock.java | 2 +-
.../main/org/apache/sis/referencing/CRS.java | 4 +++-
.../main/org/apache/sis/referencing/CommonCRS.java | 6 ++++--
.../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++-
.../apache/sis/referencing/EllipsoidalHeightSeparator.java | 4 +++-
.../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++-
.../org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++-
.../org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 4 +++-
.../org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 6 ++++--
.../apache/sis/referencing/datum/DefaultPrimeMeridian.java | 4 +++-
.../apache/sis/referencing/datum/DefaultVerticalDatum.java | 4 +++-
.../sis/referencing/factory/sql/CoordinateOperationSet.java | 4 +++-
.../apache/sis/referencing/factory/sql/EPSGCodeFinder.java | 4 +++-
.../org/apache/sis/referencing/factory/sql/TableInfo.java | 2 +-
.../apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 2 +-
.../apache/sis/referencing/internal/VerticalDatumTypes.java | 12 ++++++++----
.../referencing/operation/AbstractCoordinateOperation.java | 4 +++-
.../referencing/operation/CoordinateOperationRegistry.java | 4 +++-
.../apache/sis/referencing/operation/DefaultConversion.java | 4 ++--
.../operation/DefaultCoordinateOperationFactory.java | 6 ++++--
.../sis/referencing/operation/DefaultOperationMethod.java | 6 ++++--
.../apache/sis/referencing/privy/CoordinateOperations.java | 4 +++-
.../org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++-
.../apache/sis/referencing/privy/NilReferencingObject.java | 2 +-
.../test/org/apache/sis/io/wkt/TransliteratorTest.java | 4 +++-
.../test/org/apache/sis/referencing/CommonCRSTest.java | 2 +-
.../sis/referencing/datum/DefaultVerticalDatumTest.java | 6 ++++--
.../org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +-
.../sis/referencing/internal/VerticalDatumTypesTest.java | 4 +++-
.../operation/transform/OperationMethodSetTest.java | 4 +++-
.../sis/referencing/report/CoordinateOperationMethods.java | 2 +-
.../sis/test/integration/CoordinateReferenceSystemTest.java | 8 ++++++--
.../apache/sis/test/integration/MetadataVerticalTest.java | 2 +-
.../main/org/apache/sis/gui/referencing/CRSChooser.java | 4 +++-
38 files changed, 106 insertions(+), 50 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index e74b1642b4,0ef3b23ce2..2f47a1cadf
---
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,9 -46,12 +46,12 @@@ 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;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.filter.SpatialOperatorName;
+import org.apache.sis.pending.geoapi.filter.DistanceOperatorName;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
index b4ec7fc882,14478406e7..56feed4b21
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
@@@ -70,9 -69,9 +69,10 @@@ import static org.apache.sis.util.colle
import static org.apache.sis.util.privy.CollectionsExt.nonNull;
import static
org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.geometry.MismatchedReferenceSystemException;
-import org.opengis.referencing.datum.RealizationMethod;
+// Specific to the main branch:
+import org.opengis.metadata.identification.DataIdentification;
++import org.opengis.referencing.datum.VerticalDatumType;
+import org.apache.sis.pending.geoapi.evolution.Interim;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 10281bd0bf,441c62d0fd..6f0ae78a45
---
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,15 -29,9 +29,15 @@@ import org.apache.sis.util.privy.Consta
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;
+// Specific to the main branch:
+import java.util.Set;
+import java.util.Collection;
+import java.util.Collections;
+import org.opengis.util.GenericName;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a
primary name.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/ExtentsTest.java
index f562dd5a60,93928b1e3f..708ee86690
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/ExtentsTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/ExtentsTest.java
@@@ -41,6 -38,9 +38,9 @@@ import org.apache.sis.test.TestCase
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.mock.VerticalCRSMock;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
++// Specific to the main branch:
++import org.opengis.referencing.datum.VerticalDatumType;
+
/**
* Tests {@link Extents} static methods.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
index 7487381abf,2ad61c5b4f..e2bf9fc865
---
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
@@@ -30,8 -29,9 +29,9 @@@ import org.apache.sis.measure.Units
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;
+// Specific to the main branch:
+import java.util.Date;
++import org.opengis.referencing.datum.VerticalDatumType;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index fc312dda24,ed5a7f7f38..435b9f049d
---
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
@@@ -91,9 -90,17 +90,12 @@@ 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;
-import org.opengis.referencing.crs.DerivedCRS;
-import org.opengis.referencing.datum.DynamicReferenceFrame;
-import org.opengis.metadata.extent.BoundingPolygon;
-import org.opengis.metadata.extent.GeographicExtent;
-import org.opengis.coordinate.CoordinateMetadata;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.referencing.DynamicReferenceFrame;
+import org.apache.sis.coordinate.DefaultCoordinateMetadata;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
index 3ff72a19f8,25ff65a93d..d0219d887e
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
@@@ -88,6 -86,9 +86,10 @@@ import org.apache.sis.measure.Latitude
import org.apache.sis.measure.Units;
import static
org.apache.sis.util.privy.StandardDateFormat.MILLISECONDS_PER_DAY;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
++// Specific to the main branch:
++import org.opengis.referencing.crs.GeocentricCRS;
++import org.opengis.referencing.datum.VerticalDatumType;
+
/**
* Frequently-used geodetic CRS and datum that are guaranteed to be available
in SIS.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
index b2405b6dde,882d41b8a8..1dce136985
---
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,8 -43,11 +43,11 @@@ 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;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
index 585a5a7ed6,f60c2341ca..8724a54a38
---
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,8 -40,11 +40,11 @@@ 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;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
index 6b29262c9d,d6b73a1d3e..fd46ba3bd7
---
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
@@@ -33,8 -32,13 +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;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
index 53aa28b85e,a4498bb8eb..9d3962d7ff
---
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,8 -29,13 +29,9 @@@ import org.opengis.util.FactoryExceptio
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;
-
/**
* A factory that redirect all method to another factory. This factory is
normally useless and not used by Apache SIS.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
index 6ccaa8d0c4,b28513be42..a78390b5c2
---
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
@@@ -27,9 -24,13 +24,16 @@@ import org.opengis.referencing.cs.Coord
import org.opengis.referencing.cs.AxisDirection;
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;
++// Specific to the main branch:
++import java.util.function.Predicate;
++import org.opengis.util.CodeList;
+import org.apache.sis.util.StringBuilders;
+import org.apache.sis.util.privy.CodeLists;
- import org.apache.sis.measure.Units;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
index a571627ad7,ea0256a6df..cb6bbfbfca
---
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
@@@ -75,14 -74,12 +74,17 @@@ 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;
+// Specific to the main branch:
+import java.time.temporal.Temporal;
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19111;
+import org.opengis.metadata.extent.Extent;
+import org.apache.sis.referencing.internal.Legacy;
+import org.apache.sis.coordinate.AbstractCoordinateSet;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
index 683e33c423,b04897914f..0c3a931510
---
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,16 -23,9 +23,16 @@@ import org.apache.sis.referencing.Named
import org.apache.sis.util.resources.Vocabulary;
// Specific to the main and geoapi-3.1 branches:
- import org.opengis.util.InternationalString;
import org.opengis.referencing.ReferenceIdentifier;
+ import org.opengis.util.InternationalString;
+// Specific to the main branch:
+import java.util.Set;
+import java.util.Collection;
+import org.opengis.util.GenericName;
+import org.opengis.metadata.extent.Extent;
+import org.apache.sis.io.wkt.UnformattableObjectException;
+
/**
* A referencing object for which every methods return {@code null} or a
neutral value.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/TransliteratorTest.java
index 0e4ad77061,3ba62d844f..aaf43b9b33
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/TransliteratorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/TransliteratorTest.java
@@@ -29,6 -28,6 +28,9 @@@ import static org.junit.jupiter.api.Ass
import org.apache.sis.test.TestCase;
import org.apache.sis.test.mock.CoordinateSystemAxisMock;
++// Specific to the main branch:
++import org.apache.sis.referencing.privy.AxisDirections;
++
/**
* Tests the {@link Transliterator} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
index 80f6689c5d,206e67dc7d..14faed48b6
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
@@@ -48,8 -47,9 +47,9 @@@ import static org.apache.sis.test.Asser
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.test.TestUtilities.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
-import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
+// Specific to the main branch:
++import org.opengis.referencing.datum.VerticalDatumType;
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
index fe792940f1,50234ca791..49ab7a1481
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
@@@ -39,6 -37,9 +37,10 @@@ import static org.apache.sis.test.TestU
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
++// Specific to the main branch:
++import java.lang.reflect.Field;
++import org.opengis.referencing.datum.VerticalDatumType;
+
/**
* Tests the {@link DefaultVerticalDatum} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
index 8121b76632,cfb5e1e085..43903a257f
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
@@@ -29,8 -28,10 +28,9 @@@ import static org.apache.sis.util.privy
// Test dependencies
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
-import static org.opengis.referencing.IdentifiedObject.*;
-import static org.opengis.referencing.ObjectDomain.*;
+// Specific to the main branch:
++import org.opengis.referencing.datum.VerticalDatumType;
+import static org.opengis.referencing.datum.Datum.*;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/VerticalDatumTypesTest.java
index 7a19958814,a9be269f6a..00de10be23
---
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
@@@ -25,6 -24,12 +24,9 @@@ 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/referencing/operation/transform/OperationMethodSetTest.java
index 6eafbe03b1,3764122ff9..a5823eb599
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
@@@ -35,6 -34,9 +34,9 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.operation.PointMotionOperation;
++// Specific to the main branch:
++import org.opengis.referencing.operation.PassThroughOperation;
+
/**
* Tests {@link OperationMethodSet}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateOperationMethods.java
index 3a5070367b,1327cf31b4..fbb5b1d453
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateOperationMethods.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateOperationMethods.java
@@@ -52,8 -51,9 +51,9 @@@ import org.apache.sis.parameter.Paramet
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import org.opengis.referencing.crs.DerivedCRS;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
++import org.opengis.referencing.crs.GeneralDerivedCRS;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
index 8a63da90e0,2d467cbe10..bd92e661a9
---
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
@@@ -31,6 -29,9 +29,12 @@@ import static org.junit.jupiter.api.Ass
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.factory.TestFactorySource;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.opengis.referencing.crs.GeodeticCRS;
+
++// Specific to the main branch:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
/**
* Advanced CRS constructions requiring the EPSG geodetic dataset.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
index 8cb6ee88d1,53095b9d1c..d6701022c7
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
@@@ -47,9 -46,9 +46,10 @@@ import org.apache.sis.xml.test.TestCase
import static org.apache.sis.test.TestUtilities.getScope;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.nio.charset.StandardCharsets;
-import static org.opengis.test.Assertions.assertIdentifierEquals;
+// Specific to the main branch:
+import org.opengis.metadata.identification.CharacterSet;
++import org.opengis.referencing.datum.VerticalDatumType;
+import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals;
/**
diff --cc
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
index 9a763292ba,9a11b70914..e5f2dac4bf
---
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,12 +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;
-
/**
* A list of Coordinate Reference Systems (CRS) from which the user can
select.
