This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 80c161ba8d2ea297456f8f72e4797088832bbc2a Merge: 3ed0c5f895 0a8a45bc10 Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Aug 19 18:40:33 2026 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../buildtools/coding/VerifyVersionInJavadoc.java | 6 +- .../apache/sis/buildtools/gradle/Dependency.java | 16 +-- .../sis/buildtools/gradle/ModularPublishing.java | 6 +- .../apache/sis/buildtools/gradle/ModularTest.java | 2 +- .../org/apache/sis/buildtools/gradle/UnoPkg.java | 2 +- .../org/apache/sis/buildtools/maven/Generator.java | 6 +- endorsed/build.gradle.kts | 5 +- .../main/org/apache/sis/console/Command.java | 10 +- .../main/org/apache/sis/image/ComputedTiles.java | 2 +- .../apache/sis/metadata/sql/MetadataSource.java | 7 +- .../apache/sis/metadata/sql/MetadataWriter.java | 2 +- .../sis/metadata/sql/internal/shared/Dialect.java | 8 ++ .../metadata/sql/internal/shared/Initializer.java | 58 +++++------ .../sql/internal/shared/LocalDataSource.java | 16 +-- .../metadata/sql/internal/shared/ScriptRunner.java | 70 ++++++++++--- .../metadata/sql/internal/shared/TypeMapper.java | 4 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 2 + .../org/apache/sis/util/iso/DefaultTypeName.java | 1 + .../sis/metadata/sql/IdentifierGeneratorTest.java | 1 + .../sis/metadata/sql/MetadataFallbackVerifier.java | 1 + .../sis/metadata/sql/MetadataSourceTest.java | 15 ++- .../sis/metadata/sql/MetadataWriterTest.java | 55 ++++++---- .../org/apache/sis/metadata/sql/TestDatabase.java | 26 +++-- .../sql/internal/shared/ScriptRunnerTest.java | 30 ++++-- .../apache/sis/referencing/IdentifiedObjects.java | 7 +- .../factory/IdentifiedObjectFinder.java | 2 +- .../referencing/factory/sql/EPSGCodeFinder.java | 9 +- .../referencing/factory/sql/EPSGDataAccess.java | 2 +- .../sis/referencing/factory/sql/EPSGFactory.java | 11 +- .../sis/referencing/factory/sql/EPSGInstaller.java | 26 +++-- .../sis/referencing/factory/sql/package-info.java | 22 ++-- .../operation/AbstractCoordinateOperation.java | 111 ++++++++++++++------- .../operation/AbstractSingleOperation.java | 7 +- .../referencing/operation/DefiningConversion.java | 69 +++++++++++++ .../operation/transform/MolodenskyTransform.java | 3 +- .../org/apache/sis/referencing/CommonCRSTest.java | 24 ++++- .../sis/referencing/factory/TestFactorySource.java | 3 +- .../referencing/factory/sql/EPSGInstallerTest.java | 2 +- .../transform/DefaultMathTransformFactoryTest.java | 2 +- .../sis/storage/geotiff/writer/GeoEncoder.java | 66 ++++++++---- .../apache/sis/storage/sql/SimpleFeatureStore.java | 1 + .../apache/sis/storage/sql/feature/Analyzer.java | 17 +++- .../org/apache/sis/storage/sql/DataAccessTest.java | 17 +++- .../apache/sis/storage/sql/TestOnAllDatabases.java | 3 +- .../storage/sql/feature/InfoStatementsTest.java | 6 +- .../sql/feature/SelectionClauseWriterTest.java | 71 ++++++++++--- .../org/apache/sis/io/stream/ChannelDataInput.java | 1 + .../sis/storage/esri/AsciiGridStoreTest.java | 12 +-- .../main/org/apache/sis/setup/Configuration.java | 30 +++--- .../main/org/apache/sis/system/Reflect.java | 2 +- .../org/apache/sis/util/collection/CacheTest.java | 16 +-- netbeans-project/ivy.xml | 10 +- optional/build.gradle.kts | 5 +- optional/src/org.apache.sis.gui/bundle/bin/sis | 1 - optional/src/org.apache.sis.gui/bundle/bin/sis.bat | 1 - optional/src/org.apache.sis.gui/bundle/bin/sisfx | 1 - .../src/org.apache.sis.gui/bundle/bin/sisfx.bat | 1 - optional/src/org.apache.sis.gui/bundle/lib/README | 2 +- optional/src/org.apache.sis.gui/bundle/log/README | 3 +- .../apache/sis/gui/coverage/IsolineController.java | 2 +- .../apache/sis/gui/coverage/TileMatrixSetPane.java | 1 - .../org/apache/sis/gui/dataset/FeatureTable.java | 1 - .../apache/sis/gui/dataset/ResourceExplorer.java | 1 - .../main/module-info.java | 6 +- .../sis/resources/embedded/EmbeddedResources.java | 16 +-- .../sis/resources/embedded/package-info.java | 4 +- .../resources/embedded/EmbeddedResourcesTest.java | 2 +- .../apache/sis/resources/embedded/Generator.java | 61 ++--------- .../main/module-info.java | 4 +- .../sis/referencing/factory/sql/epsg/README.md | 4 +- .../org/apache/sis/storage/gdal/GDALStore.java | 2 +- settings.gradle.kts | 5 +- 72 files changed, 662 insertions(+), 364 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java index 838108dad8,d8968ec4d5..e430110534 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java @@@ -72,11 -73,7 +73,10 @@@ import org.apache.sis.metadata.internal import org.apache.sis.util.internal.shared.Constants; import org.apache.sis.system.Semaphores; import org.apache.sis.system.Loggers; - import static org.apache.sis.util.Utilities.deepEquals; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.crs.GeneralDerivedCRS; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.crs.DerivedCRS; import org.opengis.coordinate.CoordinateSet;
