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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 706dc2a6a6 Post-merge automatic reorganization of imports order.
706dc2a6a6 is described below
commit 706dc2a6a6610d2a88de833a0581e48fc9f3881e
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Wed Oct 1 12:01:58 2025 +0200
Post-merge automatic reorganization of imports order.
---
.../main/org/apache/sis/parameter/MatrixParameters.java | 2 +-
.../sis/referencing/factory/AuthorityFactoryIdentifier.java | 6 ++++--
.../test/org/apache/sis/parameter/MatrixParametersTest.java | 4 +---
.../sis/referencing/report/CoordinateReferenceSystems.java | 10 ++++++----
.../apache/sis/resources/embedded/EmbeddedResourcesTest.java | 4 +++-
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
index d7ad15b234..9f685d0751 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
@@ -42,10 +42,10 @@ import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.internal.shared.Constants;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.util.collection.CheckedContainer;
-import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
index c47ac734d7..8a8f2ce147 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
@@ -23,13 +23,13 @@ import java.util.logging.LogRecord;
import javax.measure.Unit;
import org.opengis.metadata.citation.Citation;
import org.opengis.referencing.AuthorityFactory;
+import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.cs.CSAuthorityFactory;
import org.opengis.referencing.crs.CRSAuthorityFactory;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.datum.Datum;
-import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.referencing.datum.Ellipsoid;
import org.opengis.referencing.datum.PrimeMeridian;
import org.opengis.referencing.datum.DatumAuthorityFactory;
@@ -42,7 +42,9 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.metadata.internal.shared.NameMeaning;
import org.apache.sis.referencing.internal.Resources;
-import org.opengis.referencing.IdentifiedObject;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.datum.DatumEnsemble;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/MatrixParametersTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/MatrixParametersTest.java
index b6d5897f64..666317063c 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/MatrixParametersTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/MatrixParametersTest.java
@@ -28,15 +28,13 @@ import static
org.apache.sis.util.internal.shared.Constants.NUM_COL;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import static org.opengis.test.Validators.validate;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals;
import static org.apache.sis.referencing.Assertions.assertAliasTipEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Validators.validate;
-
/**
* Tests the {@link MatrixParameters} class.
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 da051cb7de..3e36878800 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
@@ -22,7 +22,6 @@ import java.util.Locale;
import java.util.Set;
import java.util.Map;
import java.util.TreeMap;
-import java.util.Optional;
import java.util.Collections;
import java.io.IOException;
import org.opengis.metadata.Identifier;
@@ -34,7 +33,6 @@ import org.opengis.referencing.cs.CartesianCS;
import org.opengis.referencing.cs.SphericalCS;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.crs.CompoundCRS;
-import org.opengis.referencing.crs.VerticalCRS;
import org.opengis.referencing.crs.GeodeticCRS;
import org.opengis.referencing.crs.GeographicCRS;
import org.opengis.referencing.crs.EngineeringCRS;
@@ -42,8 +40,6 @@ import org.opengis.referencing.crs.DerivedCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.crs.CRSAuthorityFactory;
import org.opengis.referencing.datum.Datum;
-import org.opengis.referencing.datum.VerticalDatum;
-import org.opengis.referencing.datum.RealizationMethod;
import org.opengis.referencing.operation.OperationMethod;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.CRS;
@@ -63,6 +59,12 @@ import org.apache.sis.referencing.factory.sql.EPSGFactory;
import org.apache.sis.util.internal.shared.URLs;
import org.apache.sis.util.logging.Logging;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.Optional;
+import org.opengis.referencing.crs.VerticalCRS;
+import org.opengis.referencing.datum.VerticalDatum;
+import org.opengis.referencing.datum.RealizationMethod;
+
/**
* Generates a list of supported Coordinate Reference Systems in the current
directory.
diff --git
a/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
b/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
index 3c648a004f..4106cbfaad 100644
---
a/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
+++
b/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
-import java.util.Map;
import javax.sql.DataSource;
+import java.util.Map;
import java.util.ServiceLoader;
import org.opengis.util.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -36,6 +36,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.apache.sis.test.TestUtilities;
