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 4150341710a0fa1441be228f47b2ced24c4dfa1a Merge: 6eba4a5b2d 6cbd4e47c3 Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Mar 7 11:08:48 2024 +0100 Merge branch 'geoapi-3.1' .../sis/buildtools/coding/ReorganizeImports.java | 15 +- .../apache/sis/buildtools/gradle/Dependency.java | 1 + .../sis/buildtools/gradle/ModularCompilation.java | 13 -- .../resources/IndexedResourceCompiler.java | 14 +- .../apache/sis/console/MetadataCommandTest.java | 10 +- .../org.apache.sis.metadata/main/module-info.java | 9 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 8 +- .../apache/sis/referencing/cs/AxesConvention.java | 32 +-- .../operation/provider/AbstractProvider.java | 5 +- .../sis/referencing/EPSGFactoryFallbackTest.java | 14 +- .../sis/referencing/report/HTMLGenerator.java | 5 +- .../main/org/apache/sis/storage/landsat/Band.java | 37 +-- .../apache/sis/storage/landsat/LandsatStore.java | 2 + .../org/apache/sis/storage/geotiff/DataCube.java | 2 + .../apache/sis/storage/geotiff/GeoTiffStore.java | 4 +- .../sis/storage/geotiff/ImageFileDirectory.java | 101 ++++++--- .../sis/storage/geotiff/spi/SchemaModifier.java | 250 ++++++++++++++++++--- .../apache/sis/storage/netcdf/NetcdfStoreTest.java | 9 +- .../org/apache/sis/storage/AbstractResource.java | 5 + .../org/apache/sis/storage/wkt/StoreFormat.java | 2 +- .../org/apache/sis/storage/folder/StoreTest.java | 9 +- .../src/org.apache.sis.util/main/module-info.java | 8 +- incubator/build.gradle.kts | 12 + 23 files changed, 408 insertions(+), 159 deletions(-) diff --cc buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java index c4b4ef9f4a,5abc18adbc..1ac9152a01 --- a/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java +++ b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java @@@ -70,6 -70,8 +70,7 @@@ public final class Dependency Map.entry("gui", "application:sis-javafx"), // Optional. Map.entry("cql", "core:sis-cql"), // Incubator. Map.entry("storage.shapefile", "core:sis-shapefile"), + Map.entry("storage.coveragejson", "core:sis-coveragejson"), - Map.entry("portrayal.map", "core:sis-portrayal-map"), Map.entry("webapp", "application:sis-webapp") ); diff --cc endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java index 6e7c064136,65c9b4725f..cfd7d2dcb2 --- a/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java +++ b/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java @@@ -21,10 -22,10 +22,10 @@@ import org.apache.sis.system.Loggers // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; - import org.apache.sis.test.TestCase; + import org.apache.sis.test.TestCaseWithLogs; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.test.dataset.TestData; +// Specific to the main branch: +import org.junit.jupiter.api.Disabled; /** diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java index b5a01707d1,69646b3a26..00789215e4 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java @@@ -110,6 -113,7 +110,7 @@@ public class DefaultRecordType extends * * @param other the {@code RecordType} to copy. */ - @SuppressWarnings({"deprecation", "this-escape"}) ++ @SuppressWarnings("this-escape") public DefaultRecordType(final RecordType other) { typeName = other.getTypeName(); container = other.getContainer(); diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java index 19e5adc7b1,540ec9a3a9..3aa4af465d --- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java @@@ -24,10 -25,10 +25,10 @@@ import org.apache.sis.util.Version // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; - import org.apache.sis.test.TestCase; + import org.apache.sis.test.TestCaseWithLogs; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.test.dataset.TestData; +// Specific to the main branch: +import org.apache.sis.storage.netcdf.base.TestData; /** @@@ -64,7 -66,9 +66,9 @@@ public final class NetcdfStoreTest exte metadata = store.getMetadata(); assertSame(metadata, store.getMetadata(), "Should be cached."); } - MetadataReaderTest.compareToExpected(metadata).assertMetadataEquals(); + MetadataReaderTest.compareToExpected(metadata); + loggings.skipNextLogIfContains("EPSG:4019"); // Deprecated EPSG code. + loggings.assertNoUnexpectedLog(); } /** diff --cc endorsed/src/org.apache.sis.util/main/module-info.java index 79753446b3,ad3763c3e1..8f6d510ece --- a/endorsed/src/org.apache.sis.util/main/module-info.java +++ b/endorsed/src/org.apache.sis.util/main/module-info.java @@@ -119,7 -119,8 +119,6 @@@ module org.apache.sis.util org.apache.sis.storage.netcdf, org.apache.sis.storage.geotiff, org.apache.sis.storage.earthobservation, - org.apache.sis.storage.shapefile, // In the "incubator" sub-project. - org.apache.sis.cql, // In the "incubator" sub-project. - org.apache.sis.portrayal.map, // In the "incubator" sub-project. org.apache.sis.portrayal, org.apache.sis.cloud.aws, org.apache.sis.console, diff --cc incubator/build.gradle.kts index b247525a60,c10f193705..16547b75df --- a/incubator/build.gradle.kts +++ b/incubator/build.gradle.kts @@@ -125,8 -173,32 +125,20 @@@ publishing pom { name = "Apache SIS Shapefile storage" description = "Read and write files in the Shapefile format." + } + } + create<MavenPublication>("storage.coveragejson") { + var module = "org.apache.sis.storage.coveragejson" + groupId = "org.apache.sis.storage" + artifactId = "sis-coveragejson" + artifact(layout.buildDirectory.file("libs/${module}.jar")) + artifact(layout.buildDirectory.file("docs/${module}-sources.jar")) {classifier = "sources"} + artifact(layout.buildDirectory.file("docs/${module}-javadoc.jar")) {classifier = "javadoc"} + pom { + name = "Apache SIS JSON Coverage storage" + description = "Read and write files in the JSON Coverage format." } } - create<MavenPublication>("portrayal.map") { - var module = "org.apache.sis.portrayal.map" - groupId = "org.apache.sis.core" - artifactId = "sis-portrayal-map" - artifact(layout.buildDirectory.file("libs/${module}.jar")) - artifact(layout.buildDirectory.file("docs/${module}-sources.jar")) {classifier = "sources"} - artifact(layout.buildDirectory.file("docs/${module}-javadoc.jar")) {classifier = "javadoc"} - pom { - name = "Apache SIS portrayal" - description = "Symbology and map representations, together with a rendering engine for display." - } - } create<MavenPublication>("webapp") { var module = "org.apache.sis.webapp" groupId = "org.apache.sis.application"
