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 9686f9d864 Merge branch 'geoapi-3.1' add 53ac462e63 Automatic reordering and branch-separation of import statements. This is done by the `org.apache.sis.buildtools.coding.ReorganizeImports` tool in buildSrc for putting Java imports first, then Jakarta, then OpenGIS, and finally Apache SIS. The most important thing is that `ReorganizeImports` creates separated sections for imports that are not the same between the "geoapi-4.0", "geoapi-3.1" and "main" branches. add e0f5cfa3ec Merge branch 'geoapi-4.0' into geoapi-3.1 new 8783e66c1f Merge branch 'geoapi-3.1' 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: .../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +- .../sis/metadata/PropertyConsistencyCheck.java | 2 +- .../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +- .../org/apache/sis/storage/geotiff/Writer.java | 4 ++-- .../sis/storage/geotiff/writer/GeoEncoder.java | 9 +++++---- .../storage/geotiff/writer/ReformattedImage.java | 3 ++- .../org/apache/sis/storage/geotiff/WriterTest.java | 7 ++++--- .../apache/sis/storage/base/MetadataFetcher.java | 3 ++- .../sis/io/stream/HyperRectangleWriterTest.java | 6 ++++-- .../apache/sis/io/stream/UpdatableWriteTest.java | 6 ++++-- .../storage/coveragejson/CoverageJsonStore.java | 22 +++++++++++----------- .../coveragejson/CoverageJsonStoreProvider.java | 8 ++++---- .../sis/storage/coveragejson/CoverageResource.java | 21 +++++++++++---------- .../sis/storage/coveragejson/binding/Axe.java | 4 ++-- .../sis/storage/coveragejson/binding/Axes.java | 2 +- .../sis/storage/coveragejson/binding/Category.java | 2 +- .../coveragejson/binding/CategoryEncoding.java | 4 ++-- .../sis/storage/coveragejson/binding/Coverage.java | 6 +++--- .../coveragejson/binding/CoverageCollection.java | 4 ++-- .../storage/coveragejson/binding/Dictionary.java | 4 ++-- .../sis/storage/coveragejson/binding/Domain.java | 4 ++-- .../coveragejson/binding/GeographicCRS.java | 2 +- .../sis/storage/coveragejson/binding/I18N.java | 8 ++++---- .../storage/coveragejson/binding/IdentifierRS.java | 2 +- .../sis/storage/coveragejson/binding/NdArray.java | 4 ++-- .../coveragejson/binding/ObservedProperty.java | 4 ++-- .../storage/coveragejson/binding/Parameter.java | 2 +- .../coveragejson/binding/ParameterGroup.java | 4 ++-- .../storage/coveragejson/binding/Parameters.java | 4 ++-- .../storage/coveragejson/binding/ProjectedCRS.java | 2 +- .../sis/storage/coveragejson/binding/Ranges.java | 4 ++-- .../binding/ReferenceSystemConnection.java | 4 ++-- .../sis/storage/coveragejson/binding/Symbol.java | 2 +- .../coveragejson/binding/TargetConcept.java | 2 +- .../storage/coveragejson/binding/TemporalRS.java | 2 +- .../sis/storage/coveragejson/binding/TileSet.java | 6 +++--- .../storage/coveragejson/binding/TiledNdArray.java | 4 ++-- .../sis/storage/coveragejson/binding/Unit.java | 2 +- .../storage/coveragejson/binding/VerticalCRS.java | 2 +- .../coveragejson/CoverageJsonStoreTest.java | 13 ++++++++----- .../storage/coveragejson/binding/BindingTest.java | 13 ++++++++----- 41 files changed, 113 insertions(+), 98 deletions(-)