You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2025/02/26 18:15:52 UTC
(sis) branch main updated (81e91adb6b -> 09335964ca)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
from 81e91adb6b Merge branch 'geoapi-3.1': refactoring of GeoHEIF reader.
add 58c30aad3d Post-merge automatic reorganization of imports order.
add 61ff831a8e Merge branch 'geoapi-4.0' into geoapi-3.1: reorganization of imports.
new 09335964ca Merge branch 'geoapi-3.1': automatic reorganization of imports.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/org/apache/sis/metadata/PropertyAccessorTest.java | 1 -
.../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, 24 insertions(+), 21 deletions(-)
(sis) 01/01: Merge branch 'geoapi-3.1': automatic reorganization of imports.
Posted by de...@apache.org.
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 09335964caae807e7014fcd85f3c65a9a48578a1
Merge: 81e91adb6b 61ff831a8e
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Feb 26 19:13:34 2025 +0100
Merge branch 'geoapi-3.1': automatic reorganization of imports.
.../test/org/apache/sis/metadata/PropertyAccessorTest.java | 1 -
.../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, 24 insertions(+), 21 deletions(-)
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index 627dc3ae81,5ce9295394..a413ae7c33
--- 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
@@@ -68,11 -68,11 +68,10 @@@ 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;
+// Specific to the main branch:
- import org.opengis.referencing.ReferenceSystem;
+import org.apache.sis.metadata.iso.content.DefaultAttributeGroup;
+import org.apache.sis.metadata.iso.identification.AbstractIdentification;
+import org.apache.sis.metadata.iso.identification.DefaultAssociatedResource;
/**