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 e55d695764715ef39ff8f89b04eeea21d4060464 Merge: bc9edad990 af3440719f Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon Nov 27 18:54:19 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 buildSrc/build.gradle.kts | 24 +- .../org/apache/sis/buildtools/book/Assembler.java | 0 .../apache/sis/buildtools/book/BookException.java | 0 .../org/apache/sis/buildtools/book/Characters.java | 0 .../apache/sis/buildtools/book/CodeColorizer.java | 0 .../apache/sis/buildtools/book/package-info.java | 0 .../sis/buildtools/coding/ReorganizeImports.java | 78 +++---- .../buildtools/coding/VerifyVersionInJavadoc.java | 0 .../apache/sis/buildtools/coding/package-info.java | 0 .../org/apache/sis/buildtools/doclet/Doclet.java | 0 .../org/apache/sis/buildtools/doclet/Include.java | 0 .../org/apache/sis/buildtools/doclet/Rewriter.java | 0 .../org/apache/sis/buildtools/doclet/Taglet.java | 0 .../apache/sis/buildtools/doclet/package-info.java | 0 .../apache/sis/buildtools/gradle/Assembler.java | 0 .../apache/sis/buildtools/gradle/BuildHelper.java | 0 .../apache/sis/buildtools/gradle/Conventions.java | 0 .../apache/sis/buildtools/gradle/Dependency.java | 0 .../apache/sis/buildtools/gradle/JavaMaker.java | 0 .../sis/buildtools/gradle/ModularCompilation.java | 0 .../apache/sis/buildtools/gradle/ModularJAR.java | 0 .../sis/buildtools/gradle/ModularJavadoc.java | 0 .../sis/buildtools/gradle/ModularPublishing.java | 0 .../sis/buildtools/gradle/ModularSources.java | 0 .../apache/sis/buildtools/gradle/ModularTest.java | 0 .../sis/buildtools/gradle/SISBuildException.java | 0 .../org/apache/sis/buildtools/gradle/UnoPkg.java | 0 .../apache/sis/buildtools/gradle/ZipWriter.java | 0 .../apache/sis/buildtools/gradle/package-info.java | 0 .../org/apache/sis/buildtools/maven/Element.java | 0 .../org/apache/sis/buildtools/maven/Generator.java | 0 .../apache/sis/buildtools/maven/package-info.java | 0 .../sis/buildtools/maven/workaround/Argument.java | 0 .../maven/workaround/ProxyGenerator.java | 0 .../buildtools/maven/workaround/package-info.java | 0 .../resources/IndexedResourceCompiler.java | 0 .../sis/buildtools/resources/package-info.java | 0 .../main/kotlin/sis.library-conventions.gradle.kts | 68 ++++++ .../org/apache/sis/buildtools/book/GEOAPI.lst | 0 .../org/apache/sis/buildtools/book/OGC.lst | 0 .../org/apache/sis/buildtools/book/SIS.lst | 0 .../org/apache/sis/buildtools/book/XML_PREFIX.lst | 0 .../resources/IndexedResourceCompilerTest.java | 0 endorsed/build.gradle.kts | 27 +-- .../main/org/apache/sis/console/package-info.java | 2 +- .../sis/coverage/grid/DimensionAppender.java | 184 ++++++++++++++++ .../sis/coverage/grid/DimensionalityReduction.java | 15 +- .../sis/coverage/grid/GridCoverageProcessor.java | 87 +++++++- .../org/apache/sis/coverage/grid/GridExtent.java | 69 +++++- .../org/apache/sis/coverage/grid/GridGeometry.java | 63 +++++- .../sis/coverage/grid/j2d/SampleModelFactory.java | 4 +- .../org/apache/sis/feature/internal/Resources.java | 10 + .../sis/feature/internal/Resources.properties | 2 + .../sis/feature/internal/Resources_fr.properties | 2 + .../org/apache/sis/filter/AssociationValue.java | 7 +- .../org/apache/sis/filter/ComparisonFilter.java | 2 +- .../main/org/apache/sis/filter/PropertyValue.java | 18 +- .../apache/sis/filter/internal/FunctionNames.java | 2 +- .../main/org/apache/sis/filter/internal/XPath.java | 74 +++++-- .../main/org/apache/sis/filter/sqlmm/Registry.java | 4 +- .../apache/sis/geometry/wrapper/j2d/Polyline.java | 4 +- .../main/org/apache/sis/image/MaskedImage.java | 2 +- .../main/org/apache/sis/image/PixelIterator.java | 2 +- .../main/org/apache/sis/image/PlanarImage.java | 6 +- .../apache/sis/image/processing/TiledProcess.java | 6 +- .../sis/coverage/grid/DimensionAppenderTest.java | 131 +++++++++++ .../coverage/grid/DimensionalityReductionTest.java | 4 +- .../apache/sis/coverage/grid/GridExtentTest.java | 115 +++++----- .../apache/sis/coverage/grid/GridGeometryTest.java | 140 +++++++----- .../test/org/apache/sis/filter/XPathTest.java | 20 ++ .../test/org/apache/sis/image/TiledImageMock.java | 6 +- .../gazetteer/GeohashReferenceSystem.java | 6 +- .../main/org/apache/sis/referencing/CommonCRS.java | 68 ++++-- .../factory/CommonAuthorityFactory.java | 4 +- .../org/apache/sis/referencing/package-info.java | 2 +- .../org/apache/sis/referencing/util/Formulas.java | 2 +- .../org/apache/sis/referencing/CommonCRSTest.java | 1 + .../apache/sis/storage/landsat/LandsatStore.java | 2 +- .../apache/sis/storage/landsat/MetadataReader.java | 2 +- .../org/apache/sis/storage/geotiff/DataSubset.java | 2 +- .../sis/storage/geotiff/ImageFileDirectory.java | 5 +- .../sis/storage/geotiff/MultiResolutionImage.java | 4 +- .../org/apache/sis/storage/geotiff/Writer.java | 2 +- .../geotiff/inflater/CompressionChannel.java | 4 +- .../geotiff/inflater/HorizontalPredictor.java | 4 +- .../sis/storage/geotiff/inflater/Inflater.java | 5 +- .../storage/geotiff/inflater/PredictorChannel.java | 4 +- .../sis/storage/geotiff/writer/TileMatrix.java | 4 +- .../org/apache/sis/storage/geotiff/WriterTest.java | 9 +- .../org/apache/sis/storage/netcdf/base/Axis.java | 4 +- .../sis/storage/sql/postgis/RasterReader.java | 4 +- .../org.apache.sis.storage/main/module-info.java | 1 + .../main/org/apache/sis/io/stream/IOUtilities.java | 16 ++ .../main/org/apache/sis/io/stream/Region.java | 2 +- .../sis/storage/AbstractGridCoverageResource.java | 21 +- .../main/org/apache/sis/storage/FeatureQuery.java | 18 +- .../apache/sis/storage/GridCoverageResource.java | 23 +- .../org/apache/sis/storage/StorageConnector.java | 35 ++- .../aggregate/ConcatenatedGridCoverage.java | 27 ++- .../aggregate/ConcatenatedGridResource.java | 5 +- .../sis/storage/aggregate/CoverageAggregator.java | 162 +++++++++++++- .../sis/storage/aggregate/DimensionAppender.java | 244 +++++++++++++++++++++ .../apache/sis/storage/aggregate/package-info.java | 2 +- .../apache/sis/storage/base/TiledGridCoverage.java | 2 +- .../org/apache/sis/storage/csv/StoreProvider.java | 2 +- .../apache/sis/storage/esri/CharactersView.java | 6 +- .../org/apache/sis/storage/esri/RasterStore.java | 14 -- .../apache/sis/storage/esri/RawRasterReader.java | 2 +- .../apache/sis/storage/esri/RawRasterStore.java | 2 +- .../main/org/apache/sis/storage/folder/Store.java | 46 ++-- .../apache/sis/storage/folder/WritableStore.java | 5 +- .../src/org.apache.sis.util/main/module-info.java | 2 + .../main/org/apache/sis/math/DecimalFunctions.java | 15 +- .../main/org/apache/sis/math/Fraction.java | 9 +- .../main/org/apache/sis/math/MathFunctions.java | 7 +- .../org/apache/sis/measure/QuantityFormat.java | 20 +- .../apache/sis/measure/SexagesimalConverter.java | 3 +- .../main/org/apache/sis/measure/package-info.java | 2 +- .../sis/pending/jdk/{JDK17.java => JDK13.java} | 42 +--- .../main/org/apache/sis/pending/jdk/JDK16.java | 28 ++- .../main/org/apache/sis/pending/jdk/JDK18.java | 65 ++++++ .../main/org/apache/sis/pending/jdk/JDK19.java | 24 +- .../main/org/apache/sis/system/Modules.java | 5 - .../main/org/apache/sis/util/ArraysExt.java | 39 +++- .../main/org/apache/sis/util/Classes.java | 19 +- .../org/apache/sis/util/collection/Containers.java | 4 + .../org/apache/sis/util/internal/DoubleDouble.java | 3 +- .../org/apache/sis/util/internal/Numerics.java | 87 +++----- .../main/org/apache/sis/util/logging/Logging.java | 17 +- .../org/apache/sis/util/resources/Vocabulary.java | 10 + .../sis/util/resources/Vocabulary.properties | 2 + .../sis/util/resources/Vocabulary_fr.properties | 2 + .../org/apache/sis/math/MathFunctionsTest.java | 12 +- .../org/apache/sis/util/internal/NumericsTest.java | 11 +- incubator/build.gradle.kts | 24 +- .../sis/storage/shapefile/ShapefileStore.java | 66 +++++- .../apache/sis/storage/shapefile/dbf/DBFField.java | 2 +- .../sis/storage/shapefile/dbf/DBFHeader.java | 2 +- .../sis/storage/shapefile/dbf/DBFReader.java | 4 +- .../sis/storage/shapefile/shp/ShapeHeader.java | 2 +- .../sis/storage/shapefile/ShapefileStoreTest.java | 196 +++++++++-------- optional/build.gradle.kts | 25 +-- 142 files changed, 1991 insertions(+), 709 deletions(-) diff --cc buildSrc/src/main/kotlin/sis.library-conventions.gradle.kts index 0000000000,140c601648..75fca2a089 mode 000000,100644..100644 --- a/buildSrc/src/main/kotlin/sis.library-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/sis.library-conventions.gradle.kts @@@ -1,0 -1,68 +1,68 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + group = "org.apache.sis" -version = "2.0-SNAPSHOT" ++version = "1.x-SNAPSHOT" + + /* + * "org.apache.sis.buildtools" is a custom Gradle plugin for building a project with Module Source Hierarchy + * as specified in https://docs.oracle.com/en/java/javase/21/docs/specs/man/javac.html#directory-hierarchies + * The expected hierarchy is: + * + * endorsed + * ├─ build + * └─ src + * ├─ org.apache.sis.metadata + * │ ├─ main + * │ │ ├─ module-info.java + * │ │ └─ org/apache/sis/metadata/… + * │ └─ test + * │ └─ org/apache/sis/metadata/… + * ├─ org.apache.sis.referencing + * │ ├─ main + * │ │ ├─ module-info.java + * │ │ └─ org/apache/sis/referencing/… + * │ └─ test + * │ └─ org/apache/sis/referencing/… + * └─ etc. + */ + plugins { + `java-library` + `maven-publish` + signing + } + + /* + * Configuration of the repositories where to deploy artifacts. + */ + publishing { + repositories { + maven { + name = "Apache" + url = uri(if (version.toString().endsWith("SNAPSHOT")) + "https://repository.apache.org/content/repositories/snapshots"; else + "https://repository.apache.org/service/local/staging/deploy/maven2";) + credentials { + val asfNexusUsername = providers.gradleProperty("asfNexusUsername") + val asfNexusPassword = providers.gradleProperty("asfNexusPassword") + if (asfNexusUsername.isPresent() && asfNexusPassword.isPresent()) { + username = asfNexusUsername.get() + password = asfNexusPassword.get() + } + } + } + } + }
