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 2026/07/12 18:14:32 UTC
(sis) 02/02: Merge branch 'geoapi-3.1'
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 30c90dd3c60da5f8e0d7f28efa4c98f07186dff2
Merge: a559ab6251 9c02e400ee
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sun Jul 12 20:12:50 2026 +0200
Merge branch 'geoapi-3.1'
endorsed/build.gradle.kts | 12 ++++++++++++
endorsed/src/org.apache.sis.feature/main/module-info.java | 2 +-
.../src/org.apache.sis.referencing/main/module-info.java | 2 +-
.../services/org.apache.sis.storage.DataStoreProvider | 0
.../src/org.apache.sis.storage.geoheif/main/module-info.java | 0
.../main/org/apache/sis/storage/geoheif/FromImageIO.java | 0
.../main/org/apache/sis/storage/geoheif/GeoHeifStore.java | 0
.../org/apache/sis/storage/geoheif/GeoHeifStoreProvider.java | 0
.../main/org/apache/sis/storage/geoheif/Group.java | 0
.../main/org/apache/sis/storage/geoheif/Image.java | 0
.../main/org/apache/sis/storage/geoheif/ImageModel.java | 0
.../main/org/apache/sis/storage/geoheif/ImageResource.java | 0
.../org/apache/sis/storage/geoheif/ImageResourceBuilder.java | 0
.../apache/sis/storage/geoheif/PyramidedImageResource.java | 0
.../main/org/apache/sis/storage/geoheif/ResourceBuilder.java | 0
.../main/org/apache/sis/storage/geoheif/TiledImage.java | 0
.../org/apache/sis/storage/geoheif/UncompressedImage.java | 0
.../org/apache/sis/storage/geoheif/internal/Resources.java | 0
.../apache/sis/storage/geoheif/internal/Resources.properties | 0
.../apache/sis/storage/geoheif/internal/Resources_en.java | 0
.../apache/sis/storage/geoheif/internal/Resources_fr.java | 0
.../sis/storage/geoheif/internal/Resources_fr.properties | 0
.../apache/sis/storage/geoheif/internal/package-info.java | 0
.../main/org/apache/sis/storage/geoheif/package-info.java | 0
.../main/org/apache/sis/storage/isobmff/Box.java | 0
.../main/org/apache/sis/storage/isobmff/BoxRegistry.java | 0
.../main/org/apache/sis/storage/isobmff/ByteRanges.java | 0
.../main/org/apache/sis/storage/isobmff/ContainerBox.java | 0
.../main/org/apache/sis/storage/isobmff/Extension.java | 0
.../main/org/apache/sis/storage/isobmff/FullBox.java | 0
.../main/org/apache/sis/storage/isobmff/Incomplete.java | 0
.../main/org/apache/sis/storage/isobmff/MainBoxRegistry.java | 0
.../main/org/apache/sis/storage/isobmff/NodeSummary.java | 0
.../main/org/apache/sis/storage/isobmff/Reader.java | 0
.../main/org/apache/sis/storage/isobmff/Root.java | 0
.../main/org/apache/sis/storage/isobmff/TreeNode.java | 0
.../sis/storage/isobmff/UnsupportedVersionException.java | 0
.../main/org/apache/sis/storage/isobmff/VectorReader.java | 0
.../apache/sis/storage/isobmff/base/ColourInformation.java | 0
.../org/apache/sis/storage/isobmff/base/CombinaisonType.java | 0
.../main/org/apache/sis/storage/isobmff/base/Copyright.java | 0
.../org/apache/sis/storage/isobmff/base/EntityToGroup.java | 0
.../org/apache/sis/storage/isobmff/base/ExtendedType.java | 0
.../apache/sis/storage/isobmff/base/FDItemInfoExtension.java | 0
.../main/org/apache/sis/storage/isobmff/base/FileType.java | 0
.../main/org/apache/sis/storage/isobmff/base/FreeSpace.java | 0
.../main/org/apache/sis/storage/isobmff/base/GroupList.java | 0
.../apache/sis/storage/isobmff/base/HandlerReference.java | 0
.../main/org/apache/sis/storage/isobmff/base/HeaderBox.java | 0
.../apache/sis/storage/isobmff/base/IdentifiedMediaData.java | 0
.../main/org/apache/sis/storage/isobmff/base/ItemData.java | 0
.../main/org/apache/sis/storage/isobmff/base/ItemInfo.java | 0
.../org/apache/sis/storage/isobmff/base/ItemInfoEntry.java | 0
.../org/apache/sis/storage/isobmff/base/ItemLocation.java | 0
.../org/apache/sis/storage/isobmff/base/ItemProperties.java | 0
.../sis/storage/isobmff/base/ItemPropertyAssociation.java | 0
.../sis/storage/isobmff/base/ItemPropertyContainer.java | 0
.../org/apache/sis/storage/isobmff/base/ItemReference.java | 0
.../main/org/apache/sis/storage/isobmff/base/MediaData.java | 0
.../main/org/apache/sis/storage/isobmff/base/Meta.java | 0
.../main/org/apache/sis/storage/isobmff/base/Movie.java | 0
.../org/apache/sis/storage/isobmff/base/MovieHeader.java | 0
.../apache/sis/storage/isobmff/base/OriginalFileType.java | 0
.../org/apache/sis/storage/isobmff/base/PrimaryItem.java | 0
.../sis/storage/isobmff/base/ProgressiveDownloadInfo.java | 0
.../sis/storage/isobmff/base/SingleItemTypeReference.java | 0
.../main/org/apache/sis/storage/isobmff/base/Track.java | 0
.../org/apache/sis/storage/isobmff/base/TrackHeader.java | 0
.../main/org/apache/sis/storage/isobmff/base/UserData.java | 0
.../org/apache/sis/storage/isobmff/base/package-info.java | 0
.../main/org/apache/sis/storage/isobmff/geo/ModelCRS.java | 0
.../org/apache/sis/storage/isobmff/geo/ModelTiePoint.java | 0
.../apache/sis/storage/isobmff/geo/ModelTransformation.java | 0
.../org/apache/sis/storage/isobmff/geo/UnknownProperty.java | 0
.../org/apache/sis/storage/isobmff/geo/package-info.java | 0
.../sis/storage/isobmff/image/AuxiliaryImageReference.java | 0
.../apache/sis/storage/isobmff/image/BaseImageReference.java | 0
.../org/apache/sis/storage/isobmff/image/CreationTime.java | 0
.../sis/storage/isobmff/image/DerivedImageReference.java | 0
.../org/apache/sis/storage/isobmff/image/ImagePyramid.java | 0
.../sis/storage/isobmff/image/ImageSpatialExtents.java | 0
.../apache/sis/storage/isobmff/image/ModificationTime.java | 0
.../apache/sis/storage/isobmff/image/PixelInformation.java | 0
.../storage/isobmff/image/PremultipliedImageReference.java | 0
.../apache/sis/storage/isobmff/image/ThumbnailReference.java | 0
.../sis/storage/isobmff/image/TiledImageConfiguration.java | 0
.../apache/sis/storage/isobmff/image/UserDescription.java | 0
.../org/apache/sis/storage/isobmff/image/package-info.java | 0
.../org/apache/sis/storage/isobmff/mpeg/ChromaLocation.java | 0
.../org/apache/sis/storage/isobmff/mpeg/CleanAperture.java | 0
.../main/org/apache/sis/storage/isobmff/mpeg/Component.java | 0
.../apache/sis/storage/isobmff/mpeg/ComponentDefinition.java | 0
.../apache/sis/storage/isobmff/mpeg/ComponentPalette.java | 0
.../sis/storage/isobmff/mpeg/ComponentPatternDefinition.java | 0
.../sis/storage/isobmff/mpeg/ComponentReferenceLevel.java | 0
.../org/apache/sis/storage/isobmff/mpeg/ComponentType.java | 0
.../sis/storage/isobmff/mpeg/CompressedUnitsItemInfo.java | 0
.../org/apache/sis/storage/isobmff/mpeg/CompressionAV1.java | 0
.../sis/storage/isobmff/mpeg/CompressionConfiguration.java | 0
.../org/apache/sis/storage/isobmff/mpeg/CompressionJP2K.java | 0
.../sis/storage/isobmff/mpeg/DepthMappingInformation.java | 0
.../sis/storage/isobmff/mpeg/DisparityInformation.java | 0
.../org/apache/sis/storage/isobmff/mpeg/FieldInterlace.java | 0
.../apache/sis/storage/isobmff/mpeg/FieldInterlaceType.java | 0
.../sis/storage/isobmff/mpeg/FramePackingInformation.java | 0
.../sis/storage/isobmff/mpeg/HevcConfigurationItem.java | 0
.../apache/sis/storage/isobmff/mpeg/InterleavingMode.java | 0
.../storage/isobmff/mpeg/PolarizationPatternDefinition.java | 0
.../apache/sis/storage/isobmff/mpeg/SensorBadPixelsMap.java | 0
.../storage/isobmff/mpeg/SensorNonUniformityCorrection.java | 0
.../org/apache/sis/storage/isobmff/mpeg/TAIClockInfo.java | 0
.../org/apache/sis/storage/isobmff/mpeg/TAITimeStamp.java | 0
.../sis/storage/isobmff/mpeg/UncompressedFrameConfig.java | 0
.../main/org/apache/sis/storage/isobmff/mpeg/UnitType.java | 0
.../org/apache/sis/storage/isobmff/mpeg/package-info.java | 0
.../main/org/apache/sis/storage/isobmff/package-info.java | 0
.../apache/sis/storage/isobmff/video/ContentDescribes.java | 0
.../org/apache/sis/storage/isobmff/video/package-info.java | 0
.../test/org/apache/sis/storage/isobmff/BoxTest.java | 0
.../org/apache/sis/storage/isobmff/geo/ExtensionTest.java | 0
.../apache/sis/storage/isobmff/mpeg/ComponentTypeTest.java | 0
endorsed/src/org.apache.sis.storage/main/module-info.java | 10 +++++-----
endorsed/src/org.apache.sis.util/main/module-info.java | 6 +++---
incubator/build.gradle.kts | 12 ------------
124 files changed, 22 insertions(+), 22 deletions(-)
diff --cc endorsed/src/org.apache.sis.util/main/module-info.java
index f7c08baa33,ebb151aa51..81a5f656b2
--- a/endorsed/src/org.apache.sis.util/main/module-info.java
+++ b/endorsed/src/org.apache.sis.util/main/module-info.java
@@@ -130,9 -131,10 +130,9 @@@ module org.apache.sis.util
org.apache.sis.storage.xml,
org.apache.sis.storage.sql,
org.apache.sis.storage.netcdf,
- org.apache.sis.storage.geoheif, // In the "incubator" sub-project.
+ org.apache.sis.storage.geoheif,
org.apache.sis.storage.geotiff,
org.apache.sis.storage.earthobservation,
- org.apache.sis.cql, // In the "incubator" sub-project.
org.apache.sis.portrayal,
org.apache.sis.storage.gdal, // In the "optional" sub-project.
org.apache.sis.cloud.aws,