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 1a246afc5519c15f7713169cbb886a9012c358fb
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Jul 10 16:49:16 2024 +0200
Automatic post-merge import reorganization.
---
.../main/org/apache/sis/filter/TemporalOperation.java | 2 +-
.../main/org/apache/sis/temporal/DefaultInstant.java | 4 ++--
.../main/org/apache/sis/temporal/DefaultPeriod.java | 2 +-
.../main/org/apache/sis/xml/bind/gml/TimePeriodBound.java | 4 +++-
.../test/org/apache/sis/temporal/DefaultInstantTest.java | 10 +++++-----
.../test/org/apache/sis/temporal/DefaultPeriodTest.java | 2 ++
.../org/apache/sis/referencing/MultiRegisterOperations.java | 8 +++++---
.../org/apache/sis/referencing/factory/sql/EPSGDataAccess.java | 2 +-
.../apache/sis/referencing/internal/PositionTransformer.java | 2 +-
.../apache/sis/referencing/operation/DefaultConversion.java | 2 +-
.../operation/DefaultCoordinateOperationFactory.java | 2 +-
.../operation/transform/DefaultMathTransformFactory.java | 4 +++-
.../org/apache/sis/referencing/privy/CoordinateOperations.java | 2 +-
.../operation/transform/MathTransformFactoryMock.java | 2 +-
.../main/org/apache/sis/storage/landsat/MetadataReader.java | 4 +++-
.../main/org/apache/sis/storage/netcdf/base/GridMapping.java | 4 +---
.../main/org/apache/sis/storage/sql/postgis/RasterReader.java | 2 +-
.../main/org/apache/sis/measure/RangeFormat.java | 4 ++--
.../main/org/apache/sis/util/privy/MetadataServices.java | 4 +++-
19 files changed, 38 insertions(+), 28 deletions(-)
diff --git
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
index a59b174dc6..5eef5933ec 100644
---
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
@@ -30,8 +30,8 @@ import static org.apache.sis.temporal.TimeMethods.EQUAL;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.temporal.Period;
import org.opengis.temporal.Instant;
-import org.opengis.filter.TemporalOperatorName;
import org.opengis.temporal.IndeterminateValue;
+import org.opengis.filter.TemporalOperatorName;
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultInstant.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultInstant.java
index 77cdcc2d1c..80613993e9 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultInstant.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultInstant.java
@@ -23,6 +23,7 @@ import java.time.DateTimeException;
import java.time.ZonedDateTime;
import java.time.temporal.Temporal;
import java.time.temporal.TemporalAmount;
+import org.opengis.temporal.TemporalPrimitive;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
@@ -31,10 +32,9 @@ import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.temporal.Period;
import org.opengis.temporal.Instant;
-import org.opengis.temporal.TemporalPrimitive;
import org.opengis.temporal.IndeterminateValue;
-import org.opengis.filter.TemporalOperatorName;
import org.opengis.temporal.IndeterminatePositionException;
+import org.opengis.filter.TemporalOperatorName;
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
index a5142cc6c0..f5a506a08d 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
@@ -19,6 +19,7 @@ package org.apache.sis.temporal;
import java.util.Map;
import java.time.DateTimeException;
import java.time.temporal.TemporalAmount;
+import org.opengis.temporal.TemporalPrimitive;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
@@ -28,7 +29,6 @@ import org.apache.sis.util.privy.LazyCandidate;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.temporal.Instant;
import org.opengis.temporal.Period;
-import org.opengis.temporal.TemporalPrimitive;
import org.opengis.filter.TemporalOperatorName;
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java
index cf94c7a1c9..1a3e69600e 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java
@@ -23,9 +23,11 @@ import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlTransient;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.temporal.IndeterminateValue;
import org.opengis.temporal.Instant;
+// Specific to the geoapi-4.0 branch:
+import org.opengis.temporal.IndeterminateValue;
+
/**
* The {@linkplain TimePeriod#begin begin} or {@linkplain TimePeriod#end end}
position in
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultInstantTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultInstantTest.java
index 403defe9f3..9767aca743 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultInstantTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultInstantTest.java
@@ -24,17 +24,17 @@ import java.time.ZonedDateTime;
import java.time.ZoneOffset;
import org.opengis.temporal.TemporalPrimitive;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.TemporalOperatorName;
-import org.opengis.temporal.IndeterminateValue;
-import org.opengis.temporal.IndeterminatePositionException;
-
// Test dependencies
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.function.Executable;
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.temporal.IndeterminateValue;
+import org.opengis.temporal.IndeterminatePositionException;
+import org.opengis.filter.TemporalOperatorName;
+
/**
* Tests the {@link DefaultInstant} class.
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultPeriodTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultPeriodTest.java
index 9fbeb6c8f9..a51a608a8d 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultPeriodTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultPeriodTest.java
@@ -25,6 +25,8 @@ import org.opengis.temporal.TemporalPrimitive;
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.filter.TemporalOperatorName;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/MultiRegisterOperations.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/MultiRegisterOperations.java
index 07646e2cb4..2ddcd417b8 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/MultiRegisterOperations.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/MultiRegisterOperations.java
@@ -27,8 +27,6 @@ import org.opengis.util.Factory;
import org.opengis.util.FactoryException;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.referencing.AuthorityFactory;
-import org.opengis.referencing.RegisterOperations;
-import org.opengis.referencing.crs.SingleCRS;
import org.opengis.referencing.crs.CRSFactory;
import org.opengis.referencing.crs.CRSAuthorityFactory;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -45,11 +43,15 @@ import
org.apache.sis.referencing.factory.MultiAuthoritiesFactory;
import org.apache.sis.referencing.factory.NoSuchAuthorityFactoryException;
import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
-import org.apache.sis.util.Utilities;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.AbstractFactory;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.RegisterOperations;
+import org.opengis.referencing.crs.SingleCRS;
+import org.apache.sis.util.Utilities;
+
/**
* Finds <abbr>CRS</abbr>s or coordinate operations in one or many geodetic
registries.
diff --git
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
index de31e5a7e4..1036dd57c1 100644
---
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
@@ -80,6 +80,7 @@ import org.apache.sis.referencing.internal.DeprecatedCode;
import org.apache.sis.referencing.internal.EPSGParameterDomain;
import org.apache.sis.referencing.internal.SignReversalComment;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
import org.apache.sis.system.Loggers;
import org.apache.sis.system.Semaphores;
import org.apache.sis.util.SimpleInternationalString;
@@ -108,7 +109,6 @@ import
org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
import org.apache.sis.referencing.factory.FactoryDataException;
import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
-import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.resources.Errors;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/PositionTransformer.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/PositionTransformer.java
index a647fe9ace..25866b05e7 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/PositionTransformer.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/PositionTransformer.java
@@ -31,8 +31,8 @@ import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.util.Utilities;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
import org.opengis.referencing.RegisterOperations;
+import org.opengis.coordinate.MismatchedDimensionException;
/**
diff --git
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
index cd485a045b..af3c6d7ae3 100644
---
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
@@ -34,11 +34,11 @@ import org.opengis.referencing.datum.Datum;
import org.apache.sis.referencing.cs.CoordinateSystems;
import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
+import org.apache.sis.referencing.internal.Resources;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import org.apache.sis.referencing.operation.transform.MathTransformProvider;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.privy.ReferencingUtilities;
-import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
diff --git
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
index 17b4758b75..3fcaec2cd3 100644
---
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
@@ -36,6 +36,7 @@ import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.AbstractIdentifiedObject;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.internal.MergedProperties;
+import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
import org.apache.sis.referencing.privy.CoordinateOperations;
import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
import org.apache.sis.util.ArgumentChecks;
@@ -45,7 +46,6 @@ import org.apache.sis.util.Debug;
import org.apache.sis.util.privy.Constants;
import org.apache.sis.referencing.factory.GeodeticObjectFactory;
import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
-import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
import org.apache.sis.referencing.operation.transform.AbstractMathTransform;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import org.apache.sis.util.collection.WeakHashSet;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
index 9e1638086d..051f8187d8 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
@@ -47,12 +47,14 @@ import org.apache.sis.util.iso.AbstractFactory;
import org.apache.sis.util.collection.WeakHashSet;
import org.apache.sis.referencing.privy.CoordinateOperations;
import org.apache.sis.referencing.operation.DefaultOperationMethod;
-import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
import org.apache.sis.parameter.DefaultParameterValueGroup;
import org.apache.sis.system.Reflect;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.apache.sis.referencing.operation.matrix.Matrices;
+
/**
* Low level factory for creating {@linkplain AbstractMathTransform math
transforms}.
diff --git
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
index fbf24e4b88..11d8cff0d5 100644
---
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
@@ -23,7 +23,6 @@ import java.util.function.Supplier;
import java.util.logging.Logger;
import javax.measure.UnitConverter;
import javax.measure.IncommensurableException;
-import org.apache.sis.metadata.iso.citation.Citations;
import org.opengis.util.NoSuchIdentifierException;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.ObjectFactory;
@@ -38,6 +37,7 @@ import org.opengis.referencing.operation.SingleOperation;
import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.CoordinateOperationFactory;
import org.opengis.referencing.operation.MathTransformFactory;
+import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.operation.AbstractCoordinateOperation;
import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
index 12c76e45b5..037d6c57fa 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
@@ -17,7 +17,6 @@
package org.apache.sis.referencing.operation.transform;
import java.util.Set;
-import java.util.Optional;
import org.opengis.util.FactoryException;
import org.opengis.util.NoSuchIdentifierException;
import org.opengis.metadata.citation.Citation;
@@ -34,6 +33,7 @@ import
org.apache.sis.referencing.operation.provider.AbstractProvider;
import static org.junit.jupiter.api.Assertions.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.Optional;
import org.apache.sis.referencing.operation.matrix.Matrices;
diff --git
a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
index 4c3b7ff5d1..ba59a0aa86 100644
---
a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
+++
b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
@@ -41,7 +41,6 @@ import org.opengis.metadata.content.TransferFunctionType;
import org.opengis.metadata.maintenance.ScopeCode;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.crs.ProjectedCRS;
-import org.opengis.referencing.operation.MathTransform;
import org.opengis.util.NoSuchIdentifierException;
import org.opengis.util.FactoryException;
import org.apache.sis.measure.Units;
@@ -68,6 +67,9 @@ import org.apache.sis.util.privy.Constants;
import org.apache.sis.util.privy.Strings;
import static org.apache.sis.util.privy.CollectionsExt.singletonOrNull;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.operation.MathTransform;
+
/**
* Parses Landsat metadata as {@linkplain DefaultMetadata ISO 19115 Metadata}
object.
diff --git
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
index 07133b2cab..e470fbd1d5 100644
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
@@ -45,6 +45,7 @@ import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.OperationMethod;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.Conversion;
+import org.opengis.referencing.operation.CoordinateOperationFactory;
import org.opengis.referencing.datum.DatumFactory;
import org.opengis.referencing.datum.GeodeticDatum;
import org.opengis.referencing.datum.PrimeMeridian;
@@ -77,9 +78,6 @@ import org.apache.sis.io.wkt.WKTFormat;
import org.apache.sis.io.wkt.Warnings;
import org.apache.sis.measure.Units;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.operation.CoordinateOperationFactory;
-
/**
* Temporary objects for creating a {@link GridGeometry} instance defined by
attributes on a variable.
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
index 7f6b330019..84ad97dc08 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
@@ -20,9 +20,9 @@ import java.util.List;
import java.util.Arrays;
import java.nio.ByteOrder;
import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
import java.io.InputStream;
import java.io.IOException;
+import java.nio.channels.Channels;
import java.lang.reflect.Array;
import java.awt.image.ColorModel;
import java.awt.image.SampleModel;
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/RangeFormat.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/RangeFormat.java
index 24326f7b41..32b062562e 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/RangeFormat.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/RangeFormat.java
@@ -33,14 +33,14 @@ import java.text.FieldPosition;
import java.text.ParseException;
import java.text.ParsePosition;
import java.time.Instant;
-import java.time.format.FormatStyle;
-import java.time.format.DateTimeFormatterBuilder;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.OffsetTime;
import java.time.ZonedDateTime;
+import java.time.format.FormatStyle;
+import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.Temporal;
import java.lang.reflect.InaccessibleObjectException;
import javax.measure.Unit;
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/MetadataServices.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/MetadataServices.java
index b3cc0b19c8..0e7881d8bf 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/MetadataServices.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/MetadataServices.java
@@ -29,10 +29,12 @@ import org.apache.sis.system.OptionalDependency;
import org.apache.sis.util.CharSequences;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.util.ControlledVocabulary;
+
+// Specific to the geoapi-4.0 branch:
import java.util.MissingResourceException;
import org.opengis.annotation.UML;
import org.opengis.annotation.ResourceBundles;
-import org.opengis.util.ControlledVocabulary;
/**
