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 c6bd7e182aa69a301cb8e3286ed415426584ab2b
Merge: 90b42ea528 65ad59bebe
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Oct 1 11:55:53 2025 +0200
Merge branch 'geoapi-3.1'
.../org/apache/sis/console/IdentifierCommand.java | 7 +-
.../sql/internal/shared/LocalDataSource.java | 2 +-
.../sis/referencing/crs/AbstractDerivedCRS.java | 13 ++-
.../factory/AuthorityFactoryIdentifier.java | 39 +++++++--
.../factory/IdentifiedObjectFinder.java | 2 +-
.../factory/MultiAuthoritiesFactory.java | 2 +-
.../referencing/factory/sql/EPSGCodeFinder.java | 6 +-
.../referencing/factory/sql/EPSGDataAccess.java | 16 +++-
.../report/CoordinateReferenceSystems.java | 13 +--
.../apache/sis/setup/OptionalInstallations.java | 18 ++--
.../main/org/apache/sis/gui/setup/FXFinder.java | 6 +-
.../main/org/apache/sis/gui/setup/Wizard.java | 99 +++++++++++++++-------
.../main/org/apache/sis/gui/setup/WizardPage.java | 4 +-
.../sis/resources/embedded/EmbeddedResources.java | 6 +-
.../resources/embedded/EmbeddedResourcesTest.java | 2 +-
.../apache/sis/resources/embedded/Generator.java | 6 +-
.../factory/sql/epsg/DataScriptUpdater.java | 3 +
parent/sis.css | 6 --
18 files changed, 165 insertions(+), 85 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
index b94b41faa1,c47ac734d7..996ba80c65
---
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
@@@ -20,11 -20,21 +20,20 @@@ import java.util.Locale
import java.util.Objects;
import java.util.logging.Level;
import java.util.logging.LogRecord;
+ import javax.measure.Unit;
import org.opengis.metadata.citation.Citation;
import org.opengis.referencing.AuthorityFactory;
+ 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;
+ import org.opengis.referencing.operation.OperationMethod;
+ import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.CoordinateOperationAuthorityFactory;
import org.apache.sis.util.Classes;
import org.apache.sis.util.resources.Vocabulary;
@@@ -32,7 -42,8 +41,11 @@@ import org.apache.sis.util.logging.Logg
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 main branch:
++import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
+
/**
* Identification of an authority factory by its type, namespace and version.
@@@ -66,7 -77,7 +79,7 @@@ final class AuthorityFactoryIdentifier
/**
* Factory needed is {@link DatumAuthorityFactory}.
*/
- DATUM(DatumAuthorityFactory.class),
- DATUM(DatumAuthorityFactory.class, Datum.class, DatumEnsemble.class,
Ellipsoid.class, PrimeMeridian.class),
++ DATUM(DatumAuthorityFactory.class, Datum.class,
DefaultDatumEnsemble.class, Ellipsoid.class, PrimeMeridian.class),
/**
* Factory needed is {@link CoordinateOperationAuthorityFactory}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
index ac66eebcdf,9d805c8cd3..d2121f6475
---
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
@@@ -58,12 -61,8 +57,11 @@@ import org.apache.sis.referencing.facto
import org.apache.sis.referencing.factory.MultiAuthoritiesFactory;
import org.apache.sis.referencing.factory.sql.EPSGFactory;
import org.apache.sis.util.internal.shared.URLs;
- import org.apache.sis.util.iso.DefaultNameSpace;
import org.apache.sis.util.logging.Logging;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Generates a list of supported Coordinate Reference Systems in the current
directory.
