This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 2cfb383a96d59a948b7ec92d7c57c3f0538dca07
Merge: cccbaee7b7 0af37a0472
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Dec 4 15:25:46 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1
.../test/org/apache/sis/geometry/wrapper/jts/WrapperTest.java | 2 +-
.../org/apache/sis/metadata/iso/citation/DefaultCitationTest.java | 2 +-
.../main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java | 4 +++-
.../test/org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +-
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +-
.../org/apache/sis/storage/netcdf/base/VariableTransformer.java | 2 +-
.../main/org/apache/sis/converter/DateConverter.java | 2 +-
.../main/org/apache/sis/storage/gimi/GimiProvider.java | 2 +-
.../main/org/apache/sis/storage/gimi/Group.java | 3 ++-
.../main/org/apache/sis/storage/gimi/ResourceGrid.java | 2 +-
.../main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java | 2 +-
.../main/org/apache/sis/storage/gimi/ResourcePyramid.java | 4 ++--
.../main/org/apache/sis/storage/gimi/ResourceUnknown.java | 2 +-
.../sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java | 2 +-
.../sis/storage/gimi/isobmff/gimi/TiledImageConfigurationBox.java | 1 +
.../sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java | 4 ++--
.../main/org/apache/sis/storage/gdal/FeatureLayer.java | 6 ++++--
17 files changed, 25 insertions(+), 19 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
index 46efb509e4,84417aee45..4115c99596
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
@@@ -23,9 -23,8 +23,11 @@@ import org.opengis.referencing.Identifi
import org.opengis.util.FactoryException;
import org.opengis.util.InternationalString;
++// Specific to the main and geoapi-3.1 branches:
++import org.apache.sis.referencing.GeodeticException;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Optional;
- import org.apache.sis.referencing.GeodeticException;
/**
