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 7d377bd53e7889fc710c4eaeb93ab25723dbeee0
Merge: cac15f3608 3eff188722
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Wed Nov 4 20:26:48 2026 +0100

    Merge branch 'geoapi-4.0' into geoapi-3.1

 .../org.apache.sis.cloud.aws/main/module-info.java |   2 +-
 .../org/apache/sis/cloud/aws/s3/FileService.java   |   8 +-
 .../org/apache/sis/cloud/aws/s3/package-info.java  |   2 +-
 .../org.apache.sis.console/main/module-info.java   |   2 +-
 .../main/org/apache/sis/console/Command.java       |   6 +-
 .../sis/console/InvalidCommandException.java       |   2 +-
 .../apache/sis/console/InvalidOptionException.java |   2 +-
 .../apache/sis/console/ResourcesDownloader.java    |   2 +-
 .../main/org/apache/sis/console/SIS.java           |   2 +-
 .../main/org/apache/sis/console/package-info.java  |   2 +-
 .../org.apache.sis.feature/main/module-info.java   |   2 +-
 .../org/apache/sis/coverage/BandedCoverage.java    |  14 +-
 .../main/org/apache/sis/coverage/Category.java     |   6 +-
 .../org/apache/sis/coverage/CoverageCombiner.java  |   2 +-
 .../coverage/IllegalSampleDimensionException.java  |   2 +-
 .../coverage/MismatchedCoverageRangeException.java |   2 +-
 .../org/apache/sis/coverage/RegionOfInterest.java  |   2 +-
 .../org/apache/sis/coverage/SampleDimension.java   |  20 +--
 .../coverage/SubspaceNotSpecifiedException.java    |   2 +-
 .../sis/coverage/grid/BufferedGridCoverage.java    |   4 +-
 .../sis/coverage/grid/DimensionalityReduction.java |   2 +-
 .../sis/coverage/grid/DisjointExtentException.java |   4 +-
 .../apache/sis/coverage/grid/DomainLinearizer.java |   2 +-
 .../coverage/grid/FractionalGridCoordinates.java   |   2 +-
 .../apache/sis/coverage/grid/GridClippingMode.java |   2 +-
 .../org/apache/sis/coverage/grid/GridCoverage.java |  14 +-
 .../apache/sis/coverage/grid/GridCoverage2D.java   |   8 +-
 .../sis/coverage/grid/GridCoverageBuilder.java     |   8 +-
 .../sis/coverage/grid/GridCoverageProcessor.java   |  48 +++----
 .../apache/sis/coverage/grid/GridDerivation.java   |  24 ++--
 .../org/apache/sis/coverage/grid/GridExtent.java   |  60 ++++----
 .../org/apache/sis/coverage/grid/GridGeometry.java |  52 +++----
 .../apache/sis/coverage/grid/GridOrientation.java  |   4 +-
 .../apache/sis/coverage/grid/GridRoundingMode.java |   4 +-
 .../grid/IllegalGridGeometryException.java         |   4 +-
 .../apache/sis/coverage/grid/ImageRenderer.java    |  20 +--
 .../grid/IncompleteGridGeometryException.java      |   2 +-
 .../org/apache/sis/coverage/grid/PixelInCell.java  |   2 +-
 .../apache/sis/coverage/grid/PixelTranslation.java |   2 +-
 .../org/apache/sis/coverage/grid/package-info.java |   2 +-
 .../main/org/apache/sis/coverage/package-info.java |   2 +-
 .../apache/sis/feature/AbstractAssociation.java    |   2 +-
 .../org/apache/sis/feature/AbstractAttribute.java  |   2 +-
 .../org/apache/sis/feature/AbstractFeature.java    |  10 +-
 .../apache/sis/feature/AbstractIdentifiedType.java |  10 +-
 .../org/apache/sis/feature/AbstractOperation.java  |   4 +-
 .../apache/sis/feature/DefaultAssociationRole.java |   4 +-
 .../apache/sis/feature/DefaultAttributeType.java   |   2 +-
 .../org/apache/sis/feature/DefaultFeatureType.java |   4 +-
 .../main/org/apache/sis/feature/FeatureFormat.java |   8 +-
 .../sis/feature/FeatureOperationException.java     |   2 +-
 .../org/apache/sis/feature/FeatureOperations.java  |  12 +-
 .../main/org/apache/sis/feature/Features.java      |  20 +--
 .../sis/feature/FoliationRepresentation.java       |   2 +-
 .../sis/feature/InvalidFeatureException.java       |   2 +-
 .../feature/builder/AssociationRoleBuilder.java    |   2 +-
 .../apache/sis/feature/builder/AttributeRole.java  |   2 +-
 .../sis/feature/builder/AttributeTypeBuilder.java  |   2 +-
 .../feature/builder/CharacteristicTypeBuilder.java |   2 +-
 .../sis/feature/builder/FeatureTypeBuilder.java    |   6 +-
 .../sis/feature/builder/PropertyTypeBuilder.java   |   4 +-
 .../apache/sis/feature/builder/TypeBuilder.java    |   2 +-
 .../apache/sis/feature/builder/package-info.java   |   2 +-
 .../main/org/apache/sis/feature/package-info.java  |   2 +-
 .../apache/sis/filter/DefaultFilterFactory.java    |   6 +-
 .../org/apache/sis/filter/FunctionRegister.java    |   2 +-
 .../apache/sis/filter/InvalidXPathException.java   |   2 +-
 .../main/org/apache/sis/filter/Optimization.java   |  20 +--
 .../main/org/apache/sis/filter/package-info.java   |   2 +-
 .../main/org/apache/sis/image/Colorizer.java       |   6 +-
 .../main/org/apache/sis/image/ComputedImage.java   |   6 +-
 .../main/org/apache/sis/image/DataType.java        |  18 +--
 .../main/org/apache/sis/image/ErrorHandler.java    |   2 +-
 .../main/org/apache/sis/image/ImageCombiner.java   |   6 +-
 .../main/org/apache/sis/image/ImageLayout.java     |   6 +-
 .../main/org/apache/sis/image/ImageProcessor.java  |  32 ++---
 .../main/org/apache/sis/image/Interpolation.java   |   2 +-
 .../main/org/apache/sis/image/PixelIterator.java   |  10 +-
 .../main/org/apache/sis/image/PlanarImage.java     |  12 +-
 .../main/org/apache/sis/image/ResampledImage.java  |   6 +-
 .../main/org/apache/sis/image/TransferType.java    |   2 +-
 .../apache/sis/image/WritablePixelIterator.java    |   8 +-
 .../main/org/apache/sis/image/package-info.java    |   2 +-
 .../main/org/apache/sis/index/tree/PointTree.java  |   4 +-
 .../org/apache/sis/index/tree/package-info.java    |   2 +-
 .../org.apache.sis.metadata/main/module-info.java  |   2 +-
 .../org/apache/sis/metadata/AbstractMetadata.java  |   8 +-
 .../sis/metadata/InvalidMetadataException.java     |   6 +-
 .../org/apache/sis/metadata/KeyNamePolicy.java     |   2 +-
 .../org/apache/sis/metadata/MetadataCopier.java    |   6 +-
 .../org/apache/sis/metadata/MetadataStandard.java  |  16 +--
 .../apache/sis/metadata/ModifiableMetadata.java    |  22 +--
 .../org/apache/sis/metadata/TitleProperty.java     |   2 +-
 .../org/apache/sis/metadata/TypeValuePolicy.java   |   2 +-
 .../metadata/UnmodifiableMetadataException.java    |   2 +-
 .../apache/sis/metadata/ValueExistencePolicy.java  |   8 +-
 .../iso/DefaultApplicationSchemaInformation.java   |   2 +-
 .../iso/DefaultExtendedElementInformation.java     |   6 +-
 .../apache/sis/metadata/iso/DefaultIdentifier.java |  12 +-
 .../apache/sis/metadata/iso/DefaultMetadata.java   |  46 +++---
 .../iso/DefaultMetadataExtensionInformation.java   |   2 +-
 .../sis/metadata/iso/DefaultMetadataScope.java     |   2 +-
 .../iso/DefaultPortrayalCatalogueReference.java    |   2 +-
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |   6 +-
 .../acquisition/DefaultAcquisitionInformation.java |   2 +-
 .../acquisition/DefaultEnvironmentalRecord.java    |   2 +-
 .../sis/metadata/iso/acquisition/DefaultEvent.java |   6 +-
 .../iso/acquisition/DefaultInstrument.java         |   2 +-
 .../metadata/iso/acquisition/DefaultObjective.java |   6 +-
 .../metadata/iso/acquisition/DefaultOperation.java |   2 +-
 .../sis/metadata/iso/acquisition/DefaultPlan.java  |   2 +-
 .../metadata/iso/acquisition/DefaultPlatform.java  |   2 +-
 .../iso/acquisition/DefaultPlatformPass.java       |   2 +-
 .../iso/acquisition/DefaultRequestedDate.java      |   6 +-
 .../iso/acquisition/DefaultRequirement.java        |   4 +-
 .../sis/metadata/iso/acquisition/package-info.java |   2 +-
 .../sis/metadata/iso/citation/AbstractParty.java   |   6 +-
 .../sis/metadata/iso/citation/Citations.java       |  32 ++---
 .../sis/metadata/iso/citation/DefaultAddress.java  |   2 +-
 .../sis/metadata/iso/citation/DefaultCitation.java |  12 +-
 .../metadata/iso/citation/DefaultCitationDate.java |   8 +-
 .../sis/metadata/iso/citation/DefaultContact.java  |  18 +--
 .../metadata/iso/citation/DefaultIndividual.java   |   2 +-
 .../iso/citation/DefaultOnlineResource.java        |   6 +-
 .../metadata/iso/citation/DefaultOrganisation.java |   2 +-
 .../iso/citation/DefaultResponsibility.java        |   2 +-
 .../iso/citation/DefaultResponsibleParty.java      |   2 +-
 .../sis/metadata/iso/citation/DefaultSeries.java   |   2 +-
 .../metadata/iso/citation/DefaultTelephone.java    |  12 +-
 .../sis/metadata/iso/citation/package-info.java    |   2 +-
 .../iso/constraint/DefaultConstraints.java         |  22 +--
 .../iso/constraint/DefaultLegalConstraints.java    |   2 +-
 .../iso/constraint/DefaultReleasability.java       |   2 +-
 .../iso/constraint/DefaultSecurityConstraints.java |   2 +-
 .../sis/metadata/iso/constraint/package-info.java  |   2 +-
 .../iso/content/AbstractContentInformation.java    |   2 +-
 .../iso/content/DefaultAttributeGroup.java         |   2 +-
 .../sis/metadata/iso/content/DefaultBand.java      |  14 +-
 .../iso/content/DefaultCoverageDescription.java    |  10 +-
 .../DefaultFeatureCatalogueDescription.java        |  10 +-
 .../iso/content/DefaultFeatureTypeInfo.java        |   2 +-
 .../iso/content/DefaultImageDescription.java       |   2 +-
 .../iso/content/DefaultRangeDimension.java         |  10 +-
 .../content/DefaultRangeElementDescription.java    |   2 +-
 .../iso/content/DefaultSampleDimension.java        |   6 +-
 .../sis/metadata/iso/content/package-info.java     |   2 +-
 .../metadata/iso/distribution/DefaultDataFile.java |  12 +-
 .../DefaultDigitalTransferOptions.java             |  14 +-
 .../iso/distribution/DefaultDistribution.java      |   6 +-
 .../iso/distribution/DefaultDistributor.java       |   2 +-
 .../metadata/iso/distribution/DefaultFormat.java   |  10 +-
 .../metadata/iso/distribution/DefaultMedium.java   |  10 +-
 .../distribution/DefaultStandardOrderProcess.java  |  18 +--
 .../metadata/iso/distribution/package-info.java    |   2 +-
 .../iso/extent/AbstractGeographicExtent.java       |   2 +-
 .../iso/extent/DefaultBoundingPolygon.java         |   2 +-
 .../sis/metadata/iso/extent/DefaultExtent.java     |   4 +-
 .../iso/extent/DefaultGeographicBoundingBox.java   |   2 +-
 .../iso/extent/DefaultGeographicDescription.java   |   4 +-
 .../iso/extent/DefaultSpatialTemporalExtent.java   |   8 +-
 .../metadata/iso/extent/DefaultTemporalExtent.java |  12 +-
 .../metadata/iso/extent/DefaultVerticalExtent.java |   4 +-
 .../apache/sis/metadata/iso/extent/Extents.java    |  30 ++--
 .../iso/extent/NotSpatioTemporalException.java     |   2 +-
 .../sis/metadata/iso/extent/package-info.java      |   2 +-
 .../iso/identification/AbstractIdentification.java |  36 ++---
 .../DefaultAggregateInformation.java               |   2 +-
 .../identification/DefaultAssociatedResource.java  |   2 +-
 .../iso/identification/DefaultBrowseGraphic.java   |  10 +-
 .../iso/identification/DefaultCoupledResource.java |   2 +-
 .../identification/DefaultDataIdentification.java  |   6 +-
 .../iso/identification/DefaultKeywordClass.java    |   2 +-
 .../iso/identification/DefaultKeywords.java        |   6 +-
 .../DefaultOperationChainMetadata.java             |   2 +-
 .../identification/DefaultOperationMetadata.java   |   2 +-
 .../DefaultRepresentativeFraction.java             |   6 +-
 .../iso/identification/DefaultResolution.java      |  16 +--
 .../DefaultServiceIdentification.java              |  20 +--
 .../metadata/iso/identification/DefaultUsage.java  |  20 +--
 .../metadata/iso/identification/package-info.java  |   2 +-
 .../sis/metadata/iso/lineage/DefaultAlgorithm.java |   2 +-
 .../sis/metadata/iso/lineage/DefaultLineage.java   |  10 +-
 .../iso/lineage/DefaultNominalResolution.java      |   2 +-
 .../metadata/iso/lineage/DefaultProcessStep.java   |  14 +-
 .../iso/lineage/DefaultProcessStepReport.java      |   2 +-
 .../metadata/iso/lineage/DefaultProcessing.java    |   2 +-
 .../sis/metadata/iso/lineage/DefaultSource.java    |  14 +-
 .../sis/metadata/iso/lineage/package-info.java     |   2 +-
 .../maintenance/DefaultMaintenanceInformation.java |  10 +-
 .../sis/metadata/iso/maintenance/DefaultScope.java |   6 +-
 .../iso/maintenance/DefaultScopeDescription.java   |   6 +-
 .../iso/maintenance/LegacyFeatureType.java         |   2 +-
 .../sis/metadata/iso/maintenance/package-info.java |   2 +-
 .../org/apache/sis/metadata/iso/package-info.java  |   2 +-
 .../metadata/iso/quality/AbstractCompleteness.java |   2 +-
 .../iso/quality/AbstractDataEvaluation.java        |   2 +-
 .../sis/metadata/iso/quality/AbstractElement.java  |  18 +--
 .../iso/quality/AbstractLogicalConsistency.java    |   2 +-
 .../metadata/iso/quality/AbstractMetaquality.java  |   2 +-
 .../iso/quality/AbstractPositionalAccuracy.java    |   2 +-
 .../sis/metadata/iso/quality/AbstractResult.java   |  10 +-
 .../iso/quality/AbstractTemporalAccuracy.java      |   2 +-
 .../iso/quality/AbstractTemporalQuality.java       |   2 +-
 .../iso/quality/AbstractThematicAccuracy.java      |   2 +-
 .../DefaultAbsoluteExternalPositionalAccuracy.java |   2 +-
 .../quality/DefaultAccuracyOfATimeMeasurement.java |   2 +-
 .../iso/quality/DefaultAggregationDerivation.java  |   2 +-
 .../metadata/iso/quality/DefaultBasicMeasure.java  |   2 +-
 .../iso/quality/DefaultCompletenessCommission.java |   2 +-
 .../iso/quality/DefaultCompletenessOmission.java   |   2 +-
 .../iso/quality/DefaultConceptualConsistency.java  |   2 +-
 .../metadata/iso/quality/DefaultConfidence.java    |   2 +-
 .../iso/quality/DefaultConformanceResult.java      |   2 +-
 .../iso/quality/DefaultCoverageResult.java         |   6 +-
 .../metadata/iso/quality/DefaultDataQuality.java   |   8 +-
 .../iso/quality/DefaultDescriptiveResult.java      |   2 +-
 .../iso/quality/DefaultDomainConsistency.java      |   2 +-
 .../iso/quality/DefaultEvaluationMethod.java       |   4 +-
 .../DefaultEvaluationReportInformation.java        |   2 +-
 .../iso/quality/DefaultFormatConsistency.java      |   2 +-
 .../iso/quality/DefaultFullInspection.java         |   2 +-
 .../DefaultGriddedDataPositionalAccuracy.java      |   2 +-
 .../metadata/iso/quality/DefaultHomogeneity.java   |   2 +-
 .../iso/quality/DefaultIndirectEvaluation.java     |   2 +-
 .../iso/quality/DefaultMeasureDescription.java     |   2 +-
 .../iso/quality/DefaultMeasureReference.java       |   4 +-
 .../DefaultNonQuantitativeAttributeAccuracy.java   |   2 +-
 ...DefaultNonQuantitativeAttributeCorrectness.java |   2 +-
 .../iso/quality/DefaultQualityMeasure.java         |   2 +-
 .../DefaultQuantitativeAttributeAccuracy.java      |   2 +-
 .../iso/quality/DefaultQuantitativeResult.java     |   2 +-
 .../DefaultRelativeInternalPositionalAccuracy.java |   2 +-
 .../iso/quality/DefaultRepresentativity.java       |   2 +-
 .../iso/quality/DefaultSampleBasedInspection.java  |   2 +-
 .../sis/metadata/iso/quality/DefaultScope.java     |   2 +-
 .../iso/quality/DefaultSourceReference.java        |   2 +-
 .../iso/quality/DefaultTemporalConsistency.java    |   2 +-
 .../iso/quality/DefaultTemporalValidity.java       |   2 +-
 .../DefaultThematicClassificationCorrectness.java  |   2 +-
 .../iso/quality/DefaultTopologicalConsistency.java |   2 +-
 .../sis/metadata/iso/quality/DefaultUsability.java |   2 +-
 .../sis/metadata/iso/quality/package-info.java     |   2 +-
 .../spatial/AbstractGeolocationInformation.java    |   2 +-
 .../iso/spatial/AbstractSpatialRepresentation.java |   6 +-
 .../sis/metadata/iso/spatial/DefaultDimension.java |  10 +-
 .../sis/metadata/iso/spatial/DefaultGCP.java       |   2 +-
 .../metadata/iso/spatial/DefaultGCPCollection.java |   2 +-
 .../iso/spatial/DefaultGeometricObjects.java       |   2 +-
 .../metadata/iso/spatial/DefaultGeorectified.java  |   2 +-
 .../iso/spatial/DefaultGeoreferenceable.java       |   2 +-
 .../spatial/DefaultGridSpatialRepresentation.java  |   2 +-
 .../DefaultVectorSpatialRepresentation.java        |   2 +-
 .../sis/metadata/iso/spatial/package-info.java     |   2 +-
 .../main/org/apache/sis/metadata/package-info.java |   2 +-
 .../apache/sis/metadata/sql/MetadataSource.java    |   6 +-
 .../sis/metadata/sql/MetadataStoreException.java   |   2 +-
 .../apache/sis/metadata/sql/MetadataWriter.java    |   2 +-
 .../org/apache/sis/metadata/sql/package-info.java  |   2 +-
 .../org/apache/sis/util/iso/AbstractFactory.java   |   4 +-
 .../main/org/apache/sis/util/iso/AbstractName.java |   2 +-
 .../org/apache/sis/util/iso/DefaultLocalName.java  |   2 +-
 .../org/apache/sis/util/iso/DefaultMemberName.java |   4 +-
 .../apache/sis/util/iso/DefaultNameFactory.java    |  10 +-
 .../org/apache/sis/util/iso/DefaultNameSpace.java  |   4 +-
 .../org/apache/sis/util/iso/DefaultRecord.java     |   6 +-
 .../apache/sis/util/iso/DefaultRecordSchema.java   |   6 +-
 .../org/apache/sis/util/iso/DefaultRecordType.java |   8 +-
 .../org/apache/sis/util/iso/DefaultScopedName.java |   4 +-
 .../org/apache/sis/util/iso/DefaultTypeName.java   |   8 +-
 .../main/org/apache/sis/util/iso/Names.java        |  14 +-
 .../main/org/apache/sis/util/iso/Types.java        |  12 +-
 .../main/org/apache/sis/util/iso/package-info.java |   2 +-
 .../main/org/apache/sis/xml/IdentifiedObject.java  |   2 +-
 .../main/org/apache/sis/xml/IdentifierMap.java     |   2 +-
 .../main/org/apache/sis/xml/IdentifierSpace.java   |   2 +-
 .../main/org/apache/sis/xml/MarshalContext.java    |   8 +-
 .../main/org/apache/sis/xml/MarshallerPool.java    |   4 +-
 .../main/org/apache/sis/xml/Namespaces.java        |  68 ++++-----
 .../main/org/apache/sis/xml/NilObject.java         |   2 +-
 .../main/org/apache/sis/xml/NilReason.java         |   4 +-
 .../main/org/apache/sis/xml/ReferenceResolver.java |  12 +-
 .../main/org/apache/sis/xml/ValueConverter.java    |   6 +-
 .../main/org/apache/sis/xml/XLink.java             |   8 +-
 .../main/org/apache/sis/xml/XML.java               |  14 +-
 .../main/org/apache/sis/xml/package-info.java      |   2 +-
 .../main/module-info.java                          |   2 +-
 .../main/org/apache/sis/openoffice/CalcAddins.java |   2 +-
 .../sis/openoffice/ReferencingFunctions.java       |   2 +-
 .../org/apache/sis/openoffice/Registration.java    |   2 +-
 .../org/apache/sis/openoffice/XReferencing.java    |   2 +-
 .../org/apache/sis/openoffice/package-info.java    |   2 +-
 .../org.apache.sis.portrayal/main/module-info.java |   2 +-
 .../main/org/apache/sis/portrayal/Canvas.java      |   4 +-
 .../org/apache/sis/portrayal/CanvasFollower.java   |   2 +-
 .../main/org/apache/sis/portrayal/Observable.java  |   2 +-
 .../org/apache/sis/portrayal/PlanarCanvas.java     |   4 +-
 .../org/apache/sis/portrayal/RenderException.java  |   2 +-
 .../apache/sis/portrayal/TransformChangeEvent.java |   2 +-
 .../org/apache/sis/portrayal/package-info.java     |   2 +-
 .../main/org/apache/sis/style/Style.java           |   2 +-
 .../main/org/apache/sis/style/package-info.java    |   2 +-
 .../main/module-info.java                          |   2 +-
 .../apache/sis/profile/france/FrenchProfile.java   |   2 +-
 .../apache/sis/profile/france/package-info.java    |   2 +-
 .../main/module-info.java                          |   2 +-
 .../apache/sis/profile/japan/JapaneseProfile.java  |   2 +-
 .../org/apache/sis/profile/japan/package-info.java |   2 +-
 .../main/module-info.java                          |   2 +-
 .../referencing/gazetteer/AbstractLocation.java    |   2 +-
 .../referencing/gazetteer/GazetteerException.java  |   2 +-
 .../referencing/gazetteer/GazetteerFactory.java    |   2 +-
 .../gazetteer/GeohashReferenceSystem.java          |  12 +-
 .../sis/referencing/gazetteer/LocationFormat.java  |   2 +-
 .../gazetteer/MilitaryGridReferenceSystem.java     |  12 +-
 .../gazetteer/ModifiableLocationType.java          |   2 +-
 .../gazetteer/ReferenceVerifyException.java        |   2 +-
 .../gazetteer/ReferencingByIdentifiers.java        |   8 +-
 .../sis/referencing/gazetteer/package-info.java    |   2 +-
 .../main/module-info.java                          |   2 +-
 .../sis/coordinate/AbstractCoordinateSet.java      |   2 +-
 .../sis/coordinate/DefaultCoordinateMetadata.java  |   4 +-
 .../org/apache/sis/coordinate/package-info.java    |   2 +-
 .../sis/geometry/AbstractDirectPosition.java       |   8 +-
 .../org/apache/sis/geometry/AbstractEnvelope.java  |  14 +-
 .../org/apache/sis/geometry/CoordinateFormat.java  |  10 +-
 .../org/apache/sis/geometry/DirectPosition1D.java  |   8 +-
 .../org/apache/sis/geometry/DirectPosition2D.java  |  10 +-
 .../main/org/apache/sis/geometry/Envelope2D.java   |   8 +-
 .../main/org/apache/sis/geometry/Envelopes.java    |  20 +--
 .../apache/sis/geometry/GeneralDirectPosition.java |  10 +-
 .../org/apache/sis/geometry/GeneralEnvelope.java   |  10 +-
 .../sis/geometry/ImmutableDirectPosition.java      |   2 +-
 .../org/apache/sis/geometry/ImmutableEnvelope.java |   2 +-
 .../MismatchedReferenceSystemException.java        |   2 +-
 .../main/org/apache/sis/geometry/Shapes2D.java     |   4 +-
 .../apache/sis/geometry/WraparoundAdjustment.java  |   2 +-
 .../org/apache/sis/geometry/WraparoundMethod.java  |   2 +-
 .../main/org/apache/sis/geometry/package-info.java |   2 +-
 .../main/org/apache/sis/io/wkt/Colors.java         |   2 +-
 .../main/org/apache/sis/io/wkt/Convention.java     |  10 +-
 .../main/org/apache/sis/io/wkt/ElementKind.java    |   4 +-
 .../org/apache/sis/io/wkt/FormattableObject.java   |   2 +-
 .../main/org/apache/sis/io/wkt/Formatter.java      |  20 +--
 .../main/org/apache/sis/io/wkt/KeywordCase.java    |   2 +-
 .../main/org/apache/sis/io/wkt/KeywordStyle.java   |   2 +-
 .../main/org/apache/sis/io/wkt/Parser.java         |   2 +-
 .../main/org/apache/sis/io/wkt/Symbols.java        |   2 +-
 .../main/org/apache/sis/io/wkt/Transliterator.java |   2 +-
 .../sis/io/wkt/UnformattableObjectException.java   |   2 +-
 .../sis/io/wkt/UnparsableObjectException.java      |   4 +-
 .../main/org/apache/sis/io/wkt/WKTDictionary.java  |   4 +-
 .../main/org/apache/sis/io/wkt/WKTFormat.java      |  24 ++--
 .../main/org/apache/sis/io/wkt/Warnings.java       |   2 +-
 .../main/org/apache/sis/io/wkt/package-info.java   |   2 +-
 .../sis/parameter/AbstractParameterDescriptor.java |   4 +-
 .../sis/parameter/DefaultParameterDescriptor.java  |   6 +-
 .../parameter/DefaultParameterDescriptorGroup.java |   6 +-
 .../sis/parameter/DefaultParameterValue.java       |  12 +-
 .../sis/parameter/DefaultParameterValueGroup.java  |   4 +-
 .../org/apache/sis/parameter/MatrixParameters.java |   4 +-
 .../org/apache/sis/parameter/ParameterBuilder.java |   8 +-
 .../org/apache/sis/parameter/ParameterFormat.java  |   4 +-
 .../org/apache/sis/parameter/Parameterized.java    |   2 +-
 .../main/org/apache/sis/parameter/Parameters.java  |  42 +++---
 .../org/apache/sis/parameter/package-info.java     |   2 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |  12 +-
 .../sis/referencing/AbstractReferenceSystem.java   |   4 +-
 .../main/org/apache/sis/referencing/Builder.java   |  14 +-
 .../main/org/apache/sis/referencing/CRS.java       |  60 ++++----
 .../main/org/apache/sis/referencing/CommonCRS.java |  32 ++---
 .../sis/referencing/DefaultObjectDomain.java       |   4 +-
 .../org/apache/sis/referencing/DisplayName.java    |   2 +-
 .../apache/sis/referencing/GeodeticCalculator.java |   4 +-
 .../apache/sis/referencing/GeodeticException.java  |   2 +-
 .../apache/sis/referencing/IdentifiedObjects.java  |  18 +--
 .../sis/referencing/ImmutableIdentifier.java       |   4 +-
 .../sis/referencing/MultiRegisterOperations.java   |   2 +-
 .../apache/sis/referencing/NamedIdentifier.java    |  10 +-
 .../apache/sis/referencing/crs/AbstractCRS.java    |   4 +-
 .../sis/referencing/crs/DefaultCompoundCRS.java    |   4 +-
 .../sis/referencing/crs/DefaultDerivedCRS.java     |   6 +-
 .../sis/referencing/crs/DefaultEngineeringCRS.java |   8 +-
 .../sis/referencing/crs/DefaultGeocentricCRS.java  |  10 +-
 .../sis/referencing/crs/DefaultGeographicCRS.java  |  12 +-
 .../sis/referencing/crs/DefaultParametricCRS.java  |   8 +-
 .../sis/referencing/crs/DefaultProjectedCRS.java   |   6 +-
 .../sis/referencing/crs/DefaultTemporalCRS.java    |  20 +--
 .../sis/referencing/crs/DefaultVerticalCRS.java    |   8 +-
 .../apache/sis/referencing/crs/package-info.java   |   2 +-
 .../org/apache/sis/referencing/cs/AbstractCS.java  |   6 +-
 .../apache/sis/referencing/cs/AxesConvention.java  |   8 +-
 .../org/apache/sis/referencing/cs/AxisFilter.java  |   6 +-
 .../sis/referencing/cs/CoordinateSystems.java      |  26 ++--
 .../apache/sis/referencing/cs/DefaultAffineCS.java |   4 +-
 .../sis/referencing/cs/DefaultCartesianCS.java     |   4 +-
 .../sis/referencing/cs/DefaultCompoundCS.java      |   2 +-
 .../cs/DefaultCoordinateSystemAxis.java            |   4 +-
 .../sis/referencing/cs/DefaultCylindricalCS.java   |   4 +-
 .../sis/referencing/cs/DefaultEllipsoidalCS.java   |   4 +-
 .../apache/sis/referencing/cs/DefaultLinearCS.java |   4 +-
 .../sis/referencing/cs/DefaultParametricCS.java    |   4 +-
 .../apache/sis/referencing/cs/DefaultPolarCS.java  |   4 +-
 .../sis/referencing/cs/DefaultSphericalCS.java     |   6 +-
 .../apache/sis/referencing/cs/DefaultTimeCS.java   |   6 +-
 .../sis/referencing/cs/DefaultVerticalCS.java      |   4 +-
 .../apache/sis/referencing/cs/package-info.java    |   2 +-
 .../sis/referencing/datum/AbstractDatum.java       |  10 +-
 .../sis/referencing/datum/BursaWolfParameters.java |   8 +-
 .../sis/referencing/datum/DatumOrEnsemble.java     |   6 +-
 .../sis/referencing/datum/DatumShiftGrid.java      |  18 +--
 .../referencing/datum/DefaultDatumEnsemble.java    |   4 +-
 .../sis/referencing/datum/DefaultEllipsoid.java    |  14 +-
 .../referencing/datum/DefaultEngineeringDatum.java |   4 +-
 .../referencing/datum/DefaultGeodeticDatum.java    |   8 +-
 .../referencing/datum/DefaultParametricDatum.java  |   4 +-
 .../referencing/datum/DefaultPrimeMeridian.java    |   4 +-
 .../referencing/datum/DefaultTemporalDatum.java    |   6 +-
 .../referencing/datum/DefaultVerticalDatum.java    |  12 +-
 .../sis/referencing/datum/TimeDependentBWP.java    |   8 +-
 .../apache/sis/referencing/datum/package-info.java |   2 +-
 .../factory/CommonAuthorityFactory.java            |   4 +-
 .../factory/ConcurrentAuthorityFactory.java        |  16 +--
 .../referencing/factory/FactoryDataException.java  |   4 +-
 .../factory/GeodeticAuthorityFactory.java          |  12 +-
 .../referencing/factory/GeodeticObjectFactory.java |  30 ++--
 .../factory/IdentifiedObjectFinder.java            |   8 +-
 .../referencing/factory/IdentifiedObjectSet.java   |   4 +-
 .../factory/InternalFactoryException.java          |   4 +-
 .../factory/InvalidGeodeticParameterException.java |   2 +-
 .../factory/MissingFactoryResourceException.java   |   2 +-
 .../factory/MultiAuthoritiesFactory.java           |   6 +-
 .../factory/NoSuchAuthorityFactoryException.java   |   2 +-
 .../factory/UnavailableFactoryException.java       |   2 +-
 .../sis/referencing/factory/package-info.java      |   2 +-
 .../referencing/factory/sql/EPSGDataAccess.java    |   4 +-
 .../sis/referencing/factory/sql/EPSGFactory.java   |   4 +-
 .../factory/sql/InstallationScriptProvider.java    |   2 +-
 .../sis/referencing/factory/sql/SQLTranslator.java |   4 +-
 .../sis/referencing/factory/sql/package-info.java  |   2 +-
 .../operation/AbstractCoordinateOperation.java     |   8 +-
 .../operation/CoordinateOperationContext.java      |  22 +--
 .../operation/CoordinateOperationFinder.java       |   4 +-
 .../operation/CoordinateOperationRegistry.java     |   2 +-
 .../referencing/operation/DefaultConversion.java   |   6 +-
 .../DefaultCoordinateOperationFactory.java         |  16 +--
 .../sis/referencing/operation/DefaultFormula.java  |   2 +-
 .../operation/DefaultOperationMethod.java          |   6 +-
 .../operation/DefaultPassThroughOperation.java     |   6 +-
 .../operation/DefaultTransformation.java           |   4 +-
 .../referencing/operation/DefiningConversion.java  |   2 +-
 .../operation/MismatchedDatumException.java        |   2 +-
 .../MissingSourceDimensionsException.java          |   2 +-
 .../operation/builder/LinearTransformBuilder.java  |  30 ++--
 .../operation/builder/LocalizationGridBuilder.java |  24 ++--
 .../builder/LocalizationGridException.java         |   2 +-
 .../operation/builder/TransformBuilder.java        |   2 +-
 .../operation/builder/package-info.java            |   2 +-
 .../operation/matrix/AffineTransforms2D.java       |   4 +-
 .../sis/referencing/operation/matrix/Matrices.java |  18 +--
 .../sis/referencing/operation/matrix/Matrix1.java  |   4 +-
 .../sis/referencing/operation/matrix/Matrix2.java  |   6 +-
 .../sis/referencing/operation/matrix/Matrix3.java  |   4 +-
 .../sis/referencing/operation/matrix/Matrix4.java  |   4 +-
 .../referencing/operation/matrix/MatrixSIS.java    |  20 +--
 .../matrix/MismatchedMatrixSizeException.java      |   2 +-
 .../matrix/NoninvertibleMatrixException.java       |   2 +-
 .../matrix/UnderdeterminedMatrixException.java     |   2 +-
 .../referencing/operation/matrix/package-info.java |   2 +-
 .../sis/referencing/operation/package-info.java    |   2 +-
 .../operation/transform/AbstractMathTransform.java |  14 +-
 .../transform/AbstractMathTransform1D.java         |   6 +-
 .../transform/AbstractMathTransform2D.java         |   6 +-
 .../operation/transform/ContextualParameters.java  |  10 +-
 .../operation/transform/DatumShiftTransform.java   |   2 +-
 .../transform/DefaultMathTransformFactory.java     |  10 +-
 .../operation/transform/DomainDefinition.java      |   6 +-
 .../transform/EllipsoidToCentricTransform.java     |  14 +-
 .../transform/EllipsoidToRadiusTransform.java      |   2 +-
 .../transform/GeometryTransformException.java      |   2 +-
 .../transform/InterpolatedGeocentricTransform.java |   2 +-
 .../operation/transform/InterpolatedTransform.java |   4 +-
 .../operation/transform/IterationStrategy.java     |   2 +-
 .../operation/transform/LinearTransform.java       |   8 +-
 .../operation/transform/MathTransformBuilder.java  |   6 +-
 .../operation/transform/MathTransformProvider.java |  10 +-
 .../operation/transform/MathTransforms.java        |  34 ++---
 .../operation/transform/MolodenskyTransform.java   |   4 +-
 .../operation/transform/PassThroughTransform.java  |   6 +-
 .../operation/transform/PoleRotation.java          |   2 +-
 .../operation/transform/TransferFunction.java      |   8 +-
 .../transform/TransformFactoryException.java       |   2 +-
 .../operation/transform/TransformJoiner.java       |   2 +-
 .../operation/transform/TransformSeparator.java    |   8 +-
 .../operation/transform/WraparoundTransform.java   |   2 +-
 .../operation/transform/package-info.java          |   2 +-
 .../org/apache/sis/referencing/package-info.java   |   2 +-
 .../referencing/geoapi/AuthorityFactoryTest.java   |   2 +-
 .../geoapi/ParameterizedTransformTest.java         |   2 +-
 .../apache/sis/referencing/internal/EpochTest.java |   2 +-
 .../main/module-info.java                          |   2 +-
 .../apache/sis/storage/landsat/LandsatStore.java   |  10 +-
 .../sis/storage/landsat/LandsatStoreProvider.java  |   4 +-
 .../apache/sis/storage/landsat/package-info.java   |   2 +-
 .../main/module-info.java                          |   2 +-
 .../apache/sis/storage/geotiff/Compression.java    |   2 +-
 .../apache/sis/storage/geotiff/FormatModifier.java |   4 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   |  22 +--
 .../sis/storage/geotiff/GeoTiffStoreProvider.java  |   6 +-
 .../apache/sis/storage/geotiff/package-info.java   |   2 +-
 .../main/module-info.java                          |   2 +-
 .../apache/sis/storage/netcdf/AttributeNames.java  |  28 ++--
 .../org/apache/sis/storage/netcdf/NetcdfStore.java |  14 +-
 .../sis/storage/netcdf/NetcdfStoreProvider.java    |   4 +-
 .../apache/sis/storage/netcdf/package-info.java    |   2 +-
 .../main/module-info.java                          |   2 +-
 .../org/apache/sis/storage/sql/DataAccess.java     |   2 +-
 .../apache/sis/storage/sql/ResourceDefinition.java |   4 +-
 .../main/org/apache/sis/storage/sql/SQLStore.java  |  22 +--
 .../apache/sis/storage/sql/SQLStoreProvider.java   |   8 +-
 .../apache/sis/storage/sql/SimpleFeatureStore.java |   2 +-
 .../org/apache/sis/storage/sql/package-info.java   |   2 +-
 .../main/module-info.java                          |   2 +-
 .../main/org/apache/sis/storage/gps/Fix.java       |   2 +-
 .../org/apache/sis/storage/gps/package-info.java   |   2 +-
 .../org.apache.sis.storage/main/module-info.java   |   2 +-
 .../org/apache/sis/storage/AbstractFeatureSet.java |   6 +-
 .../sis/storage/AbstractGridCoverageResource.java  |   6 +-
 .../org/apache/sis/storage/AbstractResource.java   |   4 +-
 .../main/org/apache/sis/storage/Aggregate.java     |   2 +-
 .../apache/sis/storage/CanNotProbeException.java   |   2 +-
 .../sis/storage/ConcurrentReadException.java       |   2 +-
 .../sis/storage/ConcurrentWriteException.java      |   2 +-
 .../main/org/apache/sis/storage/CoverageQuery.java |   8 +-
 .../main/org/apache/sis/storage/DataSet.java       |   2 +-
 .../main/org/apache/sis/storage/DataStore.java     |  22 +--
 .../sis/storage/DataStoreClosedException.java      |   4 +-
 .../sis/storage/DataStoreContentException.java     |   2 +-
 .../org/apache/sis/storage/DataStoreException.java |  10 +-
 .../org/apache/sis/storage/DataStoreProvider.java  |  18 +--
 .../sis/storage/DataStoreReferencingException.java |   2 +-
 .../main/org/apache/sis/storage/DataStores.java    |  10 +-
 .../main/org/apache/sis/storage/FeatureNaming.java |   2 +-
 .../main/org/apache/sis/storage/FeatureQuery.java  |  22 +--
 .../main/org/apache/sis/storage/FeatureSet.java    |   2 +-
 .../sis/storage/ForwardOnlyStorageException.java   |   2 +-
 .../apache/sis/storage/GridCoverageResource.java   |  10 +-
 .../sis/storage/IllegalFeatureTypeException.java   |   2 +-
 .../apache/sis/storage/IllegalNameException.java   |   2 +-
 .../sis/storage/IllegalOpenParameterException.java |   2 +-
 .../sis/storage/IncompatibleResourceException.java |   6 +-
 .../sis/storage/InternalDataStoreException.java    |   2 +-
 .../org/apache/sis/storage/MemoryFeatureSet.java   |   4 +-
 .../sis/storage/MemoryGridCoverageResource.java    |   4 +-
 .../apache/sis/storage/NoSuchDataException.java    |   2 +-
 .../main/org/apache/sis/storage/OptionKey.java     |   2 +-
 .../main/org/apache/sis/storage/ProbeResult.java   |   4 +-
 .../main/org/apache/sis/storage/Query.java         |   6 +-
 .../apache/sis/storage/RasterLoadingStrategy.java  |   2 +-
 .../sis/storage/ReadOnlyStorageException.java      |   2 +-
 .../main/org/apache/sis/storage/Resource.java      |   8 +-
 .../storage/ResourceAlreadyExistsException.java    |   2 +-
 .../org/apache/sis/storage/StorageConnector.java   |  18 +--
 .../sis/storage/UnsupportedEncodingException.java  |   2 +-
 .../sis/storage/UnsupportedQueryException.java     |   2 +-
 .../sis/storage/UnsupportedStorageException.java   |   4 +-
 .../org/apache/sis/storage/WritableAggregate.java  |   2 +-
 .../org/apache/sis/storage/WritableFeatureSet.java |   2 +-
 .../sis/storage/WritableGridCoverageResource.java  |   6 +-
 .../sis/storage/WriteOnlyStorageException.java     |   2 +-
 .../storage/aggregate/ConcatenatedFeatureSet.java  |   4 +-
 .../sis/storage/aggregate/CoverageAggregator.java  |  28 ++--
 .../sis/storage/aggregate/JoinFeatureSet.java      |   6 +-
 .../sis/storage/aggregate/MergeStrategy.java       |  10 +-
 .../apache/sis/storage/aggregate/package-info.java |   2 +-
 .../sis/storage/event/CascadedStoreEvent.java      |   2 +-
 .../org/apache/sis/storage/event/CloseEvent.java   |   2 +-
 .../org/apache/sis/storage/event/StoreEvent.java   |   6 +-
 .../apache/sis/storage/event/StoreListener.java    |   2 +-
 .../apache/sis/storage/event/StoreListeners.java   |  18 +--
 .../org/apache/sis/storage/event/WarningEvent.java |   4 +-
 .../org/apache/sis/storage/event/package-info.java |   2 +-
 .../sis/storage/modifier/CoverageModifier.java     |   6 +-
 .../apache/sis/storage/modifier/package-info.java  |   2 +-
 .../main/org/apache/sis/storage/package-info.java  |   2 +-
 .../main/org/apache/sis/storage/tiling/Tile.java   |   6 +-
 .../org/apache/sis/storage/tiling/TileMatrix.java  |   4 +-
 .../apache/sis/storage/tiling/TileMatrixSet.java   |   4 +-
 .../sis/storage/tiling/TileMatrixSetFormat.java    |   2 +-
 .../apache/sis/storage/tiling/TileReadEvent.java   |   2 +-
 .../org/apache/sis/storage/tiling/TileStatus.java  |   2 +-
 .../sis/storage/tiling/TiledGridCoverage.java      |   2 +-
 .../storage/tiling/TiledGridCoverageResource.java  |   4 +-
 .../apache/sis/storage/tiling/TiledResource.java   |   2 +-
 .../sis/storage/tiling/WritableTileMatrix.java     |   2 +-
 .../sis/storage/tiling/WritableTileMatrixSet.java  |   2 +-
 .../sis/storage/tiling/WritableTiledResource.java  |   2 +-
 .../apache/sis/storage/tiling/package-info.java    |   2 +-
 .../test/module-info.java                          |   2 +-
 .../src/org.apache.sis.util/main/module-info.java  |   2 +-
 .../main/org/apache/sis/io/Authorization.java      |   2 +-
 .../main/org/apache/sis/io/CompoundFormat.java     |  10 +-
 .../main/org/apache/sis/io/IO.java                 |   2 +-
 .../org/apache/sis/io/InvalidSeekException.java    |   2 +-
 .../main/org/apache/sis/io/LineAppender.java       |   6 +-
 .../main/org/apache/sis/io/TableAppender.java      |   8 +-
 .../main/org/apache/sis/io/TabularFormat.java      |   2 +-
 .../main/org/apache/sis/io/package-info.java       |   2 +-
 .../main/org/apache/sis/math/DecimalFunctions.java |   8 +-
 .../main/org/apache/sis/math/Fraction.java         |  16 +--
 .../main/org/apache/sis/math/FunctionProperty.java |   8 +-
 .../main/org/apache/sis/math/Line.java             |   8 +-
 .../main/org/apache/sis/math/MathFunctions.java    |  26 ++--
 .../main/org/apache/sis/math/NumberType.java       |   4 +-
 .../main/org/apache/sis/math/Plane.java            |  10 +-
 .../main/org/apache/sis/math/Statistics.java       |   4 +-
 .../main/org/apache/sis/math/StatisticsFormat.java |   4 +-
 .../main/org/apache/sis/math/Vector.java           |  26 ++--
 .../main/org/apache/sis/math/package-info.java     |   2 +-
 .../org/apache/sis/measure/AbstractConverter.java  |   4 +-
 .../main/org/apache/sis/measure/Angle.java         |   2 +-
 .../main/org/apache/sis/measure/AngleFormat.java   |  12 +-
 .../org/apache/sis/measure/AngularVelocity.java    |   2 +-
 .../org/apache/sis/measure/ElevationAngle.java     |   2 +-
 .../main/org/apache/sis/measure/Latitude.java      |   6 +-
 .../main/org/apache/sis/measure/Longitude.java     |   8 +-
 .../org/apache/sis/measure/MeasurementRange.java   |   6 +-
 .../main/org/apache/sis/measure/NumberRange.java   |  14 +-
 .../main/org/apache/sis/measure/Quantities.java    |   6 +-
 .../org/apache/sis/measure/QuantityFormat.java     |  14 +-
 .../main/org/apache/sis/measure/Range.java         |   8 +-
 .../main/org/apache/sis/measure/RangeFormat.java   |   6 +-
 .../main/org/apache/sis/measure/Salinity.java      |   2 +-
 .../main/org/apache/sis/measure/UnitFormat.java    |   4 +-
 .../main/org/apache/sis/measure/UnitServices.java  |   8 +-
 .../main/org/apache/sis/measure/Units.java         | 156 ++++++++++-----------
 .../main/org/apache/sis/measure/ValueRange.java    |   2 +-
 .../main/org/apache/sis/measure/package-info.java  |   2 +-
 .../main/org/apache/sis/setup/About.java           |   4 +-
 .../main/org/apache/sis/setup/Configuration.java   |   6 +-
 .../main/org/apache/sis/setup/GeometryLibrary.java |  12 +-
 .../apache/sis/setup/InstallationResources.java    |   8 +-
 .../apache/sis/setup/OptionalInstallations.java    |   2 +-
 .../main/org/apache/sis/setup/package-info.java    |   2 +-
 .../sis/util/AbstractInternationalString.java      |   2 +-
 .../apache/sis/util/ArgumentCheckByAssertion.java  |   2 +-
 .../main/org/apache/sis/util/ArgumentChecks.java   |  28 ++--
 .../main/org/apache/sis/util/ArraysExt.java        |  54 +++----
 .../main/org/apache/sis/util/CharSequences.java    |  12 +-
 .../main/org/apache/sis/util/Characters.java       |  10 +-
 .../main/org/apache/sis/util/Classes.java          |  14 +-
 .../main/org/apache/sis/util/ComparisonMode.java   |  14 +-
 .../apache/sis/util/CorruptedObjectException.java  |   6 +-
 .../main/org/apache/sis/util/Debug.java            |   2 +-
 .../sis/util/DefaultInternationalString.java       |   4 +-
 .../main/org/apache/sis/util/Deprecable.java       |   2 +-
 .../main/org/apache/sis/util/Disposable.java       |   2 +-
 .../main/org/apache/sis/util/Emptiable.java        |   2 +-
 .../main/org/apache/sis/util/Exceptions.java       |   6 +-
 .../org/apache/sis/util/LenientComparable.java     |   4 +-
 .../main/org/apache/sis/util/Locales.java          |   2 +-
 .../main/org/apache/sis/util/Localized.java        |   2 +-
 .../main/org/apache/sis/util/Numbers.java          |   8 +-
 .../main/org/apache/sis/util/ObjectConverter.java  |   2 +-
 .../main/org/apache/sis/util/ObjectConverters.java |   2 +-
 .../org/apache/sis/util/OptionalCandidate.java     |   2 +-
 .../main/org/apache/sis/util/Printable.java        |   2 +-
 .../sis/util/ResourceInternationalString.java      |   2 +-
 .../apache/sis/util/SimpleInternationalString.java |   2 +-
 .../main/org/apache/sis/util/StringBuilders.java   |   6 +-
 .../sis/util/UnconvertibleObjectException.java     |   2 +-
 .../org/apache/sis/util/UnknownNameException.java  |   2 +-
 .../util/UnsupportedImplementationException.java   |   2 +-
 .../main/org/apache/sis/util/Utilities.java        |   2 +-
 .../main/org/apache/sis/util/Version.java          |   6 +-
 .../main/org/apache/sis/util/Workaround.java       |   2 +-
 .../sis/util/collection/BackingStoreException.java |   2 +-
 .../main/org/apache/sis/util/collection/Cache.java |  24 ++--
 .../sis/util/collection/CheckedContainer.java      |   6 +-
 .../apache/sis/util/collection/CodeListSet.java    |   4 +-
 .../org/apache/sis/util/collection/Containers.java |  42 +++---
 .../sis/util/collection/DefaultTreeTable.java      |   6 +-
 .../org/apache/sis/util/collection/DerivedSet.java |   2 +-
 .../sis/util/collection/FrequencySortedSet.java    |   2 +-
 .../apache/sis/util/collection/IntegerList.java    |  16 +--
 .../sis/util/collection/ListOfUnknownSize.java     |   2 +-
 .../org/apache/sis/util/collection/RangeSet.java   |   8 +-
 .../sis/util/collection/SetOfUnknownSize.java      |   2 +-
 .../apache/sis/util/collection/TableColumn.java    |   8 +-
 .../org/apache/sis/util/collection/TreeTable.java  |  10 +-
 .../sis/util/collection/TreeTableFormat.java       |   8 +-
 .../org/apache/sis/util/collection/TreeTables.java |   4 +-
 .../apache/sis/util/collection/WeakHashSet.java    |   4 +-
 .../sis/util/collection/WeakValueHashMap.java      |  20 +--
 .../apache/sis/util/collection/package-info.java   |   2 +-
 .../internal/shared/LocalizedParseException.java   |   2 +-
 .../org/apache/sis/util/logging/Initializer.java   |   6 +-
 .../main/org/apache/sis/util/logging/Logging.java  |   8 +-
 .../apache/sis/util/logging/MonolineFormatter.java |   8 +-
 .../apache/sis/util/logging/PerformanceLevel.java  |   6 +-
 .../org/apache/sis/util/logging/package-info.java  |   2 +-
 .../main/org/apache/sis/util/package-info.java     |   2 +-
 .../src/org.apache.sis.web/main/module-info.java   |   2 +-
 .../org/apache/sis/gml/JAXBGeometryAdapter.java    |   2 +-
 .../main/org/apache/sis/gml/package-info.java      |   2 +-
 .../main/org/apache/sis/maths/Matrix2D.java        |   2 +-
 .../main/org/apache/sis/map/MapLayer.java          |   2 +-
 .../main/org/apache/sis/map/MapLayers.java         |   2 +-
 .../org/apache/sis/referencing/rs/CompoundRS.java  |   2 +-
 .../org/apache/sis/storage/rs/CodedCoverage.java   |   4 +-
 .../main/module-info.java                          |   2 +-
 .../org/apache/sis/storage/geopackage/Content.java |   2 +-
 .../sis/storage/geopackage/ContentHandler.java     |   2 +-
 .../apache/sis/storage/geopackage/GpkgStore.java   |   2 +-
 .../sis/storage/geopackage/GpkgStoreProvider.java  |   2 +-
 .../sis/storage/geopackage/package-info.java       |   2 +-
 .../src/org.apache.sis.gui/main/module-info.java   |   2 +-
 .../main/org/apache/sis/gui/DataViewer.java        |   2 +-
 .../main/org/apache/sis/gui/Widget.java            |   4 +-
 .../apache/sis/gui/coverage/CoverageCanvas.java    |  10 +-
 .../apache/sis/gui/coverage/CoverageExplorer.java  |  12 +-
 .../apache/sis/gui/coverage/GridSliceSelector.java |   2 +-
 .../main/org/apache/sis/gui/coverage/GridView.java |   6 +-
 .../sis/gui/coverage/ImagePropertyExplorer.java    |   4 +-
 .../org/apache/sis/gui/coverage/ImageRequest.java  |   2 +-
 .../apache/sis/gui/coverage/TileMatrixSetPane.java |   2 +-
 .../org/apache/sis/gui/coverage/package-info.java  |   2 +-
 .../org/apache/sis/gui/dataset/FeatureTable.java   |   2 +-
 .../main/org/apache/sis/gui/dataset/LogViewer.java |   2 +-
 .../org/apache/sis/gui/dataset/ResourceEvent.java  |   4 +-
 .../apache/sis/gui/dataset/ResourceExplorer.java   |   8 +-
 .../org/apache/sis/gui/dataset/ResourceTree.java   |   8 +-
 .../org/apache/sis/gui/dataset/package-info.java   |   2 +-
 .../org/apache/sis/gui/map/GestureFollower.java    |   2 +-
 .../main/org/apache/sis/gui/map/MapCanvas.java     |  26 ++--
 .../main/org/apache/sis/gui/map/MapCanvasAWT.java  |   4 +-
 .../main/org/apache/sis/gui/map/MapMenu.java       |   2 +-
 .../main/org/apache/sis/gui/map/MapWindows.java    |   2 +-
 .../main/org/apache/sis/gui/map/StatusBar.java     |  18 +--
 .../org/apache/sis/gui/map/ValuesUnderCursor.java  |   8 +-
 .../main/org/apache/sis/gui/map/package-info.java  |   2 +-
 .../apache/sis/gui/metadata/MetadataSummary.java   |   2 +-
 .../org/apache/sis/gui/metadata/MetadataTree.java  |   2 +-
 .../sis/gui/metadata/StandardMetadataTree.java     |   2 +-
 .../org/apache/sis/gui/metadata/package-info.java  |   2 +-
 .../main/org/apache/sis/gui/package-info.java      |   2 +-
 .../org/apache/sis/gui/referencing/CRSChooser.java |   2 +-
 .../gui/referencing/PositionableProjection.java    |   2 +-
 .../gui/referencing/RecentReferenceSystems.java    |   8 +-
 .../apache/sis/gui/referencing/package-info.java   |   2 +-
 .../main/module-info.java                          |   2 +-
 .../sis/resources/embedded/EmbeddedResources.java  |   2 +-
 .../sis/resources/embedded/package-info.java       |   2 +-
 .../main/module-info.java                          |   2 +-
 .../factory/sql/epsg/ScriptProvider.java           |   2 +-
 .../referencing/factory/sql/epsg/package-info.java |   2 +-
 .../main/module-info.java                          |   2 +-
 .../main/org/apache/sis/storage/gdal/Driver.java   |   2 +-
 .../org/apache/sis/storage/gdal/GDALStore.java     |   2 +-
 .../apache/sis/storage/gdal/GDALStoreProvider.java |   6 +-
 .../org/apache/sis/storage/gdal/package-info.java  |   2 +-
 .../apache/sis/storage/panama/package-info.java    |   2 +-
 .../test/module-info.java                          |   2 +-
 762 files changed, 2372 insertions(+), 2372 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
index 2cfcb6040a,f8bbf2b669..bf20163153
--- 
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
+++ 
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
@@@ -386,11 -386,11 +386,11 @@@ public class AbstractIdentifiedType imp
       *
       * @return the remarks, or {@code null} if none.
       *
-      * @since 0.8
+      * @since SIS 0.8
       */
      @Override
 -    public Optional<InternationalString> getRemarks() {
 -        return Optional.ofNullable(deprecated ? description : null);
 +    public InternationalString getRemarks() {
 +        return deprecated ? description : null;
      }
  
      /**
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
index 2dd1b99645,e6251d77f5..1d7b5d4fcf
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
@@@ -563,10 -562,11 +563,10 @@@ public class DefaultExtendedElementInfo
       *
       * @param  newValue  the new rationale.
       *
-      * @since 0.5
+      * @since SIS 0.5
       */
      public void setRationale(final InternationalString newValue) {
 -        checkWritePermission(rationale);
 -        rationale = newValue;
 +        rationales = writeCollection(Containers.singletonOrEmpty(newValue), 
rationales, InternationalString.class);
      }
  
      /**
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
index 323b8ed181,9fb53efe18..b0d6f545f8
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
@@@ -354,9 -354,9 +354,9 @@@ public class DefaultMetadata extends IS
       * @param dateStamp           date that the metadata was created.
       * @param identificationInfo  basic information about the resource to 
which the metadata applies.
       *
-      * @since 1.5
+      * @since SIS 1.5
       */
 -    public DefaultMetadata(final Responsibility contact,
 +    public DefaultMetadata(final ResponsibleParty contact,
                             final Temporal       dateStamp,
                             final Identification identificationInfo)
      {
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
index 05cad24227,518d11e280..8bdacd3114
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
@@@ -296,9 -296,8 +296,9 @@@ public class DefaultObjective extends I
       * Returns the event or events associated with objective completion.
       *
       * @return events associated with objective completion.
 +     *
-      * @since 1.0
++     * @since SIS 1.0
       */
 -    @Override
      @XmlElement(name = "objectiveOccurence", required = true)
      public Collection<Event> getObjectiveOccurrences() {
          return objectiveOccurrences = nonNullCollection(objectiveOccurrences, 
Event.class);
@@@ -319,8 -307,6 +319,8 @@@
       * Sets the event or events associated with objective completion.
       *
       * @param  newValues  the new objective occurrences values.
 +     *
-      * @since 1.0
++     * @since SIS 1.0
       */
      public void setObjectiveOccurrences(final Collection<? extends Event> 
newValues) {
          objectiveOccurrences = writeCollection(newValues, 
objectiveOccurrences, Event.class);
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
index 60eb40ee73,675a6565e1..3754100b40
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
@@@ -47,8 -43,8 +47,8 @@@ import org.apache.sis.temporal.Temporal
   *
   * @author  Cédric Briançon (Geomatys)
   * @author  Martin Desruisseaux (Geomatys)
 - * @version 2.0
 + * @version 1.5
-  * @since   0.3
+  * @since SIS 0.3
   */
  @XmlType(name = "MI_RequestedDate_Type", propOrder = {
      "requestedDateOfCollection",
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
index bffe05b346,9714517ec5..4e4ed1c25f
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
@@@ -66,8 -64,8 +66,8 @@@ import org.apache.sis.temporal.Temporal
   *
   * @author  Cédric Briançon (Geomatys)
   * @author  Martin Desruisseaux (Geomatys)
 - * @version 2.0
 + * @version 1.5
-  * @since   0.3
+  * @since SIS 0.3
   */
  @TitleProperty(name = "identifier")
  @XmlType(name = "MI_Requirement_Type", propOrder = {
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java
index d9c5192cfe,0ae1c38431..c41f4ac8f7
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java
@@@ -72,8 -70,8 +72,8 @@@ import org.apache.sis.temporal.Temporal
   * @author  Cédric Briançon (Geomatys)
   * @author  Rémi Maréchal (Geomatys)
   * @author  Cullen Rombach (Image Matters)
 - * @version 2.0
 + * @version 1.5
-  * @since   0.3
+  * @since SIS 0.3
   */
  @TitleProperty(name = "title")
  @XmlType(name = "CI_Citation_Type", propOrder = {
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
index 6e1e6c20e9,afde2bbeca..d4b15a4abe
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
@@@ -561,9 -507,8 +561,9 @@@ public class DefaultScopeDescription ex
       *
       * @see #getLevel()
       *
-      * @since 1.0
+      * @since SIS 1.0
       */
 +    @SuppressWarnings("deprecation")
      public void setLevelDescription(final ScopeCode level, final Set<? 
extends CharSequence> newValues) {
          if (level == ScopeCode.DATASET) {
              String description = null;
diff --cc 
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/LegacyFeatureType.java
index 1735a1aa68,0000000000..176845e22e
mode 100644,000000..100644
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/LegacyFeatureType.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/LegacyFeatureType.java
@@@ -1,97 -1,0 +1,97 @@@
 +/*
 + * 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.
 + */
 +package org.apache.sis.metadata.iso.maintenance;
 +
 +import java.util.Set;
 +import java.util.LinkedHashSet;
 +import org.opengis.feature.type.FeatureType;
 +import org.opengis.feature.type.AttributeType;
 +import org.apache.sis.xml.bind.gco.CharSequenceAdapter;
 +import org.apache.sis.util.ArgumentChecks;
 +
 +
 +/**
 + * Bridges between deprecated {@link FeatureType} / {@link AttributeType} and 
{@link CharSequence}.
 + * {@code FeatureType} and {@code AttributeType} were used in ISO 19115:2003, 
but have been replaced
 + * by {@link CharSequence} in ISO 19115:2014. The corresponding GeoAPI 3.0 
interfaces are empty since
 + * they were placeholder for future work. We use this {@code 
LegacyFeatureType} as a temporary bridge,
 + * to be removed with GeoAPI 4.0.
 + *
 + * @author  Martin Desruisseaux (Geomatys)
 + * @version 1.0
-  * @since   1.0
++ * @since SIS 1.0
 + *
 + * @deprecated To be removed after migration to GeoAPI 4.0.
 + */
 +@Deprecated
 +public final class LegacyFeatureType implements FeatureType, AttributeType, 
CharSequence {
 +    /**
 +     * The adapter doing most of the actual work of converting {@code 
FeatureType} or {@code AttributeType}
 +     * to {@code <gco:CharacterSequence>} elements.
 +     */
 +    static final CharSequenceAdapter ADAPTER = new CharSequenceAdapter();
 +
 +    /**
 +     * The value to wrap as a {@code FeatureType} or {@code AttributeType}.
 +     */
 +    private final CharSequence value;
 +
 +    /**
 +     * Creates a new type for the given value, which must be non-null.
 +     *
 +     * @param  value  the text to wrap in a legacy feature type.
 +     */
 +    public LegacyFeatureType(final CharSequence value) {
 +        ArgumentChecks.ensureNonNull("value", value);
 +        this.value = value;
 +    }
 +
 +    /**
 +     * Wraps the given {@code FeatureType} or {@code AttributeType} as a 
{@code CharSequence}.
 +     */
 +    static CharSequence wrap(final Object value) {
 +        return (value == null || value instanceof CharSequence)
 +                ? (CharSequence) value : new 
LegacyFeatureType(value.toString());
 +    }
 +
 +    /**
 +     * Returns a list with all content of the given collection wrapped as 
{@link LegacyFeatureType}.
 +     */
 +    static Set<LegacyFeatureType> wrapAll(final Iterable<? extends 
CharSequence> values) {
 +        if (values == null) {
 +            return null;
 +        }
 +        final Set<LegacyFeatureType> wrapped = new LinkedHashSet<>();
 +        for (final CharSequence value : values) {
 +            wrapped.add((value == null || value instanceof LegacyFeatureType)
 +                        ? (LegacyFeatureType) value : new 
LegacyFeatureType(value));
 +        }
 +        return wrapped;
 +    }
 +
 +    /**
 +     * Delegates to the value given at construction time.
 +     */
 +    @Override public int          length()                        {return 
value.length();}
 +    @Override public char         charAt(int index)               {return 
value.charAt(index);}
 +    @Override public CharSequence subSequence(int start, int end) {return 
value.subSequence(start, end);}
 +    @Override public String       toString()                      {return 
value.toString();}
 +    @Override public int          hashCode()                      {return 
value.hashCode() ^ 439703003;}
 +    @Override public boolean      equals(final Object obj) {
 +        return (obj instanceof LegacyFeatureType) && 
value.equals(((LegacyFeatureType) obj).value);
 +    }
 +}
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/MismatchedReferenceSystemException.java
index 5bfd193c2d,0000000000..adf2c6f66b
mode 100644,000000..100644
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/MismatchedReferenceSystemException.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/MismatchedReferenceSystemException.java
@@@ -1,67 -1,0 +1,67 @@@
 +/*
 + * 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.
 + */
 +package org.apache.sis.geometry;
 +
 +// Specific to the geoapi-3.1 branch:
 +import org.opengis.coordinate.MismatchedCoordinateMetadataException;
 +
 +
 +/**
 + * Indicates that an object cannot be constructed because of a mismatch in the
 + * reference systems of components.
 + *
 + * @author  Martin Desruisseaux (IRD)
-  * @since   0.3
++ * @since SIS 0.3
 + * @version 0.3
 + *
 + * @deprecated Replaced by {@link MismatchedCoordinateMetadataException}.
 + */
 +@Deprecated(since = "2.0")  // Temporary version number until this branch is 
released.
 +public class MismatchedReferenceSystemException extends 
MismatchedCoordinateMetadataException {
 +    /**
 +     * Serial number for inter-operability with different versions.
 +     */
 +    private static final long serialVersionUID = 6222334569692693273L;
 +
 +    /**
 +     * Creates an exception with no message.
 +     */
 +    public MismatchedReferenceSystemException() {
 +        super();
 +    }
 +
 +    /**
 +     * Creates an exception with the specified message.
 +     *
 +     * @param  message The detail message. The detail message is saved for
 +     *         later retrieval by the {@link #getMessage()} method.
 +     */
 +    public MismatchedReferenceSystemException(final String message) {
 +        super(message);
 +    }
 +
 +    /**
 +     * Creates an exception with the specified message and cause.
 +     *
 +     * @param  message The detail message. The detail message is saved for
 +     *         later retrieval by the {@link #getMessage()} method.
 +     * @param  cause The cause.
 +     */
 +    public MismatchedReferenceSystemException(final String message, final 
Throwable cause) {
 +        super(message, cause);
 +    }
 +}
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Builder.java
index c2a49f3864,3d6ceb3223..90ebe5cbed
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Builder.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Builder.java
@@@ -692,10 -687,10 +692,10 @@@ public abstract class Builder<B extend
       * @param  object  the object from which to copy the names and 
identifiers.
       * @return {@code this}, for method call chaining.
       *
-      * @since 0.6
+      * @since SIS 0.6
       */
      public B addNamesAndIdentifiers(final IdentifiedObject object) {
 -        for (final Identifier id : object.getIdentifiers()) {
 +        for (final ReferenceIdentifier id : object.getIdentifiers()) {
              if (isValid(id)) {
                  addIdentifier(id);
              }
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java
index b75dc20c20,95f3f754da..dd3f67e052
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java
@@@ -108,10 -105,10 +108,10 @@@ import org.opengis.referencing.Referenc
   * @see org.apache.sis.metadata.iso.DefaultIdentifier
   * @see org.apache.sis.referencing.IdentifiedObjects#toURN(Class, Identifier)
   *
-  * @since 1.0
+  * @since SIS 1.0
   */
  @TitleProperty(name = "code")
 -public class ImmutableIdentifier extends FormattableObject implements 
Identifier, Serializable {
 +public class ImmutableIdentifier extends FormattableObject implements 
ReferenceIdentifier, Serializable {
      /**
       * For cross-version compatibility.
       */
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java
index 0fb39227d6,6029b630b9..8bc78b967c
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java
@@@ -92,9 -89,9 +92,9 @@@ import org.opengis.referencing.Referenc
   * @see org.apache.sis.util.iso.AbstractName
   * @see AbstractIdentifiedObject#getName()
   *
-  * @since 0.4
+  * @since SIS 0.4
   */
 -public class NamedIdentifier extends ImmutableIdentifier implements 
GenericName {
 +public class NamedIdentifier extends ImmutableIdentifier implements 
GenericName, ReferenceIdentifier {
      /**
       * Serial number for inter-operability with different versions.
       */
@@@ -407,11 -404,11 +407,11 @@@
       *
       * @param  object  the object to get as an identifier, or {@code nulk}.
       * @return the given object as an identifier, or {@code null} if the 
argument was null.
-      * @since  1.7
+      * @since SIS 1.7
       */
 -    public static Identifier toIdentifier(final GenericName object) {
 -        if (object == null || object instanceof Identifier) {
 -            return (Identifier) object;
 +    public static ReferenceIdentifier toIdentifier(final GenericName object) {
 +        if (object == null || object instanceof ReferenceIdentifier) {
 +            return (ReferenceIdentifier) object;
          }
          return new NamedIdentifier(object);
      }
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
index d53f5bb24e,1a1849b716..49bc4ff8b1
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
@@@ -82,11 -79,10 +82,11 @@@ import org.opengis.referencing.datum.Da
   *
   * @see 
org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createGeodeticCRS(String)
   *
-  * @since 0.4
+  * @since SIS 0.4
   */
  @XmlTransient
 -public class DefaultGeocentricCRS extends DefaultGeodeticCRS {
 +@SuppressWarnings("deprecation")
 +public class DefaultGeocentricCRS extends DefaultGeodeticCRS implements 
GeocentricCRS {
      /**
       * Serial number for inter-operability with different versions.
       */
@@@ -225,8 -221,8 +225,8 @@@
       * Returns the GeoAPI interface that defines the contract of this 
implementation class.
       * This is the base type required by {@code equals(…)} methods for 
returning a potentially {@code true} value.
       *
 -     * @return {@code GeodeticCRS.class} or a user-defined sub-interface.
 +     * @return {@code GeocentricCRS.class} or a user-defined sub-interface.
-      * @since 1.7
+      * @since SIS 1.7
       */
      @Override
      public Type getStandardType() {
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
index 43a3d958d3,698fd727c0..8804ac925f
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
@@@ -72,10 -68,10 +72,10 @@@ import org.opengis.coordinate.Mismatche
   *
   * @see 
org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createProjectedCRS(String)
   *
-  * @since 0.6
+  * @since SIS 0.6
   */
  @XmlType(name = "ProjectedCRSType", propOrder = {
 -    "baseGeodeticCRS",
 +    "baseCRS",
      "coordinateSystem"
  })
  @XmlRootElement(name = "ProjectedCRS")
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
index d33a0119fe,c1a19b9789..46234e4d90
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
@@@ -323,10 -320,10 +323,10 @@@ public class DefaultTemporalCRS extend
       * @throws NullPointerException if an origin, which are mandatory, is 
null.
       * @throws GeodeticException if the origin is not the same for all 
members of the datum ensemble.
       *
-      * @since 1.5
+      * @since SIS 1.5
       */
      public final Temporal getOrigin() {     // Must be final because invoked 
at construction time.
 -        return DatumOrEnsemble.asDatum(this).getOrigin();
 +        return 
TemporalDate.toTemporal(DatumOrEnsemble.asDatum(this).getOrigin());
      }
  
      /**
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
index d7aed8ca1a,286584e7ae..0bf6ae7b13
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
@@@ -1227,38 -1145,6 +1227,38 @@@ public class GeodeticObjectFactory exte
          return unique("createVerticalDatum", datum);
      }
  
 +    /**
 +     * Creates a dynamic vertical datum from an enumerated type value and a 
frame reference epoch.
 +     * The arguments are the same as for the {@linkplain 
#createVerticalDatum(Map, VerticalDatumType)
 +     * static datum}, with the addition of a mandatory frame reference epoch.
 +     *
 +     * @param  properties  name and other properties to give to the new 
object.
 +     * @param  type        the type of this vertical datum (often geoidal).
 +     * @param  epoch       the epoch to which the definition of the dynamic 
reference frame is referenced.
 +     * @throws FactoryException if the object creation failed.
 +     *
 +     * @see DefaultVerticalDatum.Dynamic#Dynamic(Map, VerticalDatumType, 
Temporal)
 +     * @see GeodeticAuthorityFactory#createVerticalDatum(String)
 +     *
-      * @since 1.5
++     * @since SIS 1.5
 +     *
 +     * @deprecated As of ISO 19111:2019, the {@code VerticalDatumType} 
argument is replaced by {@code RealizationMethod}.
 +     */
 +    @Deprecated(since = "2.0")  // Temporary version number until this branch 
is released.
 +    public VerticalDatum createVerticalDatum(final Map<String,?> properties,
 +                                             final VerticalDatumType type,
 +                                             final Temporal epoch)
 +            throws FactoryException
 +    {
 +        final DefaultVerticalDatum datum;
 +        try {
 +            datum = new DefaultVerticalDatum.Dynamic(complete(properties), 
type, epoch);
 +        } catch (IllegalArgumentException exception) {
 +            throw new InvalidGeodeticParameterException(exception);
 +        }
 +        return unique("createVerticalDatum", datum);
 +    }
 +
      /**
       * Creates a vertical coordinate system.
       * This coordinate system can be used with vertical and derived CRS.
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
index e1d05405f8,1a7b9032ce..0a419ca8fa
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
@@@ -230,10 -227,9 +230,10 @@@ public class CoordinateOperationFinder 
       * @throws OperationNotFoundException if no operation path was found from 
{@code sourceCRS} to {@code targetCRS}.
       * @throws FactoryException if the operation creation failed for some 
other reason.
       *
-      * @since 1.0
+      * @since SIS 1.0
       */
      @Override
 +    @SuppressWarnings("deprecation")
      public List<CoordinateOperation> createOperations(final 
CoordinateReferenceSystem sourceCRS,
                                                        final 
CoordinateReferenceSystem targetCRS)
              throws FactoryException
diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
index e437d87f5f,6cabaee518..0e6f35d892
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
@@@ -335,9 -328,8 +335,9 @@@ public class DefaultConversion extends 
       *         parameter values}, or a {@linkplain 
CoordinateSystems#swapAndScaleAxes change of axis order or units}
       *         failed.
       *
-      * @since 1.5
+      * @since SIS 1.5
       */
 +    @SuppressWarnings("deprecation")
      public Conversion specialize(final CoordinateReferenceSystem sourceCRS,
                                   final CoordinateReferenceSystem targetCRS,
                                   MathTransformFactory factory) throws 
FactoryException
diff --cc 
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
index f86c126317,9912eeb342..36a3150d00
--- 
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
+++ 
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
@@@ -34,8 -34,6 +34,8 @@@ import org.apache.sis.test.FailureDetai
   *
   * @author  Cédric Briançon (Geomatys)
   * @author  Martin Desruisseaux (Geomatys)
 + * @version 1.4
-  * @since   1.1
++ * @since SIS 1.1
   */
  @ExtendWith(FailureDetailsReporter.class)
  public final class AuthorityFactoryTest extends 
org.opengis.test.referencing.AuthorityFactoryTest {
diff --cc 
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
index a9c8a40a32,05ff9a6d14..2d39ad7f41
--- 
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
+++ 
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
@@@ -34,8 -34,6 +34,8 @@@ import org.apache.sis.test.FailureDetai
   * Runs a suite of tests provided in the GeoAPI project.
   *
   * @author  Martin Desruisseaux (Geomatys)
 + * @version 1.4
-  * @since   1.1
++ * @since SIS 1.1
   */
  @ExtendWith(FailureDetailsReporter.class)
  public final class ParameterizedTransformTest extends 
org.opengis.test.referencing.ParameterizedTransformTest {

Reply via email to