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 e5ffa1ff25121ccea9cc51ed1eaeebcd2709d815
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Jan 22 15:34:18 2024 +0100
Post-merge automatic import reorganization.
---
.../main/org/apache/sis/filter/Capabilities.java | 1 -
.../main/org/apache/sis/filter/internal/CopyVisitor.java | 1 -
.../main/org/apache/sis/filter/internal/EditVisitor.java | 1 -
.../main/org/apache/sis/filter/sqlmm/FunctionDescription.java | 1 -
.../test/org/apache/sis/filter/CapabilitiesTest.java | 3 ++-
.../test/org/apache/sis/filter/internal/CopyVisitorTest.java | 3 ++-
.../test/org/apache/sis/filter/internal/FilterFactoryMock.java | 1 -
.../test/org/apache/sis/filter/internal/FunctionMock.java | 1 -
.../test/org/apache/sis/filter/internal/ValueReferenceMock.java | 1 -
.../main/org/apache/sis/metadata/iso/legacy/MediumName.java | 1 -
.../main/org/apache/sis/xml/bind/metadata/MD_AssociatedResource.java | 1 -
.../org/apache/sis/xml/bind/metadata/code/DQM_ValueStructure.java | 1 -
.../org/apache/sis/xml/bind/metadata/code/SV_ParameterDirection.java | 1 -
.../test/org/apache/sis/metadata/iso/MarshallingTest.java | 3 ++-
.../test/org/apache/sis/metadata/xml/SchemaComplianceTest.java | 3 ++-
.../test/org/apache/sis/xml/RenameListGenerator.java | 1 -
.../test/org/apache/sis/xml/test/PackageVerifier.java | 3 ++-
.../test/org/apache/sis/xml/test/SchemaCompliance.java | 1 -
.../main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java | 4 +---
.../sis/referencing/operation/transform/ConcatenatedTransform.java | 2 +-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 3 ++-
.../org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java | 3 ++-
.../test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java | 3 ++-
.../org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java | 3 ++-
.../referencing/operation/provider/ParameterNameTableGenerator.java | 3 ++-
.../org/apache/sis/referencing/report/CoordinateReferenceSystems.java | 3 ++-
.../test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java | 3 ++-
.../test/org/apache/sis/storage/netcdf/classic/FeatureSetTest.java | 3 ++-
.../main/org/apache/sis/pending/temporal/Primitive.java | 1 -
incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java | 1 -
.../main/org/apache/sis/cql/FilterToCQLVisitor.java | 1 -
incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/Query.java | 1 -
.../org.apache.sis.cql/main/org/apache/sis/cql/internal/AntlrCQL.java | 1 -
.../src/org.apache.sis.cql/test/org/apache/sis/cql/CQLTestCase.java | 1 -
.../test/org/apache/sis/cql/ExpressionReadingTest.java | 3 ++-
.../test/org/apache/sis/cql/ExpressionWritingTest.java | 3 ++-
.../org.apache.sis.cql/test/org/apache/sis/cql/FilterReadingTest.java | 3 ++-
.../org.apache.sis.cql/test/org/apache/sis/cql/FilterWritingTest.java | 3 ++-
.../org.apache.sis.cql/test/org/apache/sis/cql/QueryReadingTest.java | 3 ++-
.../org.apache.sis.cql/test/org/apache/sis/cql/QueryWritingTest.java | 3 ++-
.../test/org/apache/sis/map/MapLayersTest.java | 2 ++
.../test/org/apache/sis/map/SEPortrayerTest.java | 2 ++
42 files changed, 44 insertions(+), 42 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
index 25bbd86e44..23a97d7dfb 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.filter;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Map;
import java.util.Set;
import java.util.Collection;
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/CopyVisitor.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/CopyVisitor.java
index 91dc780a0e..fd63bfd8df 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/CopyVisitor.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/CopyVisitor.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.filter.internal;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/EditVisitor.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/EditVisitor.java
index e95e171afb..83f6f62c64 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/EditVisitor.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/EditVisitor.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.filter.internal;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Literal;
import org.opengis.filter.FilterFactory;
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionDescription.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionDescription.java
index d0bd02f718..263646d4b7 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionDescription.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionDescription.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.filter.sqlmm;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.List;
import java.io.Serializable;
import java.lang.reflect.Type;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/CapabilitiesTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/CapabilitiesTest.java
index db06a8d3d0..9b4f4243d4 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/CapabilitiesTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/CapabilitiesTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.sis.filter;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Set;
import org.opengis.util.LocalName;
import org.opengis.filter.ComparisonOperatorName;
import org.opengis.filter.capability.IdCapabilities;
import org.opengis.filter.capability.ScalarCapabilities;
import org.opengis.filter.capability.AvailableFunction;
+
+// Test dependencies
import org.junit.Test;
import static org.junit.Assert.*;
import org.apache.sis.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/CopyVisitorTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/CopyVisitorTest.java
index 3c68dd8d89..87d81bca6e 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/CopyVisitorTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/CopyVisitorTest.java
@@ -16,12 +16,13 @@
*/
package org.apache.sis.filter.internal;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Map;
import org.opengis.feature.Feature;
import org.opengis.filter.Expression;
import org.opengis.filter.FilterFactory;
import org.apache.sis.filter.DefaultFilterFactory;
+
+// Test dependencies
import org.junit.Test;
import static org.junit.Assert.*;
import org.apache.sis.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FilterFactoryMock.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FilterFactoryMock.java
index 97ae4166f7..2b8578d080 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FilterFactoryMock.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FilterFactoryMock.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.filter.internal;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.time.Instant;
import java.util.Map;
import java.util.Arrays;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FunctionMock.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FunctionMock.java
index e473d12246..9ac20cdc04 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FunctionMock.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FunctionMock.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.filter.internal;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Map;
import java.util.List;
import org.opengis.util.ScopedName;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/ValueReferenceMock.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/ValueReferenceMock.java
index 1a7e32e3e5..a845e7fcf1 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/ValueReferenceMock.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/ValueReferenceMock.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.filter.internal;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Map;
import org.opengis.filter.Expression;
import org.opengis.filter.ValueReference;
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/MediumName.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/MediumName.java
index 0f6b9991a9..d1765445ef 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/MediumName.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/MediumName.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.metadata.iso.legacy;
-// Specific to the geoapi-4.0 branch:
import java.util.List;
import java.util.ArrayList;
import org.opengis.annotation.UML;
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/MD_AssociatedResource.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/MD_AssociatedResource.java
index d9c004aa18..21dbd12564 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/MD_AssociatedResource.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/MD_AssociatedResource.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.xml.bind.metadata;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import jakarta.xml.bind.annotation.XmlElementRef;
import org.opengis.metadata.identification.AssociatedResource;
import org.apache.sis.metadata.iso.identification.DefaultAssociatedResource;
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/DQM_ValueStructure.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/DQM_ValueStructure.java
index 28205a7789..b3789705e5 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/DQM_ValueStructure.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/DQM_ValueStructure.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.xml.bind.metadata.code;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import jakarta.xml.bind.annotation.XmlElement;
import org.opengis.metadata.quality.ValueStructure;
import org.apache.sis.xml.Namespaces;
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/SV_ParameterDirection.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/SV_ParameterDirection.java
index 39b16bb04c..1da66b1a8a 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/SV_ParameterDirection.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/SV_ParameterDirection.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.xml.bind.metadata.code;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import jakarta.xml.bind.annotation.XmlElement;
import org.opengis.parameter.ParameterDirection;
import org.apache.sis.xml.Namespaces;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/MarshallingTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/MarshallingTest.java
index 6b9cc40fea..104794c77f 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/MarshallingTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/MarshallingTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.metadata.iso;
-// Specific to the geoapi-4.0 branch:
import java.util.Date;
import java.util.Locale;
import java.util.List;
@@ -65,6 +64,8 @@ import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.bind.gcx.Anchor;
import org.apache.sis.xml.bind.metadata.replace.ReferenceSystemMetadata;
import org.apache.sis.metadata.xml.TestUsingFile;
+
+// Test dependencies
import org.junit.Test;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
index d953b860b0..81cbbc9727 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.metadata.xml;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.nio.file.Path;
import java.nio.file.Files;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.system.DataDirectory;
+
+// Test dependencies
import org.junit.Test;
import static org.junit.Assume.*;
import org.apache.sis.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
index e12f8966f3..776d511bf8 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/RenameListGenerator.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.xml;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
index 109825478c..a615042c7e 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.xml.test;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Map;
import java.util.Set;
import java.util.HashMap;
@@ -46,6 +45,8 @@ import org.apache.sis.util.Classes;
import org.apache.sis.system.Modules;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.util.LegacyNamespaces;
+
+// Test dependencies
import static org.apache.sis.test.TestCase.PENDING_FUTURE_SIS_VERSION;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
index 81e92d0ea1..8d5e38aba6 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.xml.test;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
index 450449f0d9..d4a72411e1 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
@@ -31,6 +31,7 @@ import org.opengis.referencing.crs.GeodeticCRS;
import org.opengis.referencing.crs.SingleCRS;
import org.opengis.referencing.datum.GeodeticDatum;
import org.opengis.referencing.datum.PrimeMeridian;
+import org.opengis.metadata.Identifier;
import org.apache.sis.referencing.AbstractReferenceSystem;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.cs.AbstractCS;
@@ -45,9 +46,6 @@ import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.measure.Units;
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-
/**
* A 2- or 3-dimensional coordinate reference system based on a geodetic datum.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
index 16b3cfc771..a867caf80a 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
@@ -37,8 +37,8 @@ import org.apache.sis.parameter.Parameterized;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.provider.GeocentricAffine;
import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.util.ReferencingUtilities;
+import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.system.Semaphores;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ComparisonMode;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
index 6971a68ec8..798af7e7e3 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.sis.io.wkt;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.crs.VerticalCRS;
import org.opengis.referencing.datum.VerticalDatumType;
import org.opengis.util.FactoryException;
import org.apache.sis.metadata.internal.AxisNames;
import org.apache.sis.referencing.factory.GeodeticObjectFactory;
+
+// Test dependencies
import org.junit.Test;
import org.junit.Ignore;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
index 1e9df0d25a..f3b59c964f 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.referencing.factory;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Map;
import javax.measure.Unit;
import javax.measure.quantity.Angle;
@@ -41,6 +40,8 @@ import org.apache.sis.referencing.operation.DefaultConversion;
import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.measure.Units;
+
+// Test dependencies
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
index 849129d9cd..926b18d028 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.referencing.geoapi;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.util.FactoryException;
import org.apache.sis.referencing.CRS;
+
+// Test dependencies
import org.junit.Ignore;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
index 0071283564..5689b5ff46 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
@@ -16,12 +16,13 @@
*/
package org.apache.sis.referencing.geoapi;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.util.FactoryException;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.MathTransform2D;
import org.opengis.referencing.operation.TransformException;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
+
+// Test dependencies
import org.junit.After;
import org.junit.Test;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ParameterNameTableGenerator.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ParameterNameTableGenerator.java
index e9aa211696..c02f12799b 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ParameterNameTableGenerator.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ParameterNameTableGenerator.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.referencing.operation.provider;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
@@ -38,6 +37,8 @@ import org.apache.sis.measure.Longitude;
import org.apache.sis.measure.Range;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.StringBuilders;
+
+// Test dependencies
import static org.junit.Assert.*;
import org.apache.sis.test.ProjectDirectories;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
index 95c823e43a..97f525aa38 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.referencing.report;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Locale;
import java.util.Set;
import java.util.Map;
@@ -58,6 +57,8 @@ import org.apache.sis.referencing.crs.AbstractCRS;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.util.iso.DefaultNameSpace;
import org.apache.sis.util.logging.Logging;
+
+// Test dependencies
import static org.junit.Assert.*;
import org.opengis.test.report.AuthorityCodesReport;
diff --git
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java
index c0486cd34f..21c68cbeac 100644
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.storage.netcdf.base;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.awt.Shape;
import java.awt.geom.PathIterator;
import java.util.Iterator;
@@ -36,6 +35,8 @@ import org.opengis.parameter.ParameterValueGroup;
import org.apache.sis.feature.internal.AttributeConvention;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
+
+// Test dependencies
import org.junit.Test;
import static org.junit.Assert.*;
import org.opengis.test.dataset.TestData;
diff --git
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/FeatureSetTest.java
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/FeatureSetTest.java
index f5be681dd6..19e5e16836 100644
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/FeatureSetTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/FeatureSetTest.java
@@ -16,10 +16,11 @@
*/
package org.apache.sis.storage.netcdf.classic;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.io.IOException;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.netcdf.base.Decoder;
+
+// Test dependencies
import org.opengis.test.dataset.TestData;
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/Primitive.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/Primitive.java
index ea73474347..d176fa6bc0 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/Primitive.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/Primitive.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.pending.temporal;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.temporal.Duration;
import org.opengis.temporal.RelativePosition;
import org.opengis.temporal.TemporalGeometricPrimitive;
diff --git a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
index 44c7480342..a1fde7f7a3 100644
--- a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
+++ b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.time.Duration;
import java.time.Period;
import java.util.List;
diff --git
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/FilterToCQLVisitor.java
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/FilterToCQLVisitor.java
index f382930889..4e3970cca9 100644
---
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/FilterToCQLVisitor.java
+++
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/FilterToCQLVisitor.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Date;
import java.util.List;
import java.util.Locale;
diff --git
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/Query.java
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/Query.java
index 0b16bd378f..6c8794bcef 100644
--- a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/Query.java
+++ b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/Query.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
diff --git
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/internal/AntlrCQL.java
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/internal/AntlrCQL.java
index 366f62888b..64c3fa3c84 100644
---
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/internal/AntlrCQL.java
+++
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/internal/AntlrCQL.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.cql.internal;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CodePointCharStream;
import org.antlr.v4.runtime.CommonTokenStream;
diff --git
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/CQLTestCase.java
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/CQLTestCase.java
index 0b7eb20164..a29dc1760d 100644
--- a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/CQLTestCase.java
+++ b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/CQLTestCase.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.locationtech.jts.geom.GeometryFactory;
import org.opengis.filter.FilterFactory;
import org.opengis.feature.Feature;
diff --git
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionReadingTest.java
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionReadingTest.java
index cd62417f9d..36df0ce2ce 100644
---
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionReadingTest.java
+++
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionReadingTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.time.Instant;
import java.time.Duration;
import java.time.Period;
@@ -37,6 +36,8 @@ import org.opengis.feature.Feature;
import org.opengis.filter.Expression;
import org.opengis.filter.Literal;
import org.opengis.filter.ValueReference;
+
+// Test dependencies
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
diff --git
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionWritingTest.java
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionWritingTest.java
index a94abf14db..ba8c733269 100644
---
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionWritingTest.java
+++
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionWritingTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.time.Instant;
import java.text.ParseException;
import org.locationtech.jts.geom.Coordinate;
@@ -26,6 +25,8 @@ import org.locationtech.jts.geom.LinearRing;
import org.locationtech.jts.geom.Polygon;
import org.opengis.filter.Expression;
import org.opengis.feature.Feature;
+
+// Test dependencies
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
diff --git
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/FilterReadingTest.java
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/FilterReadingTest.java
index 124c576021..03e26bea50 100644
---
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/FilterReadingTest.java
+++
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/FilterReadingTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.List;
import java.util.Arrays;
import java.util.Locale;
@@ -40,6 +39,8 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.util.internal.UnmodifiableArrayList;
+
+// Test dependencies
import org.junit.Ignore;
import org.junit.Test;
import static org.opengis.test.Assert.*;
diff --git
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/FilterWritingTest.java
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/FilterWritingTest.java
index 41c852c3b8..9fd7f04596 100644
---
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/FilterWritingTest.java
+++
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/FilterWritingTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.time.Instant;
import java.text.ParseException;
import org.locationtech.jts.geom.Coordinate;
@@ -28,6 +27,8 @@ import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.util.internal.UnmodifiableArrayList;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
+
+// Test dependencies
import org.junit.Test;
import org.junit.Ignore;
import static org.junit.Assert.*;
diff --git
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/QueryReadingTest.java
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/QueryReadingTest.java
index 4370e66f87..cfc7aaee47 100644
---
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/QueryReadingTest.java
+++
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/QueryReadingTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Arrays;
import org.opengis.filter.SortOrder;
+
+// Test dependencies
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/QueryWritingTest.java
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/QueryWritingTest.java
index fa29bce34b..42006192e8 100644
---
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/QueryWritingTest.java
+++
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/QueryWritingTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.cql;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Arrays;
import org.opengis.filter.SortOrder;
+
+// Test dependencies
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/MapLayersTest.java
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/MapLayersTest.java
index 15248843f6..f92037456b 100644
---
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/MapLayersTest.java
+++
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/MapLayersTest.java
@@ -20,6 +20,8 @@ import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.sis.measure.NumberRange;
+
+// Test dependencies
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
index af0e38aa90..3c037bf17e 100644
---
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
+++
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
@@ -63,6 +63,8 @@ import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.storage.event.StoreEvent;
import org.apache.sis.storage.event.StoreListener;
import org.apache.sis.util.iso.Names;
+
+// Test dependencies
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
