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 a1f4b15161f53dcde29d134f04a3175b0502e679 Merge: 80a27652f1 66ca33f853 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Fri Sep 29 17:20:44 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../sis/buildtools/coding/ReorganizeImports.java | 105 ++++++++++++- .../apache/sis/buildtools/gradle/Assembler.java | 2 +- .../apache/sis/buildtools/gradle/Conventions.java | 17 ++- .../apache/sis/buildtools/gradle/JavaMaker.java | 3 +- .../sis/buildtools/gradle/ModularCompilation.java | 26 +--- .../apache/sis/buildtools/gradle/ModularJAR.java | 4 +- .../org/apache/sis/buildtools/gradle/UnoPkg.java | 4 +- endorsed/build.gradle.kts | 8 +- .../main/org/apache/sis/feature/README.md | 77 ++++++++++ .../main/org/apache/sis/feature/benchmarks.html | 114 -------------- .../test}/FeatureComparator.java | 2 +- .../feature => feature/test}/package-info.java | 2 +- .../main/org/apache/sis/xml/README.md | 78 ++++++++++ .../sis/xml/bind/gco/ObjectIdentification.html | 59 -------- .../sis/xml/bind/gco/ObjectIdentification.md | 31 ++++ .../main/org/apache/sis/xml/readme.html | 98 ------------ .../test/org/apache/sis/metadata/Assertions.java | 2 +- .../sis/metadata/PropertyConsistencyCheck.java | 2 +- .../sis/metadata/internal/AxisDirectionsTest.md | 3 + .../sis/metadata/internal/AxisDirectionsTest.txt | 3 - .../sis/metadata/iso/CustomMetadataTest.java | 2 +- .../sis/metadata/iso/DefaultIdentifierTest.java | 2 +- .../sis/metadata/iso/DefaultMetadataTest.java | 2 +- .../metadata/iso/citation/DefaultContactTest.java | 2 +- .../iso/citation/DefaultResponsibilityTest.java | 2 +- .../constraint/DefaultLegalConstraintsTest.java | 2 +- .../sis/metadata/iso/content/DefaultBandTest.java | 2 +- .../identification/DefaultBrowseGraphicTest.java | 2 +- .../DefaultRepresentativeFractionTest.java | 2 +- .../iso/identification/DefaultResolutionTest.java | 2 +- .../metadata/iso/lineage/DefaultLineageTest.java | 2 +- .../sis/metadata/iso/quality/ScopeCodeTest.java | 2 +- .../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +- .../sis/metadata/sql/MetadataFallbackVerifier.java | 1 - .../sis/metadata/sql/MetadataSourceTest.java | 1 - .../sis/metadata/sql/MetadataWriterTest.java | 1 - .../sis/{test => metadata}/sql/TestDatabase.java | 2 +- .../sis/metadata/sql/util/ScriptRunnerTest.java | 2 +- .../sis/metadata/xml/SchemaComplianceTest.java | 2 +- .../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +- .../org/apache/sis/test/mock/package-info.java | 2 +- .../test/org/apache/sis/test/sql/package-info.java | 29 ---- .../apache/sis/util/iso/NameMarshallingTest.java | 2 +- .../sis/xml/CharSequenceSubstitutionTest.java | 2 +- .../apache/sis/xml/NilReasonMarshallingTest.java | 2 +- .../org/apache/sis/xml/ReferenceResolverMock.java | 2 +- .../org/apache/sis/xml/UUIDMarshallingTest.java | 2 +- .../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +- .../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +- .../sis/xml/bind/cat/EnumMarshallingTest.java | 2 +- .../apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +- .../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +- .../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +- .../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 +- .../metadata/replace/QualityParameterTest.java | 2 +- .../metadata/replace/ServiceParameterTest.java | 2 +- .../test}/AnnotationConsistencyCheck.java | 2 +- .../{test/xml => xml/test}/DocumentComparator.java | 2 +- .../sis/{test/xml => xml/test}/InfiniteSet.java | 2 +- .../{test/xml => xml/test}/PackageVerifier.java | 2 +- .../{test/xml => xml/test}/SchemaCompliance.java | 2 +- .../sis/{test/xml => xml/test}/TestCase.java | 2 +- .../sis/{test/xml => xml/test}/package-info.java | 8 +- .../sis/xml/util/DocumentComparatorTest.java | 2 +- .../org/apache/sis/xml/util/XmlUtilitiesTest.java | 2 +- .../src/org.apache.sis.openoffice/bundle/README.md | 100 ++++++++++++ .../bundle/build-instruction.html | 119 --------------- .../sis/xml/bind/fra/DataIdentificationTest.java | 2 +- .../xml/bind/fra/DirectReferenceSystemTest.java | 2 +- .../apache/sis/parameter/AbstractParameterValue.md | 5 + .../sis/parameter/AbstractParameterValue.txt | 5 - .../sis/referencing/factory/sql/EPSG_README.md | 7 + .../sis/referencing/factory/sql/EPSG_README.txt | 7 - .../sis/referencing/operation/builder/README.md | 33 ++++ .../sis/referencing/operation/builder/readme.html | 50 ------ ...c3DtoVertical.txt => Geographic3DtoVertical.md} | 6 +- .../transform/SpecializableTransform1D.md | 3 + .../transform/SpecializableTransform1D.txt | 3 - .../sis/xml/bind/referencing/SC_GeographicCRS.md | 4 + .../sis/xml/bind/referencing/SC_GeographicCRS.txt | 4 - .../sis/parameter/ParameterMarshallingTest.java | 2 +- .../sis/referencing/ImmutableIdentifierTest.java | 2 +- .../referencing/crs/DefaultCompoundCRSTest.java | 2 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +- .../referencing/crs/DefaultEngineeringCRSTest.java | 2 +- .../referencing/crs/DefaultGeodeticCRSTest.java | 2 +- .../sis/referencing/crs/DefaultImageCRSTest.java | 2 +- .../referencing/crs/DefaultProjectedCRSTest.java | 2 +- .../sis/referencing/cs/DefaultCartesianCSTest.java | 2 +- .../referencing/cs/DefaultEllipsoidalCSTest.java | 2 +- .../referencing/datum/DefaultEllipsoidTest.java | 2 +- .../datum/DefaultGeodeticDatumTest.java | 2 +- .../datum/DefaultPrimeMeridianTest.java | 2 +- .../datum/DefaultTemporalDatumTest.java | 2 +- .../datum/DefaultVerticalDatumTest.java | 2 +- .../sis/referencing/factory/TestFactorySource.java | 4 +- .../referencing/factory/sql/EPSGInstallerTest.java | 2 +- .../factory/sql/epsg/DataScriptFormatter.java | 2 +- .../sis/referencing/factory/sql/epsg/README.md | 133 ++++++++++++++++ .../sis/referencing/factory/sql/epsg/package.html | 168 --------------------- .../DefaultConcatenatedOperationTest.java | 2 +- .../operation/DefaultPassThroughOperationTest.java | 2 +- .../operation/SingleOperationMarshallingTest.java | 2 +- .../apache/sis/test/integration/MetadataTest.java | 4 +- .../sis/test/integration/MetadataVerticalTest.java | 2 +- .../CC_GeneralOperationParameterTest.java | 2 +- .../CC_OperationParameterGroupTest.java | 2 +- .../referencing/SecondDefiningParameterTest.java | 2 +- .../sis/storage/geotiff/SelfConsistencyTest.java | 2 +- .../sis/storage/netcdf/SelfConsistencyTest.java | 2 +- .../org/apache/sis/storage/sql/SQLStoreTest.java | 2 +- .../apache/sis/storage/sql/TestOnAllDatabases.java | 2 +- .../sql/feature/SelectionClauseWriterTest.java | 2 +- .../sql/feature/TemporalValueGetterTest.java | 2 +- .../sis/storage/sql/postgis/PostgresTest.java | 2 +- .../main/org/apache/sis/storage/FeatureQuery.java | 34 +++-- .../org/apache/sis/storage/FeatureQueryTest.java | 57 ++++++- .../sis/storage/esri/BILConsistencyTest.java | 2 +- .../sis/storage/esri/BIPConsistencyTest.java | 2 +- .../sis/storage/esri/BSQConsistencyTest.java | 2 +- .../sis/storage/image/SelfConsistencyTest.java | 2 +- .../test}/CoverageReadConsistency.java | 2 +- .../storage => storage/test}/SubsampledImage.java | 2 +- .../storage => storage/test}/package-info.java | 4 +- .../sis/util/collection/TableColumnTest.java | 4 +- .../test}/SerializableTableColumn.java | 2 +- .../foreigner => util/test}/package-info.java | 2 +- .../shapefile/jdbc/{readme.txt => README.md} | 2 + netbeans-project/nbproject/project.properties | 7 +- 129 files changed, 783 insertions(+), 822 deletions(-)