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 15c3081113935b77ccd696ad8056776a08c40874
Merge: b87b99f314 05dc18652a
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Feb 21 16:18:29 2024 +0100
Merge branch 'geoapi-3.1'.
Contains a fix needed by the CI.
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 13 ++--
.../test/org/apache/sis/image/ImageTestCase.java | 9 +--
.../org/apache/sis/metadata/sql/TestDatabase.java | 6 ++
.../apache/sis/referencing/IdentifiedObjects.java | 7 +-
.../operation/CoordinateOperationRegistry.java | 32 ++++----
.../sis/referencing/GeodeticCalculatorTest.java | 4 +-
.../referencing/factory/sql/EPSGInstallerTest.java | 4 +
.../sis/test/integration/ConsistencyTest.java | 2 +-
.../org/apache/sis/test/widget/VisualCheck.java | 8 --
.../sis/storage/geotiff/writer/GeoEncoder.java | 17 +++-
.../apache/sis/io/stream/FileCacheByteChannel.java | 18 +++--
.../org/apache/sis/measure/UnitNames.properties | 2 +
.../apache/sis/measure/UnitNames_en_US.properties | 1 +
.../org/apache/sis/measure/UnitNames_fr.properties | 1 +
.../main/org/apache/sis/measure/Units.java | 53 ++++++++++++-
.../org/apache/sis/measure/UnitFormatTest.java | 2 +
.../test/org/apache/sis/measure/UnitsTest.java | 7 +-
.../test/org/apache/sis/test/TestCase.java | 91 ++++++++++++++++------
.../org/apache/sis/test/TestConfiguration.java | 29 +++++++
.../test/org/apache/sis/test/package-info.java | 25 ++++--
20 files changed, 246 insertions(+), 85 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
index 670cc419c2,3ab9c02293..1c87ebe57b
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
@@@ -50,10 -50,11 +50,11 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
+ import org.apache.sis.referencing.factory.UnavailableFactoryException;
import org.apache.sis.referencing.factory.NoSuchAuthorityFactoryException;
-// 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.ReferenceIdentifier;
/**
