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 bb9d125402579ce4e6c8314d403bd2e6a46956c3
Merge: d4690f7f41 e9dd6d1621
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Jun 7 13:16:52 2024 +0200
Post-merge imports reorganization on the main branch.
.../main/org/apache/sis/coverage/CoverageCombiner.java | 2 +-
.../main/org/apache/sis/coverage/RegionOfInterest.java | 2 +-
.../main/org/apache/sis/coverage/privy/CommonDomainFinder.java | 2 +-
.../org/apache/sis/coverage/privy/MultiSourceArgument.java | 2 +-
.../main/org/apache/sis/filter/TemporalOperation.java | 2 +-
.../org/apache/sis/metadata/internal/CitationConstant.java | 2 +-
.../test/org/apache/sis/metadata/PropertyAccessorTest.java | 2 +-
.../test/org/apache/sis/metadata/TreeNodeChildrenTest.java | 4 +++-
.../test/org/apache/sis/metadata/TypeMapTest.java | 2 +-
.../sis/metadata/iso/citation/DefaultCitationDateTest.java | 6 +++---
.../test/org/apache/sis/util/iso/TypesTest.java | 2 +-
.../apache/sis/map/coverage/MultiResolutionCoverageLoader.java | 2 +-
.../main/org/apache/sis/map/coverage/RenderingData.java | 2 +-
.../main/org/apache/sis/portrayal/Canvas.java | 2 +-
.../main/org/apache/sis/portrayal/CanvasExtent.java | 2 +-
.../sis/map/coverage/MultiResolutionCoverageLoaderTest.java | 2 +-
.../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../main/org/apache/sis/referencing/crs/AbstractCRS.java | 2 +-
.../main/org/apache/sis/referencing/datum/AbstractDatum.java | 4 +---
.../org/apache/sis/referencing/datum/DefaultImageDatum.java | 2 +-
.../org/apache/sis/referencing/datum/DefaultTemporalDatum.java | 6 +++---
.../org/apache/sis/referencing/factory/sql/EPSGDataAccess.java | 2 +-
.../main/org/apache/sis/referencing/internal/Legacy.java | 10 ++++------
.../referencing/operation/builder/LinearTransformBuilder.java | 2 +-
.../test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java | 6 +++---
.../test/org/apache/sis/referencing/CommonCRSTest.java | 6 ++++--
.../org/apache/sis/referencing/crs/DefaultImageCRSTest.java | 4 +++-
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 4 +++-
.../apache/sis/referencing/datum/DefaultTemporalDatumTest.java | 6 +++---
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 4 +++-
.../org/apache/sis/storage/geotiff/MultiResolutionImage.java | 2 +-
.../apache/sis/storage/geotiff/reader/GridGeometryBuilder.java | 2 +-
.../main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java | 2 +-
.../main/org/apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +-
.../main/org/apache/sis/storage/netcdf/base/Grid.java | 2 +-
.../org/apache/sis/storage/netcdf/base/GridAdjustment.java | 2 +-
.../main/org/apache/sis/storage/netcdf/base/GridMapping.java | 2 +-
.../org/apache/sis/storage/netcdf/classic/ChannelDecoder.java | 2 +-
.../test/org/apache/sis/storage/netcdf/base/TestCase.java | 2 +-
.../main/org/apache/sis/storage/gpx/Copyright.java | 2 +-
.../org/apache/sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../org/apache/sis/storage/aggregate/DimensionAppender.java | 2 +-
.../main/org/apache/sis/storage/aggregate/GridSlice.java | 2 +-
.../main/org/apache/sis/storage/base/MemoryGridResource.java | 2 +-
.../main/org/apache/sis/storage/esri/AsciiGridStore.java | 2 +-
.../main/org/apache/sis/storage/esri/RawRasterStore.java | 2 +-
.../main/org/apache/sis/storage/esri/WritableStore.java | 2 +-
.../main/org/apache/sis/storage/tiling/TileMatrix.java | 2 +-
.../sis/storage/aggregate/BandAggregateGridResourceTest.java | 2 +-
.../org/apache/sis/storage/base/MemoryGridResourceTest.java | 2 +-
.../org/apache/sis/storage/coveragejson/CoverageResource.java | 2 +-
.../main/org/apache/sis/gui/coverage/CoverageCanvas.java | 2 +-
.../main/org/apache/sis/gui/coverage/GridSliceSelector.java | 2 +-
.../main/org/apache/sis/gui/coverage/StyledRenderingData.java | 2 +-
.../main/org/apache/sis/gui/map/MapCanvas.java | 2 +-
.../main/org/apache/sis/gui/map/OperationFinder.java | 2 +-
.../main/org/apache/sis/gui/map/StatusBar.java | 2 +-
.../org/apache/sis/gui/referencing/RecentReferenceSystems.java | 2 +-
58 files changed, 80 insertions(+), 74 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalOperation.java
index 535990fc99,d826f84485..db72aafd22
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalOperation.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalOperation.java
@@@ -25,9 -25,9 +25,9 @@@ import static org.apache.sis.filter.Tim
import static org.apache.sis.filter.TimeMethods.AFTER;
import static org.apache.sis.filter.TimeMethods.EQUAL;
--// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.temporal.Period;
-import org.opengis.filter.TemporalOperatorName;
++// Specific to the main branch:
+import org.apache.sis.pending.geoapi.temporal.Period;
+import org.apache.sis.pending.geoapi.filter.TemporalOperatorName;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java
index 7e8e848a2a,8d2cd14af2..5e93f06613
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java
@@@ -36,8 -35,13 +35,9 @@@ import org.apache.sis.util.privy.String
import org.apache.sis.util.logging.Logging;
// Specific to the main and geoapi-3.1 branches:
+ import java.util.Date;
import org.opengis.metadata.citation.ResponsibleParty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.OnlineResource;
-import org.opengis.metadata.identification.BrowseGraphic;
-
/**
* Base class for the {@code public static final Citation} constants defined
in some SIS classes.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeChildrenTest.java
index de90c5aece,57af6b7e3c..d0c956e7ca
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeChildrenTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeChildrenTest.java
@@@ -38,6 -37,6 +37,9 @@@ import static org.junit.jupiter.api.Ass
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
++// Specific to the main branch:
++import java.util.Date;
++
/**
* Tests the {@link TreeNodeChildren} class.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java
index ba41a58185,92fa66b8ac..c841f55160
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java
@@@ -29,6 -26,9 +26,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 java.time.temporal.Temporal;
++// Specific to the main branch:
++import java.util.Date;
+
/**
* Tests {@link DefaultCitationDate}, especially the copy constructor.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypesTest.java
index baa5a79d47,a59e6e0f5d..fea409d520
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypesTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypesTest.java
@@@ -39,8 -38,9 +38,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.metadata.constraint.Restriction;
-import org.opengis.parameter.ParameterDirection;
+// Specific to the main branch:
++import org.opengis.referencing.datum.PixelInCell;
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 4c8acdca52,433f389f3f..c88ab0f08e
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@@ -87,11 -87,8 +87,11 @@@ import org.apache.sis.util.iso.Types
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.ReferenceIdentifier;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceSystem;
- import org.apache.sis.util.privy.TemporalDate;
+import org.apache.sis.referencing.internal.ServicesForMetadata;
++import org.apache.sis.util.privy.TemporalDate;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
index 1edcd58c06,fa32041ea3..013953fcb6
---
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
@@@ -43,11 -43,11 +43,11 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.resources.Errors;
// Specific to the main and geoapi-3.1 branches:
- import org.opengis.geometry.MismatchedDimensionException;
import org.opengis.referencing.crs.GeneralDerivedCRS;
+ import org.opengis.geometry.MismatchedDimensionException;
-// 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/AbstractDatum.java
index 08a653202e,ed1c54c3d0..f90b7fc3b9
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
@@@ -45,12 -45,8 +45,10 @@@ import org.apache.sis.io.wkt.Formatter
import static org.apache.sis.util.Utilities.deepEquals;
import static org.apache.sis.util.collection.Containers.property;
- // Specific to the main and geoapi-4.0 branches:
- import org.apache.sis.referencing.internal.Legacy;
-
-// 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;
+import org.opengis.metadata.extent.Extent;
++import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
index 2c28035e26,dd64749bc5..ce71309c26
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
@@@ -31,10 -30,11 +30,11 @@@ import org.apache.sis.io.wkt.Convention
import org.apache.sis.util.ComparisonMode;
// Specific to the main and geoapi-3.1 branches:
+ import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.datum.ImageDatum;
-// 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/DefaultTemporalDatum.java
index 5f958725ce,f1e678b567..87d21d75f6
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
@@@ -37,9 -37,9 +37,9 @@@ import org.apache.sis.io.wkt.Formattabl
// Specific to the main and geoapi-3.1 branches:
import org.apache.sis.util.privy.TemporalDate;
-// 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;
+
/**
* Defines the origin of a temporal coordinate reference system.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index e64088be40,d0ca972b72..4cd1a9ec72
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@@ -121,12 -121,9 +121,12 @@@ import static org.apache.sis.util.privy
import static org.apache.sis.util.Utilities.equalsIgnoreMetadata;
import static
org.apache.sis.referencing.internal.ServicesForMetadata.CONNECTION;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
- import org.apache.sis.util.privy.TemporalDate;
+import org.apache.sis.referencing.internal.ServicesForMetadata;
++import org.apache.sis.util.privy.TemporalDate;
+import org.apache.sis.referencing.cs.DefaultParametricCS;
+import org.apache.sis.referencing.datum.DefaultParametricDatum;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
index ff134ec0fa,ca37336531..d121506940
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
@@@ -29,33 -29,6 +29,31 @@@ import org.apache.sis.referencing.cs.De
import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
import org.apache.sis.referencing.privy.ReferencingUtilities;
- // Specific to the main and geoapi-4.0 branches:
++// Specific to the main branch:
+import java.util.Date;
++import java.util.List;
++import java.util.Objects;
++import java.util.Collection;
+import java.time.Instant;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.time.ZoneOffset;
+import java.time.LocalTime;
+import java.time.OffsetTime;
+import java.time.temporal.Temporal;
-
- // Specific to the main branch:
- import java.util.List;
- import java.util.Objects;
- import java.util.Collection;
+import org.opengis.referencing.ReferenceSystem;
+import org.opengis.referencing.IdentifiedObject;
+import org.opengis.util.InternationalString;
+import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.operation.CoordinateOperation;
+import org.apache.sis.referencing.DefaultObjectDomain;
+import org.apache.sis.referencing.AbstractIdentifiedObject;
+
/**
* Utilities related to version 1 of Well Known Text format, or to ISO
19111:2007.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
index 4c2b865523,38c0cfbdb9..3e2b63d27c
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
@@@ -62,8 -61,8 +61,9 @@@ import org.apache.sis.util.privy.String
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
++import org.opengis.geometry.coordinate.Position;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
index a4d9837cf6,1bd6f16f54..e312138ac2
---
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
@@@ -49,12 -50,13 +50,13 @@@ import org.apache.sis.test.TestCase
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.test.TestUtilities.*;
- import static org.apache.sis.util.privy.Constants.UTC;
+
+ // Specific to the main and geoapi-3.1 branches:
+ import org.apache.sis.util.privy.TemporalDate;
-// 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 org.apache.sis.util.privy.TemporalDate;
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
index 15dacd9cef,6bf4332864..05f712d41e
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
@@@ -37,8 -36,11 +36,11 @@@ import org.apache.sis.referencing.cs.Ha
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.opengis.referencing.datum.PixelInCell;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
index 19bee741bc,d00fde65f9..cc790b9e12
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
@@@ -30,8 -29,11 +29,11 @@@ import org.apache.sis.referencing.cs.Ha
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.opengis.referencing.datum.PixelInCell;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
+// Specific to the main branch:
+import static org.opengis.referencing.ReferenceSystem.DOMAIN_OF_VALIDITY_KEY;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
index 0adab084ed,58b4981490..adb23afaff
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
@@@ -34,13 -34,14 +34,13 @@@ import static org.apache.sis.referencin
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.test.TestUtilities.getScope;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.apache.sis.util.privy.TemporalDate;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.referencing.ObjectDomain.*;
-import static org.opengis.referencing.IdentifiedObject.*;
-import static org.opengis.test.Assertions.assertIdentifierEquals;
+// Specific to the main branch:
+import static org.opengis.referencing.ReferenceSystem.*;
+import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals;
- // Specific to the main and geoapi-3.1 branches:
- import org.apache.sis.util.privy.TemporalDate;
-
/**
* Tests the {@link DefaultTemporalDatum} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
index e79d091120,182f209bbb..add1c0f465
---
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
@@@ -28,9 -27,13 +27,12 @@@ import static org.apache.sis.util.privy
// Test dependencies
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.opengis.referencing.datum.PixelInCell;
+
-// 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.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java
index 1e280ae0a4,e8cdfc64e5..c39a324c08
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java
@@@ -59,9 -59,8 +59,9 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.measure.NumberRange;
import org.apache.sis.measure.Units;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.operation.CoordinateOperationFactory;
+// Specific to the main branch:
- import org.apache.sis.util.privy.TemporalDate;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
++import org.apache.sis.util.privy.TemporalDate;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestCase.java
index d5ae778b65,cb57b2828f..1484ecb5ed
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestCase.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestCase.java
@@@ -40,8 -41,10 +41,7 @@@ import org.junit.jupiter.api.TestInstan
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
- import org.apache.sis.storage.DataStoreMock;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
-
/**
* Base class of netCDF tests. The base class uses the UCAR decoder, which is
taken as a reference implementation.
diff --cc
endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Copyright.java
index 4ea89e49c1,88bc82ca4e..7223b7a6f6
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Copyright.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Copyright.java
@@@ -40,15 -39,11 +39,16 @@@ import org.opengis.metadata.constraint.
import org.opengis.util.InternationalString;
import org.apache.sis.util.iso.Types;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Responsibility;
-import org.opengis.metadata.identification.BrowseGraphic;
-import org.apache.sis.util.SimpleInternationalString;
+// Specific to the main branch:
++import java.util.Date;
+import org.opengis.metadata.citation.Contact;
+import org.opengis.metadata.citation.Series;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.apache.sis.util.privy.TemporalDate;
+import org.apache.sis.metadata.iso.citation.AbstractParty;
+import org.apache.sis.metadata.iso.citation.DefaultCitation;
+import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
+import org.apache.sis.metadata.iso.constraint.DefaultConstraints;
/**
