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 61ff831a8e67e8d3a9d74ccae7c0fe270f3e53ad
Merge: 470783640d 58c30aad3d
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Feb 26 19:10:10 2025 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1: reorganization of imports.
.../test/org/apache/sis/metadata/PropertyAccessorTest.java | 2 +-
.../main/org/apache/sis/storage/geotiff/CompressedSubset.java | 2 +-
.../main/org/apache/sis/storage/geotiff/ImageFileDirectory.java | 2 +-
.../main/org/apache/sis/storage/geotiff/Writer.java | 2 +-
.../test/org/apache/sis/storage/geotiff/GeoTiffStoreTest.java | 2 +-
.../test/org/apache/sis/storage/geotiff/WriterTest.java | 2 +-
.../main/org/apache/sis/storage/base/TiledGridResource.java | 2 +-
.../main/org/apache/sis/storage/base/URIDataStoreProvider.java | 2 +-
.../main/org/apache/sis/storage/esri/RasterStore.java | 2 +-
.../test/org/apache/sis/io/stream/HyperRectangleWriterTest.java | 2 +-
.../main/org/apache/sis/storage/geoheif/GeoHeifStore.java | 2 +-
.../main/org/apache/sis/storage/isobmff/MainBoxRegistry.java | 2 +-
.../main/org/apache/sis/storage/isobmff/base/GroupList.java | 2 +-
.../main/org/apache/sis/storage/isobmff/base/ItemProperties.java | 2 +-
.../org/apache/sis/storage/isobmff/base/ItemPropertyContainer.java | 2 +-
.../main/org/apache/sis/storage/isobmff/base/Meta.java | 2 +-
.../main/org/apache/sis/storage/isobmff/base/Movie.java | 2 +-
.../main/org/apache/sis/storage/isobmff/base/OriginalFileType.java | 2 +-
.../main/org/apache/sis/storage/isobmff/base/Track.java | 2 +-
.../main/org/apache/sis/storage/isobmff/base/UserData.java | 2 +-
.../main/org/apache/sis/storage/gdal/Band.java | 4 +++-
.../main/org/apache/sis/storage/gdal/TiledCoverage.java | 2 ++
22 files changed, 25 insertions(+), 21 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index 1f38589d85,eb05661e58..5ce9295394
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@@ -64,13 -63,9 +63,14 @@@ import org.apache.sis.metadata.iso.cita
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+// Specific to the main and geoapi-3.1 branches:
+import java.util.Date;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.referencing.ReferenceIdentifier;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.AttributeGroup;
+ import org.opengis.referencing.ReferenceSystemType;
import org.opengis.referencing.ObjectDomain;
import org.opengis.referencing.datum.DatumEnsemble;
