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 9b511f4d6a5fcfaa6f5c15bbff892496a6e61aa3
Merge: b8b49e9bc2 03ea47e94c
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Mar 12 20:14:39 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../main/org/apache/sis/xml/bind/cat/CodeListAdapter.java | 2 ++
.../main/org/apache/sis/referencing/GeodeticCalculator.java | 2 +-
.../main/org/apache/sis/referencing/internal/VerticalDatumTypes.java | 4 +---
.../referencing/operation/transform/DefaultMathTransformFactory.java | 2 +-
.../main/org/apache/sis/storage/netcdf/base/RasterResource.java | 2 +-
.../main/org/apache/sis/util/collection/DefaultTreeTable.java | 2 +-
.../main/org/apache/sis/map/service/Scene2D.java | 1 +
7 files changed, 8 insertions(+), 7 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
index 4de8e1f5e3,9adc3ef22a..ffd8e31acf
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
@@@ -21,8 -21,7 +21,10 @@@ import org.opengis.util.CodeList
import org.apache.sis.util.privy.CodeLists;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
+
++// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.util.iso.Types;
+
/**
* An adapter for {@link CodeList}, in order to implement the ISO 19115-3
standard.
