svn commit: r1916166 - in /sis/data/non-free: ./ sis-embedded-data/ sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/ sis-embedded-data/src/test/java/org/apache/sis/resources/embedded
Author: desruisseaux Date: Thu Mar 7 18:14:15 2024 New Revision: 1916166 URL: http://svn.apache.org/viewvc?rev=1916166=rev Log: Set version to 1.5-SNAPSHOT and adapt for change in SIS API. https://issues.apache.org/jira/browse/SIS-596 Modified: sis/data/non-free/pom.xml sis/data/non-free/sis-embedded-data/pom.xml sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java sis/data/non-free/sis-epsg/pom.xml sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java Modified: sis/data/non-free/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/pom.xml?rev=1916166=1916165=1916166=diff == --- sis/data/non-free/pom.xml (original) +++ sis/data/non-free/pom.xml Thu Mar 7 18:14:15 2024 @@ -27,7 +27,7 @@ org.apache.sis parent -1.4 +1.5-SNAPSHOT Modified: sis/data/non-free/sis-embedded-data/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/pom.xml?rev=1916166=1916165=1916166=diff == --- sis/data/non-free/sis-embedded-data/pom.xml (original) +++ sis/data/non-free/sis-embedded-data/pom.xml Thu Mar 7 18:14:15 2024 @@ -27,7 +27,7 @@ org.apache.sis non-free -1.4 +1.5-SNAPSHOT Modified: sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java?rev=1916166=1916165=1916166=diff == --- sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java [UTF-8] Thu Mar 7 18:14:15 2024 @@ -24,8 +24,8 @@ import java.io.InputStreamReader; import java.io.IOException; import javax.sql.DataSource; import org.apache.derby.jdbc.EmbeddedDataSource; -import org.apache.sis.util.internal.MetadataServices; -import org.apache.sis.metadata.sql.util.Initializer; +import org.apache.sis.util.privy.MetadataServices; +import org.apache.sis.metadata.sql.privy.Initializer; import org.apache.sis.setup.InstallationResources; import org.apache.sis.util.resources.Errors; Modified: sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java?rev=1916166=1916165=1916166=diff == --- sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] Thu Mar 7 18:14:15 2024 @@ -37,10 +37,10 @@ import java.sql.SQLException; import org.opengis.util.FactoryException; import org.opengis.referencing.crs.GeographicCRS; import org.apache.derby.jdbc.EmbeddedDataSource; -import org.apache.sis.metadata.sql.util.Initializer; -import org.apache.sis.metadata.sql.util.LocalDataSource; +import org.apache.sis.metadata.sql.privy.Initializer; +import org.apache.sis.metadata.sql.privy.LocalDataSource; import org.apache.sis.system.Shutdown; -import org.apache.sis.util.internal.Constants; +import org.apache.sis.util.privy.Constants; import org.apache.sis.metadata.MetadataStandard; import org.apache.sis.metadata.sql.MetadataSource; import org.apache.sis.metadata.sql.MetadataStoreException; Modified: sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java?rev=1916166=1916165=1916166=diff == --- sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java [UTF-8] Thu Mar 7 18:14:15 2024 @@ -26,7 +26,7 @@ import javax.sql.DataSource; import org.opengis.util.FactoryException; import org.opengis.referencing.crs.CoordinateReferenceSystem; import
(sis) branch main updated (4150341710 -> 2b40ccfdc4)
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 4150341710 Merge branch 'geoapi-3.1' add fa770b4c3a Rename the `org.apache.sis.util.internal` package as `org.apache.sis.util.privy`, and keep the previous "internal" name for classes that are truly internal to the module (i.e. not exported to any other module). add 67ad3e00e0 Apply to `org.apache.sis.metadata` the same convention as `org.apache.sis.util`: the `internal` package is truly internal to the metadata module, and `privy` is shared with other modules of this project. add d15f1f0193 Apply to `org.apache.sis.referencing` the same convention as `org.apache.sis.metadata`: the `internal` package is truly internal to the referencing module, and the `privy` package is shared with other modules of this project (but not in public API). add 069553e76c Apply to `org.apache.sis.feature` the same convention as in previous commits: the `internal` package is truly internal to the referencing module, and the `privy` packages are shared with other modules of this project. add 9048ae55d3 Merge branch 'geoapi-4.0' into geoapi-3.1. https://issues.apache.org/jira/browse/SIS-596 new 2b40ccfdc4 Merge branch 'geoapi-3.1'. https://issues.apache.org/jira/browse/SIS-596 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: endorsed/build.gradle.kts |6 +- .../apache/sis/cloud/aws/s3/ClientFileSystem.java |2 +- .../main/org/apache/sis/console/AboutCommand.java |4 +- .../main/org/apache/sis/console/Command.java |2 +- .../main/org/apache/sis/console/CommandRunner.java |2 +- .../apache/sis/console/FormattedOutputCommand.java |2 +- .../org/apache/sis/console/IdentifierCommand.java |2 +- .../apache/sis/console/ResourcesDownloader.java|2 +- .../org/apache/sis/console/TransformCommand.java |8 +- .../org.apache.sis.feature/main/module-info.java | 13 +- .../org/apache/sis/coverage/CoverageCombiner.java |6 +- .../org/apache/sis/coverage/SampleDimension.java |2 +- .../org/apache/sis/coverage/SampleRangeFormat.java |2 +- .../coverage/grid/BandAggregateGridCoverage.java |4 +- .../coverage/grid/CoordinateOperationFinder.java |6 +- .../apache/sis/coverage/grid/DefaultEvaluator.java |8 +- .../sis/coverage/grid/DimensionAppender.java |2 +- .../apache/sis/coverage/grid/DimensionReducer.java |2 +- .../sis/coverage/grid/DimensionalityReduction.java |2 +- .../coverage/grid/FractionalGridCoordinates.java |2 +- .../org/apache/sis/coverage/grid/GridCoverage.java |4 +- .../apache/sis/coverage/grid/GridCoverage2D.java |4 +- .../sis/coverage/grid/GridCoverageBuilder.java | 10 +- .../sis/coverage/grid/GridCoverageProcessor.java |8 +- .../apache/sis/coverage/grid/GridDerivation.java |2 +- .../org/apache/sis/coverage/grid/GridExtent.java | 10 +- .../apache/sis/coverage/grid/GridExtentCRS.java|2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 18 +- .../apache/sis/coverage/grid/ImageRenderer.java| 12 +- .../sis/coverage/grid/ReducedGridCoverage.java |2 +- .../sis/coverage/grid/ResampledGridCoverage.java |6 +- .../apache/sis/coverage/grid/SliceGeometry.java|8 +- .../sis/coverage/grid/j2d/BatchComputedImage.java | 213 .../sis/coverage/grid/j2d/ColorModelBuilder.java | 701 -- .../sis/coverage/grid/j2d/ColorModelFactory.java | 864 - .../sis/coverage/grid/j2d/ColorModelType.java | 106 -- .../sis/coverage/grid/j2d/ColorsForRange.java | 291 -- .../sis/coverage/grid/j2d/DeferredProperty.java| 124 --- .../apache/sis/coverage/grid/j2d/FillValues.java | 208 .../apache/sis/coverage/grid/j2d/ImageLayout.java | 438 - .../sis/coverage/grid/j2d/ImageUtilities.java | 673 - .../grid/j2d/MultiBandsIndexColorModel.java| 314 -- .../sis/coverage/grid/j2d/ObservableImage.java | 288 -- .../sis/coverage/grid/j2d/RasterFactory.java | 314 -- .../sis/coverage/grid/j2d/SampleModelFactory.java | 291 -- .../sis/coverage/grid/j2d/ScaledColorModel.java| 162 .../sis/coverage/grid/j2d/ScaledColorSpace.java| 223 - .../sis/coverage/grid/j2d/TileErrorHandler.java| 120 --- .../sis/coverage/grid/j2d/TileOpExecutor.java | 1019 .../sis/coverage/grid/j2d/TilePlaceholder.java | 404 .../apache/sis/coverage/grid/j2d/TiledImage.java | 274 -- .../sis/coverage/grid/j2d/WritableTiledImage.java | 217 -
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. https://issues.apache.org/jira/browse/SIS-596
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit 9048ae55d3d4015181edbec6d937e354a88a546e Merge: 6cbd4e47c3 069553e76c Author: Martin Desruisseaux AuthorDate: Thu Mar 7 18:42:19 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. https://issues.apache.org/jira/browse/SIS-596 endorsed/build.gradle.kts |6 +- .../apache/sis/cloud/aws/s3/ClientFileSystem.java |2 +- .../main/org/apache/sis/console/AboutCommand.java |4 +- .../main/org/apache/sis/console/Command.java |2 +- .../main/org/apache/sis/console/CommandRunner.java |2 +- .../apache/sis/console/FormattedOutputCommand.java |2 +- .../org/apache/sis/console/IdentifierCommand.java |2 +- .../apache/sis/console/ResourcesDownloader.java|2 +- .../org/apache/sis/console/TransformCommand.java |8 +- .../org.apache.sis.feature/main/module-info.java | 13 +- .../org/apache/sis/coverage/CoverageCombiner.java |6 +- .../org/apache/sis/coverage/SampleDimension.java |2 +- .../org/apache/sis/coverage/SampleRangeFormat.java |2 +- .../coverage/grid/BandAggregateGridCoverage.java |4 +- .../coverage/grid/CoordinateOperationFinder.java |6 +- .../apache/sis/coverage/grid/DefaultEvaluator.java |8 +- .../sis/coverage/grid/DimensionAppender.java |2 +- .../apache/sis/coverage/grid/DimensionReducer.java |2 +- .../sis/coverage/grid/DimensionalityReduction.java |2 +- .../coverage/grid/FractionalGridCoordinates.java |2 +- .../org/apache/sis/coverage/grid/GridCoverage.java |4 +- .../apache/sis/coverage/grid/GridCoverage2D.java |4 +- .../sis/coverage/grid/GridCoverageBuilder.java | 10 +- .../sis/coverage/grid/GridCoverageProcessor.java |8 +- .../apache/sis/coverage/grid/GridDerivation.java |2 +- .../org/apache/sis/coverage/grid/GridExtent.java | 10 +- .../apache/sis/coverage/grid/GridExtentCRS.java|2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 18 +- .../apache/sis/coverage/grid/ImageRenderer.java| 12 +- .../sis/coverage/grid/ReducedGridCoverage.java |2 +- .../sis/coverage/grid/ResampledGridCoverage.java |6 +- .../apache/sis/coverage/grid/SliceGeometry.java|8 +- .../sis/coverage/grid/j2d/BatchComputedImage.java | 213 .../sis/coverage/grid/j2d/ColorModelBuilder.java | 701 -- .../sis/coverage/grid/j2d/ColorModelFactory.java | 864 - .../sis/coverage/grid/j2d/ColorModelType.java | 106 -- .../sis/coverage/grid/j2d/ColorsForRange.java | 291 -- .../sis/coverage/grid/j2d/DeferredProperty.java| 124 --- .../apache/sis/coverage/grid/j2d/FillValues.java | 208 .../apache/sis/coverage/grid/j2d/ImageLayout.java | 438 - .../sis/coverage/grid/j2d/ImageUtilities.java | 673 - .../grid/j2d/MultiBandsIndexColorModel.java| 314 -- .../sis/coverage/grid/j2d/ObservableImage.java | 288 -- .../sis/coverage/grid/j2d/RasterFactory.java | 314 -- .../sis/coverage/grid/j2d/SampleModelFactory.java | 291 -- .../sis/coverage/grid/j2d/ScaledColorModel.java| 162 .../sis/coverage/grid/j2d/ScaledColorSpace.java| 223 - .../sis/coverage/grid/j2d/TileErrorHandler.java| 120 --- .../sis/coverage/grid/j2d/TileOpExecutor.java | 1019 .../sis/coverage/grid/j2d/TilePlaceholder.java | 404 .../apache/sis/coverage/grid/j2d/TiledImage.java | 274 -- .../sis/coverage/grid/j2d/WritableTiledImage.java | 217 - .../apache/sis/coverage/grid/j2d/package-info.java | 31 - .../sis/coverage/internal/CommonDomainFinder.java | 374 --- .../sis/coverage/internal/MultiSourceArgument.java | 619 .../sis/coverage/internal/RangeArgument.java | 395 .../sis/coverage/internal/SampleDimensions.java| 179 .../apache/sis/coverage/internal/package-info.java |2 +- .../sis/coverage/privy/BatchComputedImage.java | 213 .../sis/coverage/privy/ColorModelBuilder.java | 701 ++ .../sis/coverage/privy/ColorModelFactory.java | 864 + .../apache/sis/coverage/privy/ColorModelType.java | 106 ++ .../apache/sis/coverage/privy/ColorsForRange.java | 291 ++ .../sis/coverage/privy/CommonDomainFinder.java | 374 +++ .../sis/coverage/privy/DeferredProperty.java | 124 +++ .../org/apache/sis/coverage/privy/FillValues.java | 208 .../org/apache/sis/coverage/privy/ImageLayout.java | 438 + .../apache/sis/coverage/privy/ImageUtilities.java | 673 + .../coverage/privy/MultiBandsIndexColorModel.java | 314 ++ .../sis/coverage/privy/MultiSourceArgument.java| 619
(sis) branch geoapi-3.1 updated (6cbd4e47c3 -> 9048ae55d3)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 6cbd4e47c3 Merge branch 'geoapi-4.0' into geoapi-3.1 add fa770b4c3a Rename the `org.apache.sis.util.internal` package as `org.apache.sis.util.privy`, and keep the previous "internal" name for classes that are truly internal to the module (i.e. not exported to any other module). add 67ad3e00e0 Apply to `org.apache.sis.metadata` the same convention as `org.apache.sis.util`: the `internal` package is truly internal to the metadata module, and `privy` is shared with other modules of this project. add d15f1f0193 Apply to `org.apache.sis.referencing` the same convention as `org.apache.sis.metadata`: the `internal` package is truly internal to the referencing module, and the `privy` package is shared with other modules of this project (but not in public API). add 069553e76c Apply to `org.apache.sis.feature` the same convention as in previous commits: the `internal` package is truly internal to the referencing module, and the `privy` packages are shared with other modules of this project. new 9048ae55d3 Merge branch 'geoapi-4.0' into geoapi-3.1. https://issues.apache.org/jira/browse/SIS-596 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: endorsed/build.gradle.kts |6 +- .../apache/sis/cloud/aws/s3/ClientFileSystem.java |2 +- .../main/org/apache/sis/console/AboutCommand.java |4 +- .../main/org/apache/sis/console/Command.java |2 +- .../main/org/apache/sis/console/CommandRunner.java |2 +- .../apache/sis/console/FormattedOutputCommand.java |2 +- .../org/apache/sis/console/IdentifierCommand.java |2 +- .../apache/sis/console/ResourcesDownloader.java|2 +- .../org/apache/sis/console/TransformCommand.java |8 +- .../org.apache.sis.feature/main/module-info.java | 13 +- .../org/apache/sis/coverage/CoverageCombiner.java |6 +- .../org/apache/sis/coverage/SampleDimension.java |2 +- .../org/apache/sis/coverage/SampleRangeFormat.java |2 +- .../coverage/grid/BandAggregateGridCoverage.java |4 +- .../coverage/grid/CoordinateOperationFinder.java |6 +- .../apache/sis/coverage/grid/DefaultEvaluator.java |8 +- .../sis/coverage/grid/DimensionAppender.java |2 +- .../apache/sis/coverage/grid/DimensionReducer.java |2 +- .../sis/coverage/grid/DimensionalityReduction.java |2 +- .../coverage/grid/FractionalGridCoordinates.java |2 +- .../org/apache/sis/coverage/grid/GridCoverage.java |4 +- .../apache/sis/coverage/grid/GridCoverage2D.java |4 +- .../sis/coverage/grid/GridCoverageBuilder.java | 10 +- .../sis/coverage/grid/GridCoverageProcessor.java |8 +- .../apache/sis/coverage/grid/GridDerivation.java |2 +- .../org/apache/sis/coverage/grid/GridExtent.java | 10 +- .../apache/sis/coverage/grid/GridExtentCRS.java|2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 18 +- .../apache/sis/coverage/grid/ImageRenderer.java| 12 +- .../sis/coverage/grid/ReducedGridCoverage.java |2 +- .../sis/coverage/grid/ResampledGridCoverage.java |6 +- .../apache/sis/coverage/grid/SliceGeometry.java|8 +- .../sis/coverage/grid/j2d/BatchComputedImage.java | 213 .../sis/coverage/grid/j2d/ColorModelBuilder.java | 701 -- .../sis/coverage/grid/j2d/ColorModelFactory.java | 864 - .../sis/coverage/grid/j2d/ColorModelType.java | 106 -- .../sis/coverage/grid/j2d/ColorsForRange.java | 291 -- .../sis/coverage/grid/j2d/DeferredProperty.java| 124 --- .../apache/sis/coverage/grid/j2d/FillValues.java | 208 .../apache/sis/coverage/grid/j2d/ImageLayout.java | 438 - .../sis/coverage/grid/j2d/ImageUtilities.java | 673 - .../grid/j2d/MultiBandsIndexColorModel.java| 314 -- .../sis/coverage/grid/j2d/ObservableImage.java | 288 -- .../sis/coverage/grid/j2d/RasterFactory.java | 314 -- .../sis/coverage/grid/j2d/SampleModelFactory.java | 291 -- .../sis/coverage/grid/j2d/ScaledColorModel.java| 162 .../sis/coverage/grid/j2d/ScaledColorSpace.java| 223 - .../sis/coverage/grid/j2d/TileErrorHandler.java| 120 --- .../sis/coverage/grid/j2d/TileOpExecutor.java | 1019 .../sis/coverage/grid/j2d/TilePlaceholder.java | 404 .../apache/sis/coverage/grid/j2d/TiledImage.java | 274 -- .../sis/coverage/grid/j2d/WritableTiledImage.java | 217 - .../apache/sis/coverage/grid/j2d/package-info.java | 31 -
(sis) branch geoapi-4.0 updated (a5633e743a -> 069553e76c)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git from a5633e743a Give more information to `SchemaModifier` for modifying a `GridCoverage` read from a GeoTIFF file. By default, add a "no data" category if such value is provided in the GeoTIFF tag. new fa770b4c3a Rename the `org.apache.sis.util.internal` package as `org.apache.sis.util.privy`, and keep the previous "internal" name for classes that are truly internal to the module (i.e. not exported to any other module). new 67ad3e00e0 Apply to `org.apache.sis.metadata` the same convention as `org.apache.sis.util`: the `internal` package is truly internal to the metadata module, and `privy` is shared with other modules of this project. new d15f1f0193 Apply to `org.apache.sis.referencing` the same convention as `org.apache.sis.metadata`: the `internal` package is truly internal to the referencing module, and the `privy` package is shared with other modules of this project (but not in public API). new 069553e76c Apply to `org.apache.sis.feature` the same convention as in previous commits: the `internal` package is truly internal to the referencing module, and the `privy` packages are shared with other modules of this project. The 4 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: endorsed/build.gradle.kts |6 +- .../apache/sis/cloud/aws/s3/ClientFileSystem.java |2 +- .../main/org/apache/sis/console/AboutCommand.java |4 +- .../main/org/apache/sis/console/Command.java |2 +- .../main/org/apache/sis/console/CommandRunner.java |2 +- .../apache/sis/console/FormattedOutputCommand.java |2 +- .../org/apache/sis/console/IdentifierCommand.java |2 +- .../apache/sis/console/ResourcesDownloader.java|2 +- .../org/apache/sis/console/TransformCommand.java |8 +- .../org.apache.sis.feature/main/module-info.java | 13 +- .../org/apache/sis/coverage/CoverageCombiner.java |6 +- .../org/apache/sis/coverage/SampleDimension.java |2 +- .../org/apache/sis/coverage/SampleRangeFormat.java |2 +- .../coverage/grid/BandAggregateGridCoverage.java |4 +- .../coverage/grid/CoordinateOperationFinder.java |6 +- .../apache/sis/coverage/grid/DefaultEvaluator.java |8 +- .../sis/coverage/grid/DimensionAppender.java |2 +- .../apache/sis/coverage/grid/DimensionReducer.java |2 +- .../sis/coverage/grid/DimensionalityReduction.java |2 +- .../coverage/grid/FractionalGridCoordinates.java |2 +- .../org/apache/sis/coverage/grid/GridCoverage.java |4 +- .../apache/sis/coverage/grid/GridCoverage2D.java |4 +- .../sis/coverage/grid/GridCoverageBuilder.java | 10 +- .../sis/coverage/grid/GridCoverageProcessor.java |8 +- .../apache/sis/coverage/grid/GridDerivation.java |2 +- .../org/apache/sis/coverage/grid/GridExtent.java | 10 +- .../apache/sis/coverage/grid/GridExtentCRS.java|2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 18 +- .../apache/sis/coverage/grid/ImageRenderer.java| 12 +- .../sis/coverage/grid/ReducedGridCoverage.java |2 +- .../sis/coverage/grid/ResampledGridCoverage.java |6 +- .../apache/sis/coverage/grid/SliceGeometry.java|8 +- .../sis/coverage/grid/j2d/BatchComputedImage.java | 213 .../sis/coverage/grid/j2d/ColorModelBuilder.java | 701 -- .../sis/coverage/grid/j2d/ColorModelFactory.java | 864 - .../sis/coverage/grid/j2d/ColorModelType.java | 106 -- .../sis/coverage/grid/j2d/ColorsForRange.java | 291 -- .../sis/coverage/grid/j2d/DeferredProperty.java| 124 --- .../apache/sis/coverage/grid/j2d/FillValues.java | 208 .../apache/sis/coverage/grid/j2d/ImageLayout.java | 438 - .../sis/coverage/grid/j2d/ImageUtilities.java | 673 - .../grid/j2d/MultiBandsIndexColorModel.java| 314 -- .../sis/coverage/grid/j2d/ObservableImage.java | 288 -- .../sis/coverage/grid/j2d/RasterFactory.java | 314 -- .../sis/coverage/grid/j2d/SampleModelFactory.java | 291 -- .../sis/coverage/grid/j2d/ScaledColorModel.java| 162 .../sis/coverage/grid/j2d/ScaledColorSpace.java| 223 - .../sis/coverage/grid/j2d/TileErrorHandler.java| 120 --- .../sis/coverage/grid/j2d/TileOpExecutor.java | 1019 .../sis/coverage/grid/j2d/TilePlaceholder.java | 404 .../apache/sis/coverage/grid/j2d/TiledImage.java | 274 -- .../sis/coverage/grid/j2d/WritableTiledImage.java | 217 - .../apache/sis/coverage/grid/j2d/package-info.java | 31
(sis) branch main updated (6eba4a5b2d -> 4150341710)
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 6eba4a5b2d Merge branch 'geoapi-3.1': post-merge organization of imports. add 4d83b73645 Modification of the heuritic rules for sorting the import statements used for tests. add 54f785e8f6 Tune the log messages: more appropriate logger in `AbstractProvider`, fix the locale used by WKT store, catch more logs during the tests. Opportunistically add a link to metadata in Landsat Javadoc. add d6ebef6dd4 Publish the `sis-coveragejson` to Maven local repository. Remove the `sis-shapefile` exclusion from resources compiler. add 1e3b96aaa1 Documentation fixes and formatting. add f118aac5b8 Change the way to import the CSS in the XHTML pages for IP review. This is reflecting the change done in commit 1916044 of https://svn.apache.org/repos/asf/sis/ip-review add 9d2c7ec09f Remove a few unnecessary qualified exports. add a5633e743a Give more information to `SchemaModifier` for modifying a `GridCoverage` read from a GeoTIFF file. By default, add a "no data" category if such value is provided in the GeoTIFF tag. add 6cbd4e47c3 Merge branch 'geoapi-4.0' into geoapi-3.1 new 4150341710 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: .../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(-)
(sis) 01/01: Merge branch 'geoapi-3.1'
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
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;
(sis) branch geoapi-3.1 updated (445620db52 -> 6cbd4e47c3)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 445620db52 Merge branch 'geoapi-4.0' into geoapi-3.1: post-merge imports organization. add 4d83b73645 Modification of the heuritic rules for sorting the import statements used for tests. add 54f785e8f6 Tune the log messages: more appropriate logger in `AbstractProvider`, fix the locale used by WKT store, catch more logs during the tests. Opportunistically add a link to metadata in Landsat Javadoc. add d6ebef6dd4 Publish the `sis-coveragejson` to Maven local repository. Remove the `sis-shapefile` exclusion from resources compiler. add 1e3b96aaa1 Documentation fixes and formatting. add f118aac5b8 Change the way to import the CSS in the XHTML pages for IP review. This is reflecting the change done in commit 1916044 of https://svn.apache.org/repos/asf/sis/ip-review add 9d2c7ec09f Remove a few unnecessary qualified exports. add a5633e743a Give more information to `SchemaModifier` for modifying a `GridCoverage` read from a GeoTIFF file. By default, add a "no data" category if such value is provided in the GeoTIFF tag. new 6cbd4e47c3 Merge branch 'geoapi-4.0' into 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: .../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 | 9 +- .../apache/sis/referencing/cs/AxesConvention.java | 32 +-- .../operation/provider/AbstractProvider.java | 5 +- .../test/org/apache/sis/io/wkt/WKTParserTest.java | 34 +++ .../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 + 24 files changed, 442 insertions(+), 160 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git commit 6cbd4e47c3e8f44e123ab6c374e05473e99d003c Merge: 445620db52 a5633e743a Author: Martin Desruisseaux AuthorDate: Thu Mar 7 10:59:29 2024 +0100 Merge branch 'geoapi-4.0' into 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 | 9 +- .../apache/sis/referencing/cs/AxesConvention.java | 32 +-- .../operation/provider/AbstractProvider.java | 5 +- .../test/org/apache/sis/io/wkt/WKTParserTest.java | 34 +++ .../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 + 24 files changed, 442 insertions(+), 160 deletions(-)
