You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/11/23 19:07:03 UTC
(sis) 01/01: Merge branch 'geoapi-3.1'. This is only about imports order.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 54a8cfd70f20a6de8e4f14881f55316e5d73c96b
Merge: b9cb14901d bc9edad990
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Nov 23 19:52:42 2023 +0100
Merge branch 'geoapi-3.1'.
This is only about imports order.
.../org/apache/sis/buildtools/book/Assembler.java | 1 -
.../resources/IndexedResourceCompilerTest.java | 1 -
.../sis/cloud/aws/s3/ClientFileSystemTest.java | 3 +--
.../sis/cloud/aws/s3/KeyPathMatcherTest.java | 3 +--
.../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 3 +--
.../org/apache/sis/console/TransformCommand.java | 3 +--
.../org/apache/sis/console/TranslateCommand.java | 2 +-
.../org/apache/sis/console/AboutCommandTest.java | 3 +--
.../org/apache/sis/console/CRSCommandTest.java | 3 +--
.../org/apache/sis/console/CommandRunnerTest.java | 3 +--
.../org/apache/sis/console/HelpCommandTest.java | 3 +--
.../apache/sis/console/MetadataCommandTest.java | 3 +--
.../apache/sis/console/MimeTypeCommandTest.java | 3 +--
.../main/org/apache/sis/coverage/Category.java | 3 +--
.../main/org/apache/sis/coverage/CategoryList.java | 5 ++---
.../org/apache/sis/coverage/CoverageCombiner.java | 3 +--
.../apache/sis/coverage/grid/GridCoverage2D.java | 9 ++++----
.../org/apache/sis/coverage/grid/GridGeometry.java | 1 -
.../apache/sis/coverage/grid/ImageRenderer.java | 11 +++++----
.../apache/sis/coverage/grid/PixelTranslation.java | 3 +--
.../apache/sis/coverage/grid/ReshapedImage.java | 5 ++---
.../sis/coverage/grid/j2d/ImageUtilities.java | 11 +++++----
.../sis/coverage/grid/j2d/TileOpExecutor.java | 15 ++++++-------
.../apache/sis/feature/AbstractIdentifiedType.java | 1 -
.../apache/sis/feature/CharacteristicTypeMap.java | 1 -
.../apache/sis/feature/DefaultAssociationRole.java | 1 -
.../apache/sis/feature/DefaultAttributeType.java | 1 -
.../org/apache/sis/feature/PropertySingleton.java | 1 -
.../main/org/apache/sis/filter/internal/XPath.java | 1 -
.../main/org/apache/sis/filter/sqlmm/SQLMM.java | 1 -
.../main/org/apache/sis/filter/sqlmm/ST_Point.java | 3 +--
.../org/apache/sis/geometry/wrapper/jts/JTS.java | 1 -
.../apache/sis/image/BandedSampleConverter.java | 1 -
.../main/org/apache/sis/image/DataType.java | 1 -
.../main/org/apache/sis/image/MaskImage.java | 1 -
.../main/org/apache/sis/image/MaskedImage.java | 1 -
.../main/org/apache/sis/image/PixelIterator.java | 3 +--
.../main/org/apache/sis/image/PlanarImage.java | 3 +--
.../main/org/apache/sis/image/ResampledImage.java | 1 -
.../main/org/apache/sis/image/ResamplingGrid.java | 3 +--
.../sis/image/processing/isoline/Isolines.java | 1 -
.../org/apache/sis/coverage/CategoryListTest.java | 3 +--
.../test/org/apache/sis/coverage/CategoryTest.java | 5 ++---
.../apache/sis/coverage/CoverageCombinerTest.java | 3 +--
.../apache/sis/coverage/SampleDimensionTest.java | 3 +--
.../apache/sis/coverage/SampleRangeFormatTest.java | 1 -
.../grid/BandAggregateGridCoverageTest.java | 5 ++---
.../coverage/grid/BufferedGridCoverageTest.java | 1 -
.../coverage/grid/ConvertedGridCoverageTest.java | 7 +++---
.../coverage/grid/DimensionalityReductionTest.java | 3 +--
.../grid/FractionalGridCoordinatesTest.java | 3 +--
.../sis/coverage/grid/GridCoverage2DTest.java | 5 ++---
.../sis/coverage/grid/GridCoverageBuilderTest.java | 3 +--
.../sis/coverage/grid/GridDerivationTest.java | 7 +++---
.../apache/sis/coverage/grid/GridExtentTest.java | 4 +---
.../apache/sis/coverage/grid/GridGeometryTest.java | 3 +--
.../sis/coverage/grid/GridOrientationTest.java | 3 +--
.../sis/coverage/grid/PixelTranslationTest.java | 3 +--
.../coverage/grid/ResampledGridCoverageTest.java | 7 +++---
.../sis/coverage/grid/ReshapedImageTest.java | 3 +--
.../coverage/grid/TranslatedGridCoverageTest.java | 3 +--
.../coverage/grid/j2d/ColorModelBuilderTest.java | 3 +--
.../sis/coverage/grid/j2d/ImageLayoutTest.java | 3 +--
.../sis/coverage/grid/j2d/ImageUtilitiesTest.java | 5 ++---
.../coverage/grid/j2d/SampleModelFactoryTest.java | 3 +--
.../coverage/grid/j2d/ScaledColorSpaceTest.java | 7 +++---
.../sis/coverage/internal/RangeArgumentTest.java | 3 +--
.../apache/sis/feature/AbstractFeatureTest.java | 3 +--
.../apache/sis/feature/AbstractOperationTest.java | 3 +--
.../test/org/apache/sis/feature/Assertions.java | 1 +
.../apache/sis/feature/CharacteristicMapTest.java | 3 +--
.../sis/feature/CharacteristicTypeMapTest.java | 5 ++---
.../sis/feature/DefaultAssociationRoleTest.java | 5 ++---
.../sis/feature/DefaultAttributeTypeTest.java | 5 ++---
.../apache/sis/feature/DefaultFeatureTypeTest.java | 3 +--
.../apache/sis/feature/EnvelopeOperationTest.java | 5 ++---
.../org/apache/sis/feature/FeatureFormatTest.java | 1 -
.../apache/sis/feature/FeatureOperationsTest.java | 5 ++---
.../org/apache/sis/feature/FeatureTestCase.java | 5 ++---
.../test/org/apache/sis/feature/FeaturesTest.java | 3 +--
.../sis/feature/GroupAsPolylineOperationTest.java | 3 +--
.../org/apache/sis/feature/LinkOperationTest.java | 3 +--
.../sis/feature/MultiValuedAttributeTest.java | 3 +--
.../apache/sis/feature/PropertySingletonTest.java | 3 +--
.../sis/feature/SingletonAssociationTest.java | 3 +--
.../apache/sis/feature/SingletonAttributeTest.java | 3 +--
.../sis/feature/StringJoinOperationTest.java | 3 +--
.../builder/AssociationRoleBuilderTest.java | 3 +--
.../feature/builder/AttributeTypeBuilderTest.java | 5 ++---
.../builder/CharacteristicTypeBuilderTest.java | 3 +--
.../feature/builder/FeatureTypeBuilderTest.java | 5 ++---
.../feature/internal/AttributeConventionTest.java | 3 +--
.../apache/sis/feature/test/FeatureComparator.java | 1 +
.../apache/sis/filter/ArithmeticFunctionTest.java | 3 +--
.../sis/filter/BinarySpatialFilterTestCase.java | 5 ++---
.../apache/sis/filter/ComparisonFilterTest.java | 3 +--
.../apache/sis/filter/IdentifierFilterTest.java | 3 +--
.../org/apache/sis/filter/LeafExpressionTest.java | 3 +--
.../test/org/apache/sis/filter/LikeFilterTest.java | 3 +--
.../org/apache/sis/filter/LogicalFilterTest.java | 3 +--
.../org/apache/sis/filter/TemporalFilterTest.java | 7 +++---
.../test/org/apache/sis/filter/XPathTest.java | 3 +--
.../sis/filter/internal/FunctionNamesTest.java | 3 +--
.../apache/sis/filter/sqlmm/RegistryTestCase.java | 5 ++---
.../org/apache/sis/filter/sqlmm/SQLMMTest.java | 5 ++---
.../sis/geometry/wrapper/GeometriesTestCase.java | 5 ++---
.../sis/geometry/wrapper/GeometryTypeTest.java | 3 +--
.../geometry/wrapper/StandardGeometriesTest.java | 1 -
.../sis/geometry/wrapper/esri/FactoryTest.java | 1 -
.../sis/geometry/wrapper/j2d/FactoryTest.java | 3 +--
.../sis/geometry/wrapper/j2d/FlatShapeTest.java | 1 -
.../geometry/wrapper/j2d/ShapePropertiesTest.java | 3 +--
.../sis/geometry/wrapper/jts/FactoryTest.java | 3 +--
.../apache/sis/geometry/wrapper/jts/JTSTest.java | 3 +--
.../sis/geometry/wrapper/jts/ShapeAdapterTest.java | 3 +--
.../geometry/wrapper/jts/ShapeConverterTest.java | 3 +--
.../apache/sis/image/BandAggregateImageTest.java | 3 +--
.../org/apache/sis/image/BandSelectImageTest.java | 5 ++---
.../org/apache/sis/image/BandedIteratorTest.java | 1 +
.../sis/image/BandedSampleConverterTest.java | 1 -
.../org/apache/sis/image/ComputedImageTest.java | 5 ++---
.../test/org/apache/sis/image/DataTypeTest.java | 3 +--
.../org/apache/sis/image/ImageCombinerTest.java | 3 +--
.../org/apache/sis/image/ImageProcessorTest.java | 3 +--
.../test/org/apache/sis/image/ImageTestCase.java | 5 ++---
.../org/apache/sis/image/InterpolationTest.java | 3 +--
.../org/apache/sis/image/LinearIteratorTest.java | 1 +
.../test/org/apache/sis/image/MaskedImageTest.java | 3 +--
.../org/apache/sis/image/PixelIteratorTest.java | 3 +--
.../test/org/apache/sis/image/PlanarImageTest.java | 1 -
.../org/apache/sis/image/ResampledImageTest.java | 3 +--
.../org/apache/sis/image/ResamplingGridTest.java | 5 ++---
.../apache/sis/image/StatisticsCalculatorTest.java | 5 ++---
.../test/org/apache/sis/image/TestViewer.java | 1 -
.../test/org/apache/sis/image/TiledImageMock.java | 1 +
.../sis/image/processing/isoline/IsolinesTest.java | 3 +--
.../sis/image/processing/isoline/StepsViewer.java | 1 +
.../apache/sis/index/tree/PointTreeNodeTest.java | 3 +--
.../org/apache/sis/index/tree/PointTreeTest.java | 3 +--
.../org/apache/sis/metadata/MetadataStandard.java | 1 -
.../apache/sis/metadata/ModifiableMetadata.java | 1 -
.../org/apache/sis/metadata/PropertyAccessor.java | 1 -
.../main/org/apache/sis/metadata/Pruner.java | 1 -
.../main/org/apache/sis/metadata/ValueMap.java | 1 -
.../apache/sis/metadata/internal/AxisNames.java | 3 +--
.../sis/metadata/internal/NameToIdentifier.java | 1 -
.../iso/DefaultExtendedElementInformation.java | 2 --
.../apache/sis/metadata/iso/DefaultIdentifier.java | 1 -
.../apache/sis/metadata/iso/DefaultMetadata.java | 3 +--
.../sis/metadata/iso/DefaultMetadataScope.java | 1 -
.../org/apache/sis/metadata/iso/ISOMetadata.java | 1 -
.../acquisition/DefaultEnvironmentalRecord.java | 1 -
.../sis/metadata/iso/acquisition/DefaultEvent.java | 1 -
.../iso/acquisition/DefaultRequestedDate.java | 1 -
.../iso/acquisition/DefaultRequirement.java | 1 -
.../sis/metadata/iso/citation/AbstractParty.java | 1 -
.../sis/metadata/iso/citation/DefaultCitation.java | 2 --
.../metadata/iso/citation/DefaultCitationDate.java | 1 -
.../sis/metadata/iso/citation/DefaultContact.java | 3 +--
.../metadata/iso/citation/DefaultIndividual.java | 1 -
.../iso/citation/DefaultOnlineResource.java | 1 -
.../metadata/iso/citation/DefaultOrganisation.java | 1 -
.../iso/citation/DefaultResponsibility.java | 1 -
.../iso/citation/DefaultResponsibleParty.java | 1 -
.../metadata/iso/citation/DefaultTelephone.java | 5 ++---
.../iso/constraint/DefaultConstraints.java | 3 +--
.../iso/constraint/DefaultReleasability.java | 3 +--
.../iso/content/DefaultAttributeGroup.java | 1 -
.../sis/metadata/iso/content/DefaultBand.java | 2 --
.../iso/content/DefaultCoverageDescription.java | 2 --
.../DefaultFeatureCatalogueDescription.java | 2 --
.../iso/content/DefaultFeatureTypeInfo.java | 2 --
.../iso/content/DefaultImageDescription.java | 1 -
.../iso/content/DefaultRangeDimension.java | 1 -
.../iso/content/DefaultSampleDimension.java | 2 --
.../DefaultDigitalTransferOptions.java | 2 --
.../iso/distribution/DefaultDistribution.java | 1 -
.../metadata/iso/distribution/DefaultFormat.java | 1 -
.../metadata/iso/distribution/DefaultMedium.java | 2 --
.../distribution/DefaultStandardOrderProcess.java | 2 --
.../iso/extent/DefaultGeographicBoundingBox.java | 3 +--
.../iso/extent/DefaultSpatialTemporalExtent.java | 2 --
.../apache/sis/metadata/iso/extent/Extents.java | 3 +--
.../iso/identification/AbstractIdentification.java | 1 -
.../identification/DefaultAssociatedResource.java | 1 -
.../iso/identification/DefaultBrowseGraphic.java | 1 -
.../iso/identification/DefaultCoupledResource.java | 1 -
.../identification/DefaultDataIdentification.java | 3 +--
.../iso/identification/DefaultKeywords.java | 1 -
.../DefaultOperationChainMetadata.java | 1 -
.../identification/DefaultOperationMetadata.java | 3 +--
.../DefaultRepresentativeFraction.java | 1 -
.../iso/identification/DefaultResolution.java | 2 --
.../DefaultServiceIdentification.java | 3 +--
.../metadata/iso/identification/DefaultUsage.java | 2 --
.../sis/metadata/iso/lineage/DefaultLineage.java | 1 -
.../iso/lineage/DefaultNominalResolution.java | 1 -
.../metadata/iso/lineage/DefaultProcessStep.java | 1 -
.../sis/metadata/iso/lineage/DefaultSource.java | 1 -
.../maintenance/DefaultMaintenanceInformation.java | 2 --
.../sis/metadata/iso/maintenance/DefaultScope.java | 5 ++---
.../iso/maintenance/DefaultScopeDescription.java | 1 -
.../iso/quality/AbstractDataEvaluation.java | 1 -
.../sis/metadata/iso/quality/AbstractElement.java | 2 --
.../metadata/iso/quality/AbstractMetaquality.java | 1 -
.../sis/metadata/iso/quality/AbstractResult.java | 1 -
.../iso/quality/AbstractTemporalQuality.java | 1 -
.../iso/quality/DefaultAggregationDerivation.java | 1 -
.../metadata/iso/quality/DefaultBasicMeasure.java | 1 -
.../metadata/iso/quality/DefaultConfidence.java | 1 -
.../iso/quality/DefaultCoverageResult.java | 1 -
.../metadata/iso/quality/DefaultDataQuality.java | 3 +--
.../iso/quality/DefaultDescriptiveResult.java | 1 -
.../iso/quality/DefaultEvaluationMethod.java | 2 --
.../DefaultEvaluationReportInformation.java | 1 -
.../iso/quality/DefaultFullInspection.java | 1 -
.../metadata/iso/quality/DefaultHomogeneity.java | 1 -
.../iso/quality/DefaultIndirectEvaluation.java | 1 -
.../iso/quality/DefaultMeasureDescription.java | 1 -
.../iso/quality/DefaultMeasureReference.java | 1 -
...DefaultNonQuantitativeAttributeCorrectness.java | 1 -
.../iso/quality/DefaultQualityMeasure.java | 1 -
.../iso/quality/DefaultRepresentativity.java | 1 -
.../iso/quality/DefaultSampleBasedInspection.java | 1 -
.../iso/quality/DefaultSourceReference.java | 1 -
.../sis/metadata/iso/spatial/DefaultDimension.java | 2 --
.../iso/spatial/DefaultGeometricObjects.java | 1 -
.../spatial/DefaultGridSpatialRepresentation.java | 1 -
.../apache/sis/metadata/simple/SimpleExtent.java | 1 -
.../metadata/simple/SimpleIdentifiedObject.java | 1 -
.../apache/sis/metadata/sql/MetadataFallback.java | 3 +--
.../apache/sis/metadata/sql/util/Initializer.java | 1 -
.../sis/pending/geoapi/evolution/Interim.java | 3 +--
.../geoapi/evolution/UnsupportedCodeList.java | 1 -
.../org/apache/sis/util/iso/DefaultMemberName.java | 1 -
.../org/apache/sis/util/iso/DefaultNameSpace.java | 1 -
.../main/org/apache/sis/util/iso/Names.java | 1 -
.../main/org/apache/sis/xml/Namespaces.java | 1 -
.../main/org/apache/sis/xml/ReferenceResolver.java | 1 -
.../org/apache/sis/xml/TransformingReader.java | 3 +--
.../org/apache/sis/xml/TransformingWriter.java | 3 +--
.../main/org/apache/sis/xml/XML.java | 1 -
.../apache/sis/xml/bind/IdentifierMapAdapter.java | 1 -
.../org/apache/sis/xml/bind/cat/CodeListUID.java | 1 -
.../apache/sis/xml/bind/gmi/LE_ProcessStep.java | 1 -
.../sis/xml/bind/gmi/MI_CoverageDescription.java | 1 -
.../apache/sis/xml/bind/gmi/MI_Georectified.java | 1 -
.../sis/xml/bind/gmi/MI_Georeferenceable.java | 1 -
.../sis/xml/bind/gmi/MI_ImageDescription.java | 1 -
.../org/apache/sis/xml/bind/gmi/MI_Metadata.java | 1 -
.../org/apache/sis/xml/bind/gml/TimePeriod.java | 1 -
.../bind/metadata/replace/ServiceParameter.java | 1 -
.../org/apache/sis/xml/util/LegacyNamespaces.java | 1 -
.../main/org/apache/sis/xml/util/XmlUtilities.java | 3 +--
.../apache/sis/metadata/AbstractMetadataTest.java | 3 +--
.../test/org/apache/sis/metadata/Assertions.java | 3 +--
.../test/org/apache/sis/metadata/HashCodeTest.java | 3 +--
.../apache/sis/metadata/InformationMapTest.java | 3 +--
.../apache/sis/metadata/MetadataCopierTest.java | 3 +--
.../apache/sis/metadata/MetadataStandardTest.java | 3 +--
.../sis/metadata/ModifiableMetadataTest.java | 5 ++---
.../test/org/apache/sis/metadata/NameMapTest.java | 7 +++---
.../org/apache/sis/metadata/NilReasonMapTest.java | 5 ++---
.../apache/sis/metadata/PropertyAccessorTest.java | 11 +++++----
.../sis/metadata/PropertyInformationTest.java | 5 ++---
.../test/org/apache/sis/metadata/PrunerTest.java | 5 ++---
.../org/apache/sis/metadata/SpecialCasesTest.java | 5 ++---
.../apache/sis/metadata/TreeNodeChildrenTest.java | 3 +--
.../test/org/apache/sis/metadata/TreeNodeTest.java | 3 +--
.../apache/sis/metadata/TreeTableFormatTest.java | 3 +--
.../org/apache/sis/metadata/TreeTableViewTest.java | 3 +--
.../test/org/apache/sis/metadata/TypeMapTest.java | 5 ++---
.../test/org/apache/sis/metadata/ValueMapTest.java | 9 ++++----
.../sis/metadata/internal/AxisNamesTest.java | 3 +--
.../sis/metadata/internal/IdentifiersTest.java | 3 +--
.../internal/ImplementationHelperTest.java | 5 ++---
.../apache/sis/metadata/internal/MergerTest.java | 3 +--
.../sis/metadata/internal/NameMeaningTest.java | 3 +--
.../org/apache/sis/metadata/iso/APIVerifier.java | 3 +--
.../sis/metadata/iso/CustomMetadataTest.java | 3 +--
.../sis/metadata/iso/DefaultIdentifierTest.java | 3 +--
.../sis/metadata/iso/DefaultMetadataTest.java | 3 +--
.../sis/metadata/iso/citation/CitationsTest.java | 5 ++---
.../iso/citation/DefaultCitationDateTest.java | 3 +--
.../metadata/iso/citation/DefaultCitationTest.java | 5 ++---
.../metadata/iso/citation/DefaultContactTest.java | 3 +--
.../iso/citation/DefaultResponsibilityTest.java | 1 -
.../constraint/DefaultLegalConstraintsTest.java | 5 ++---
.../sis/metadata/iso/content/DefaultBandTest.java | 5 ++---
.../sis/metadata/iso/extent/DefaultExtentTest.java | 5 ++---
.../extent/DefaultGeographicBoundingBoxTest.java | 5 ++---
.../sis/metadata/iso/extent/ExtentsTest.java | 5 ++---
.../identification/DefaultBrowseGraphicTest.java | 5 ++---
.../identification/DefaultCoupledResourceTest.java | 3 +--
.../DefaultDataIdentificationTest.java | 3 +--
.../iso/identification/DefaultKeywordsTest.java | 3 +--
.../DefaultRepresentativeFractionTest.java | 3 +--
.../iso/identification/DefaultResolutionTest.java | 5 ++---
.../DefaultServiceIdentificationTest.java | 5 ++---
.../metadata/iso/lineage/DefaultLineageTest.java | 3 +--
.../iso/lineage/DefaultProcessStepTest.java | 3 +--
.../maintenance/DefaultScopeDescriptionTest.java | 3 +--
.../metadata/iso/quality/AbstractElementTest.java | 3 +--
.../quality/AbstractPositionalAccuracyTest.java | 9 ++++----
.../iso/quality/DefaultConformanceResultTest.java | 3 +--
.../iso/quality/DefaultDomainConsistencyTest.java | 3 +--
.../iso/quality/DefaultEvaluationMethodTest.java | 3 +--
.../iso/quality/DefaultQuantitativeResultTest.java | 3 +--
.../sis/metadata/iso/quality/ScopeCodeTest.java | 3 +--
.../iso/spatial/DefaultGeorectifiedTest.java | 3 +--
.../sis/metadata/simple/SimpleIdentifierTest.java | 3 +--
.../sis/metadata/sql/IdentifierGeneratorTest.java | 3 +--
.../sis/metadata/sql/MetadataFallbackVerifier.java | 3 +--
.../sis/metadata/sql/MetadataSourceTest.java | 3 +--
.../sis/metadata/sql/MetadataWriterTest.java | 3 +--
.../org/apache/sis/metadata/sql/TestDatabase.java | 3 +--
.../sis/metadata/sql/util/SQLUtilitiesTest.java | 3 +--
.../sis/metadata/sql/util/ScriptRunnerTest.java | 3 +--
.../sis/metadata/sql/util/TypeMapperTest.java | 3 +--
.../apache/sis/util/iso/DefaultLocalNameTest.java | 8 +++----
.../sis/util/iso/DefaultNameFactoryTest.java | 3 +--
.../sis/util/iso/DefaultRecordSchemaTest.java | 3 +--
.../org/apache/sis/util/iso/DefaultRecordTest.java | 3 +--
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 3 +--
.../apache/sis/util/iso/DefaultScopedNameTest.java | 5 ++---
.../apache/sis/util/iso/NameMarshallingTest.java | 3 +--
.../test/org/apache/sis/util/iso/NamesTest.java | 3 +--
.../org/apache/sis/util/iso/TypeNamesTest.java | 5 ++---
.../test/org/apache/sis/util/iso/TypesTest.java | 3 +--
.../sis/xml/CharSequenceSubstitutionTest.java | 7 +++---
.../test/org/apache/sis/xml/LegacyCodesTest.java | 6 ++---
.../org/apache/sis/xml/MarshallerPoolTest.java | 3 +--
.../test/org/apache/sis/xml/NamespacesTest.java | 6 ++---
.../apache/sis/xml/NilReasonMarshallingTest.java | 5 ++---
.../test/org/apache/sis/xml/NilReasonTest.java | 3 +--
.../test/org/apache/sis/xml/TransformerTest.java | 3 +--
.../apache/sis/xml/TransformingNamespacesTest.java | 3 +--
.../org/apache/sis/xml/UUIDMarshallingTest.java | 5 ++---
.../org/apache/sis/xml/ValueConverterTest.java | 9 ++++----
.../org/apache/sis/xml/XLinkMarshallingTest.java | 5 ++---
.../test/org/apache/sis/xml/XLinkTest.java | 3 +--
.../test/org/apache/sis/xml/XPointerTest.java | 3 +--
.../sis/xml/bind/IdentifierMapAdapterTest.java | 5 ++---
.../sis/xml/bind/ModifiableIdentifierMapTest.java | 7 +++---
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 3 +--
.../apache/sis/xml/bind/cat/EnumAdapterTest.java | 3 +--
.../sis/xml/bind/cat/EnumMarshallingTest.java | 3 +--
.../apache/sis/xml/bind/gco/MultiplicityTest.java | 5 ++---
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 3 +--
.../apache/sis/xml/bind/gco/StringAdapterTest.java | 3 +--
.../org/apache/sis/xml/bind/gml/MeasureTest.java | 3 +--
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 3 +--
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 3 +--
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 5 ++---
.../apache/sis/xml/bind/lan/OtherLocalesTest.java | 5 ++---
.../org/apache/sis/xml/bind/lan/PT_LocaleTest.java | 3 +--
.../metadata/replace/QualityParameterTest.java | 3 +--
.../metadata/replace/ServiceParameterTest.java | 3 +--
.../apache/sis/xml/test/DocumentComparator.java | 5 +++--
.../test/org/apache/sis/xml/test/TestCase.java | 1 -
.../sis/xml/util/DocumentComparatorTest.java | 3 +--
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 5 ++---
.../sis/openoffice/ReferencingFunctionsTest.java | 5 ++---
.../org/apache/sis/openoffice/TransformerTest.java | 5 ++---
.../MultiResolutionCoverageLoaderTest.java | 3 +--
.../apache/sis/style/se1/ChannelSelectionTest.java | 1 -
.../sis/style/se1/ContrastEnhancementTest.java | 1 -
.../apache/sis/style/se1/ExternalGraphicTest.java | 1 -
.../apache/sis/style/se1/FeatureTypeStyleTest.java | 1 -
.../test/org/apache/sis/style/se1/FontTest.java | 1 -
.../test/org/apache/sis/style/se1/GraphicTest.java | 1 -
.../test/org/apache/sis/style/se1/HaloTest.java | 1 -
.../apache/sis/style/se1/LineSymbolizerTest.java | 1 -
.../test/org/apache/sis/style/se1/MarkTest.java | 1 -
.../apache/sis/style/se1/PointPlacementTest.java | 1 -
.../apache/sis/style/se1/PointSymbolizerTest.java | 1 -
.../sis/style/se1/PolygonSymbolizerTest.java | 1 -
.../apache/sis/style/se1/RasterSymbolizerTest.java | 1 -
.../test/org/apache/sis/style/se1/RuleTest.java | 1 -
.../apache/sis/style/se1/SelectedChannelTest.java | 1 -
.../org/apache/sis/style/se1/ShadedReliefTest.java | 1 -
.../test/org/apache/sis/style/se1/StrokeTest.java | 1 -
.../org/apache/sis/style/se1/StyleTestCase.java | 3 +--
.../org/apache/sis/style/se1/SymbolizerTest.java | 1 -
.../org/apache/sis/style/se1/SymbologyTest.java | 1 -
.../apache/sis/style/se1/TextSymbolizerTest.java | 1 -
.../sis/profile/france/FrenchProfileTest.java | 3 +--
.../sis/xml/bind/fra/DataIdentificationTest.java | 1 -
.../xml/bind/fra/DirectReferenceSystemTest.java | 3 +--
.../apache/sis/profile/japan/JapanProfileTest.java | 3 +--
.../gazetteer/GazetteerFactoryTest.java | 3 +--
.../gazetteer/GeohashReferenceSystemTest.java | 3 +--
.../referencing/gazetteer/LocationFormatTest.java | 1 -
.../referencing/gazetteer/LocationTypeTest.java | 3 +--
.../gazetteer/MilitaryGridReferenceSystemTest.java | 7 +++---
.../gazetteer/ReferencingByIdentifiersTest.java | 3 +--
.../org/apache/sis/geometry/DirectPosition2D.java | 3 +--
.../main/org/apache/sis/geometry/Envelope2D.java | 7 +++---
.../main/org/apache/sis/io/wkt/AbstractParser.java | 1 -
.../main/org/apache/sis/io/wkt/Element.java | 1 -
.../apache/sis/io/wkt/GeodeticObjectParser.java | 3 +--
.../org/apache/sis/io/wkt/MathTransformParser.java | 1 -
.../main/org/apache/sis/io/wkt/Symbols.java | 1 -
.../sis/parameter/AbstractParameterDescriptor.java | 1 -
.../sis/parameter/DefaultParameterDescriptor.java | 1 -
.../parameter/DefaultParameterDescriptorGroup.java | 1 -
.../sis/parameter/DefaultParameterValue.java | 1 -
.../sis/parameter/MapProjectionParameters.java | 3 +--
.../sis/parameter/MatrixParametersAlphaNum.java | 1 -
.../org/apache/sis/parameter/ParameterBuilder.java | 1 -
.../org/apache/sis/parameter/ParameterFormat.java | 1 -
.../apache/sis/parameter/ParameterTableRow.java | 1 -
.../sis/referencing/AbstractIdentifiedObject.java | 1 -
.../main/org/apache/sis/referencing/Builder.java | 1 -
.../main/org/apache/sis/referencing/CommonCRS.java | 5 ++---
.../referencing/EllipsoidalHeightSeparator.java | 1 -
.../sis/referencing/GeodesicsOnEllipsoid.java | 3 +--
.../apache/sis/referencing/GeodeticCalculator.java | 3 +--
.../apache/sis/referencing/IdentifiedObjects.java | 1 -
.../sis/referencing/ImmutableIdentifier.java | 1 -
.../org/apache/sis/referencing/NameIterator.java | 1 -
.../sis/referencing/PropertiesConverter.java | 5 ++---
.../sis/referencing/StandardDefinitions.java | 11 +++++----
.../apache/sis/referencing/crs/AbstractCRS.java | 1 -
.../sis/referencing/crs/AbstractDerivedCRS.java | 1 -
.../sis/referencing/crs/DefaultEngineeringCRS.java | 1 -
.../sis/referencing/crs/DefaultGeodeticCRS.java | 1 -
.../sis/referencing/crs/DefaultGeographicCRS.java | 1 -
.../sis/referencing/crs/DefaultImageCRS.java | 1 -
.../sis/referencing/crs/DefaultParametricCRS.java | 1 -
.../sis/referencing/crs/DefaultProjectedCRS.java | 1 -
.../sis/referencing/crs/DefaultTemporalCRS.java | 1 -
.../sis/referencing/crs/DefaultVerticalCRS.java | 1 -
.../org/apache/sis/referencing/cs/AbstractCS.java | 1 -
.../main/org/apache/sis/referencing/cs/Codes.java | 1 -
.../sis/referencing/cs/DefaultCompoundCS.java | 3 +--
.../cs/DefaultCoordinateSystemAxis.java | 7 +++---
.../org/apache/sis/referencing/cs/Normalizer.java | 5 ++---
.../sis/referencing/datum/AbstractDatum.java | 1 -
.../sis/referencing/datum/BursaWolfParameters.java | 3 +--
.../sis/referencing/datum/DefaultEllipsoid.java | 3 +--
.../referencing/datum/DefaultGeodeticDatum.java | 1 -
.../sis/referencing/datum/DefaultImageDatum.java | 1 -
.../referencing/datum/DefaultPrimeMeridian.java | 1 -
.../referencing/datum/DefaultTemporalDatum.java | 1 -
.../referencing/datum/DefaultVerticalDatum.java | 1 -
.../sis/referencing/datum/TimeDependentBWP.java | 1 -
.../referencing/factory/sql/EPSGCodeFinder.java | 1 -
.../referencing/factory/sql/EPSGDataAccess.java | 1 -
.../sis/referencing/factory/sql/EPSGInstaller.java | 1 -
.../sis/referencing/internal/DatabaseListener.java | 3 +--
.../apache/sis/referencing/internal/Legacy.java | 3 +--
.../referencing/internal/ServicesForMetadata.java | 3 +--
.../operation/AbstractCoordinateOperation.java | 1 -
.../operation/AbstractSingleOperation.java | 1 -
.../operation/CoordinateOperationFinder.java | 1 -
.../operation/DefaultConcatenatedOperation.java | 1 -
.../sis/referencing/operation/DefaultFormula.java | 1 -
.../operation/DefaultPassThroughOperation.java | 1 -
.../operation/builder/LocalizationGridBuilder.java | 1 -
.../operation/matrix/AffineTransforms2D.java | 5 ++---
.../sis/referencing/operation/matrix/Solver.java | 1 -
.../operation/projection/AlbersEqualArea.java | 3 +--
.../operation/projection/AuthalicConversion.java | 3 +--
.../operation/projection/AuthalicMercator.java | 3 +--
.../operation/projection/AzimuthalEquidistant.java | 3 +--
.../operation/projection/CassiniSoldner.java | 3 +--
.../operation/projection/ConformalProjection.java | 3 +--
.../operation/projection/CylindricalEqualArea.java | 3 +--
.../operation/projection/Initializer.java | 3 +--
.../referencing/operation/projection/Inverter.java | 3 +--
.../projection/LambertAzimuthalEqualArea.java | 3 +--
.../projection/LambertConicConformal.java | 5 ++---
.../referencing/operation/projection/Mercator.java | 5 ++---
.../operation/projection/MeridianArcBased.java | 3 +--
.../projection/ModifiedAzimuthalEquidistant.java | 3 +--
.../operation/projection/Mollweide.java | 3 +--
.../operation/projection/NormalizedProjection.java | 3 +--
.../operation/projection/ObliqueMercator.java | 3 +--
.../operation/projection/ObliqueStereographic.java | 3 +--
.../operation/projection/Orthographic.java | 3 +--
.../operation/projection/PolarStereographic.java | 3 +--
.../operation/projection/Polyconic.java | 3 +--
.../operation/projection/SatelliteTracking.java | 3 +--
.../operation/projection/Sinusoidal.java | 3 +--
.../operation/projection/TransverseMercator.java | 3 +--
.../operation/projection/ZonedGridSystem.java | 5 ++---
.../referencing/operation/provider/EPSGName.java | 7 +++---
.../operation/provider/Equirectangular.java | 3 +--
.../provider/FranceGeocentricInterpolation.java | 3 +--
.../provider/GeocentricToTopocentric.java | 7 +++---
.../operation/provider/MapProjection.java | 3 +--
.../operation/provider/ObliqueMercatorCenter.java | 1 -
.../operation/provider/Orthographic.java | 1 -
.../transform/AbridgedMolodenskyTransform2D.java | 3 +--
.../operation/transform/AbstractMathTransform.java | 1 -
.../transform/AbstractMathTransform1D.java | 1 -
.../operation/transform/CartesianToPolar.java | 3 +--
.../operation/transform/CartesianToSpherical.java | 3 +--
.../operation/transform/ContextualParameters.java | 1 -
.../transform/EllipsoidToCentricTransform.java | 3 +--
.../operation/transform/MolodenskyTransform.java | 3 +--
.../operation/transform/PolarToCartesian.java | 3 +--
.../operation/transform/PoleRotation.java | 3 +--
.../operation/transform/SphericalToCartesian.java | 3 +--
.../apache/sis/referencing/util/AxesMapper.java | 3 +--
.../sis/referencing/util/AxisDirections.java | 5 ++---
.../org/apache/sis/referencing/util/Formulas.java | 3 +--
.../apache/sis/referencing/util/j2d/Bezier.java | 3 +--
.../sis/referencing/util/j2d/ShapeUtilities.java | 3 +--
.../sis/xml/bind/referencing/CS_AxisDirection.java | 1 -
.../sis/xml/bind/referencing/CS_RangeMeaning.java | 1 -
.../org/apache/sis/xml/bind/referencing/Code.java | 1 -
.../sis/geometry/AbstractDirectPositionTest.java | 3 +--
.../apache/sis/geometry/AbstractEnvelopeTest.java | 7 +++---
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 3 +--
.../apache/sis/geometry/CoordinateFormatTest.java | 3 +--
.../org/apache/sis/geometry/CurveExtremumTest.java | 3 +--
.../apache/sis/geometry/DirectPosition1DTest.java | 5 ++---
.../apache/sis/geometry/DirectPosition2DTest.java | 5 ++---
.../org/apache/sis/geometry/Envelope2DTest.java | 5 ++---
.../apache/sis/geometry/EnvelopeReducerTest.java | 1 -
.../org/apache/sis/geometry/EnvelopesTest.java | 9 ++++----
.../sis/geometry/GeneralDirectPositionTest.java | 5 ++---
.../apache/sis/geometry/GeneralEnvelopeTest.java | 7 +++---
.../apache/sis/geometry/ImmutableEnvelopeTest.java | 5 ++---
.../test/org/apache/sis/geometry/Shapes2DTest.java | 1 -
.../org/apache/sis/geometry/SubEnvelopeTest.java | 6 ++---
.../org/apache/sis/geometry/TransformTestCase.java | 7 +++---
.../sis/geometry/WraparoundAdjustmentTest.java | 3 +--
.../test/org/apache/sis/io/wkt/ColorsTest.java | 3 +--
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 3 +--
.../test/org/apache/sis/io/wkt/ConventionTest.java | 3 +--
.../test/org/apache/sis/io/wkt/ElementTest.java | 3 +--
.../test/org/apache/sis/io/wkt/FormatterTest.java | 3 +--
.../sis/io/wkt/GeodeticObjectParserTest.java | 7 +++---
.../apache/sis/io/wkt/MathTransformParserTest.java | 3 +--
.../test/org/apache/sis/io/wkt/SymbolsTest.java | 3 +--
.../org/apache/sis/io/wkt/TransliteratorTest.java | 3 +--
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 4 +---
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 3 +--
.../DefaultParameterDescriptorGroupTest.java | 7 +++---
.../parameter/DefaultParameterDescriptorTest.java | 5 ++---
.../parameter/DefaultParameterValueGroupTest.java | 7 +++---
.../sis/parameter/DefaultParameterValueTest.java | 7 +++---
.../sis/parameter/MapProjectionParametersTest.java | 11 +++++----
.../parameter/MatrixParametersAlphaNumTest.java | 3 +--
.../apache/sis/parameter/MatrixParametersTest.java | 3 +--
.../apache/sis/parameter/ParameterBuilderTest.java | 3 +--
.../apache/sis/parameter/ParameterFormatTest.java | 7 +++---
.../sis/parameter/ParameterMarshallingTest.java | 5 ++---
.../org/apache/sis/parameter/ParametersTest.java | 3 +--
.../apache/sis/parameter/TensorParametersTest.java | 7 +++---
.../org/apache/sis/parameter/TensorValuesTest.java | 9 ++++----
.../UnmodifiableParameterValueGroupTest.java | 3 +--
.../parameter/UnmodifiableParameterValueTest.java | 3 +--
.../referencing/AbstractIdentifiedObjectTest.java | 5 ++---
.../referencing/AbstractReferenceSystemTest.java | 5 ++---
.../org/apache/sis/referencing/Assertions.java | 5 ++---
.../sis/referencing/AuthorityFactoriesTest.java | 3 +--
.../org/apache/sis/referencing/BuilderTest.java | 3 +--
.../test/org/apache/sis/referencing/CRSTest.java | 5 ++---
.../org/apache/sis/referencing/CommonCRSTest.java | 3 +--
.../sis/referencing/EPSGFactoryFallbackTest.java | 3 +--
.../sis/referencing/GeodesicsOnEllipsoidTest.java | 7 +++---
.../sis/referencing/GeodeticCalculatorTest.java | 11 +++++----
.../sis/referencing/GeodeticObjectVerifier.java | 1 +
.../sis/referencing/IdentifiedObjectsTest.java | 5 ++---
.../sis/referencing/ImmutableIdentifierTest.java | 3 +--
.../sis/referencing/NamedIdentifierTest.java | 3 +--
.../sis/referencing/StandardDefinitionsTest.java | 7 +++---
.../sis/referencing/crs/AbstractCRSTest.java | 9 ++++----
.../referencing/crs/DefaultCompoundCRSTest.java | 7 +++---
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 5 ++---
.../referencing/crs/DefaultEngineeringCRSTest.java | 5 ++---
.../referencing/crs/DefaultGeocentricCRSTest.java | 3 +--
.../referencing/crs/DefaultGeodeticCRSTest.java | 3 +--
.../referencing/crs/DefaultGeographicCRSTest.java | 3 +--
.../sis/referencing/crs/DefaultImageCRSTest.java | 5 ++---
.../referencing/crs/DefaultProjectedCRSTest.java | 3 +--
.../referencing/crs/DefaultTemporalCRSTest.java | 7 +++---
.../referencing/crs/DefaultVerticalCRSTest.java | 1 -
.../apache/sis/referencing/crs/HardCodedCRS.java | 9 ++++----
.../sis/referencing/crs/HardCodedCRSTest.java | 3 +--
.../apache/sis/referencing/crs/SubTypesTest.java | 3 +--
.../apache/sis/referencing/cs/AbstractCSTest.java | 5 ++---
.../org/apache/sis/referencing/cs/CodesTest.java | 5 ++---
.../sis/referencing/cs/CoordinateSystemsTest.java | 11 +++++----
.../sis/referencing/cs/DefaultCartesianCSTest.java | 5 ++---
.../sis/referencing/cs/DefaultCompoundCSTest.java | 3 +--
.../cs/DefaultCoordinateSystemAxisTest.java | 5 ++---
.../referencing/cs/DefaultCylindricalCSTest.java | 3 +--
.../referencing/cs/DefaultEllipsoidalCSTest.java | 3 +--
.../sis/referencing/cs/DefaultPolarCSTest.java | 3 +--
.../sis/referencing/cs/DefaultSphericalCSTest.java | 3 +--
.../referencing/cs/DirectionAlongMeridianTest.java | 3 +--
.../org/apache/sis/referencing/cs/HardCodedCS.java | 3 +--
.../apache/sis/referencing/cs/HardCodedCSTest.java | 3 +--
.../apache/sis/referencing/cs/NormalizerTest.java | 5 ++---
.../referencing/datum/BursaWolfParametersTest.java | 3 +--
.../referencing/datum/DefaultEllipsoidTest.java | 5 ++---
.../datum/DefaultGeodeticDatumTest.java | 7 +++---
.../datum/DefaultPrimeMeridianTest.java | 5 ++---
.../datum/DefaultTemporalDatumTest.java | 5 ++---
.../datum/DefaultVerticalDatumTest.java | 5 ++---
.../sis/referencing/datum/HardCodedDatum.java | 5 ++---
.../referencing/datum/TimeDependentBWPTest.java | 5 ++---
.../referencing/factory/AuthorityFactoryMock.java | 3 +--
.../factory/AuthorityFactoryProxyTest.java | 3 +--
.../factory/CommonAuthorityFactoryTest.java | 5 ++---
.../factory/ConcurrentAuthorityFactoryTest.java | 5 ++---
.../factory/IdentifiedObjectFinderTest.java | 3 +--
.../factory/MultiAuthoritiesFactoryTest.java | 5 ++---
.../sis/referencing/factory/TestFactorySource.java | 1 +
.../referencing/factory/sql/EPSGFactoryTest.java | 7 +++---
.../referencing/factory/sql/EPSGInstallerTest.java | 5 ++---
.../sis/referencing/factory/sql/TableInfoTest.java | 3 +--
.../factory/sql/epsg/DataScriptFormatterTest.java | 3 +--
.../internal/ServicesForMetadataTest.java | 3 +--
.../internal/VerticalDatumTypesTest.java | 3 +--
.../operation/CoordinateOperationFinderTest.java | 11 +++++----
.../operation/CoordinateOperationRegistryTest.java | 7 +++---
.../DefaultConcatenatedOperationTest.java | 5 ++---
.../operation/DefaultConversionTest.java | 3 +--
.../DefaultCoordinateOperationFactoryTest.java | 7 +++---
.../referencing/operation/DefaultFormulaTest.java | 1 -
.../operation/DefaultOperationMethodTest.java | 3 +--
.../operation/DefaultPassThroughOperationTest.java | 5 ++---
.../operation/DefaultTransformationTest.java | 5 ++---
.../operation/SingleOperationMarshallingTest.java | 7 +++---
.../builder/LinearTransformBuilderTest.java | 3 +--
.../operation/builder/LinearizerTest.java | 3 +--
.../builder/LocalizationGridBuilderTest.java | 3 +--
.../operation/builder/ResidualGridTest.java | 3 +--
.../operation/matrix/AffineTransforms2DTest.java | 5 ++---
.../operation/matrix/GeneralMatrixTest.java | 1 -
.../referencing/operation/matrix/MatricesTest.java | 7 +++---
.../referencing/operation/matrix/Matrix1Test.java | 6 ++---
.../referencing/operation/matrix/Matrix2Test.java | 6 ++---
.../referencing/operation/matrix/Matrix3Test.java | 6 ++---
.../referencing/operation/matrix/Matrix4Test.java | 8 +++----
.../operation/matrix/MatrixTestCase.java | 5 ++---
.../operation/matrix/NonSquareMatrixTest.java | 5 ++---
.../referencing/operation/matrix/SolverTest.java | 7 +++---
.../operation/projection/AlbersEqualAreaTest.java | 7 +++---
.../projection/AuthalicConversionTest.java | 7 +++---
.../operation/projection/CassiniSoldnerTest.java | 5 ++---
.../projection/ConformalProjectionTest.java | 9 ++++----
.../projection/CylindricalEqualAreaTest.java | 5 ++---
.../operation/projection/EquirectangularTest.java | 9 ++++----
.../operation/projection/InitializerTest.java | 5 ++---
.../projection/LambertAzimuthalEqualAreaTest.java | 11 +++++----
.../projection/LambertConicConformalTest.java | 7 +++---
.../projection/MapProjectionTestCase.java | 7 +++---
.../projection/MercatorMethodComparison.java | 3 +--
.../operation/projection/MercatorTest.java | 11 +++++----
.../operation/projection/MeridianArcTest.java | 5 ++---
.../operation/projection/MollweideTest.java | 3 +--
.../projection/NormalizedProjectionTest.java | 8 +++----
.../operation/projection/ObliqueMercatorTest.java | 3 +--
.../projection/ObliqueStereographicTest.java | 5 ++---
.../operation/projection/OrthographicTest.java | 3 +--
.../projection/ParameterizedTransformTestMock.java | 1 -
.../projection/PolarStereographicTest.java | 5 ++---
.../projection/ProjectionResultComparator.java | 1 +
.../projection/SatelliteTrackingTest.java | 5 ++---
.../projection/TransverseMercatorTest.java | 9 ++++----
.../operation/projection/ZonedGridSystemTest.java | 3 +--
.../referencing/operation/provider/AffineTest.java | 3 +--
.../provider/CoordinateFrameRotationTest.java | 5 ++---
.../provider/DatumShiftGridCompressedTest.java | 1 +
.../operation/provider/DatumShiftGridFileTest.java | 3 +--
.../operation/provider/DatumShiftTestCase.java | 3 +--
.../FranceGeocentricInterpolationTest.java | 5 ++---
.../provider/GeocentricTranslationTest.java | 7 +++---
.../operation/provider/Geographic3Dto2DTest.java | 5 ++---
.../operation/provider/LongitudeRotationTest.java | 3 +--
.../operation/provider/MapProjectionTest.java | 5 ++---
.../operation/provider/MolodenskyTest.java | 3 +--
.../referencing/operation/provider/NADCONTest.java | 1 -
.../referencing/operation/provider/NTv2Test.java | 5 ++---
.../provider/PositionVector7ParamTest.java | 5 ++---
.../operation/provider/ProvidersTest.java | 3 +--
.../operation/provider/TransverseMercatorTest.java | 3 +--
.../transform/AbridgedMolodenskyTransformTest.java | 7 +++---
.../transform/AbstractMathTransformTest.java | 9 ++++----
.../transform/ConcatenatedTransformTest.java | 3 +--
.../transform/ContextualParametersTest.java | 7 +++---
.../operation/transform/CoordinateDomain.java | 3 +--
.../operation/transform/CoordinateDomainTest.java | 3 +--
.../transform/CoordinateSystemTransformTest.java | 3 +--
.../operation/transform/CopyTransformTest.java | 5 ++---
.../transform/DefaultMathTransformFactoryTest.java | 5 ++---
.../operation/transform/DomainDefinitionTest.java | 1 -
.../transform/EllipsoidToCentricTransformTest.java | 7 +++---
.../transform/ExponentialTransform1DTest.java | 7 +++---
.../InterpolatedGeocentricTransformTest.java | 4 ++--
.../transform/InterpolatedTransformTest.java | 6 ++---
.../operation/transform/IterationStrategyTest.java | 7 +++---
.../transform/LinearInterpolator1DTest.java | 3 +--
.../operation/transform/LinearTransformTest.java | 3 +--
.../transform/LogarithmicTransform1DTest.java | 5 ++---
.../operation/transform/MathTransformTestCase.java | 9 ++++----
.../operation/transform/MathTransformsTest.java | 5 ++---
.../transform/MolodenskyTransformTest.java | 11 +++++----
.../transform/OperationMethodSetTest.java | 3 +--
.../transform/PassThroughTransformTest.java | 3 +--
.../operation/transform/PolarToCartesianTest.java | 3 +--
.../transform/ProjectiveTransformTest.java | 1 -
.../operation/transform/PseudoTransform.java | 3 +--
.../transform/RandomFailureTransform.java | 1 +
.../operation/transform/ScaleTransformTest.java | 5 ++---
.../operation/transform/SinusoidalShiftGrid.java | 1 +
.../transform/SpecializableTransformTest.java | 3 +--
.../transform/SphericalToCartesianTest.java | 3 +--
.../operation/transform/TransferFunctionTest.java | 5 ++---
.../transform/TransformResultComparator.java | 1 +
.../transform/TransformSeparatorTest.java | 7 +++---
.../operation/transform/TransformTestCase.java | 1 -
.../transform/TranslationTransformTest.java | 3 +--
.../operation/transform/UnitConversionTest.java | 3 +--
.../transform/WraparoundTransformTest.java | 3 +--
.../sis/referencing/util/AxesMapperTest.java | 3 +--
.../sis/referencing/util/AxisDirectionsTest.java | 17 +++++++-------
.../referencing/util/CoordinateOperationsTest.java | 3 +--
.../referencing/util/DefinitionVerifierTest.java | 5 ++---
.../util/EllipsoidalHeightCombinerTest.java | 7 +++---
.../sis/referencing/util/ExtentSelectorTest.java | 3 +--
.../apache/sis/referencing/util/FormulasTest.java | 3 +--
.../util/GeodeticObjectBuilderTest.java | 3 +--
.../apache/sis/referencing/util/LazySetTest.java | 3 +--
.../util/PositionalAccuracyConstantTest.java | 3 +--
.../referencing/util/ReferencingUtilitiesTest.java | 5 ++---
.../sis/referencing/util/WKTKeywordsTest.java | 3 +--
.../sis/referencing/util/WKTUtilitiesTest.java | 5 ++---
.../referencing/util/WraparoundApplicatorTest.java | 3 +--
.../referencing/util/j2d/AbstractShapeTest.java | 3 +--
.../referencing/util/j2d/ShapeUtilitiesTest.java | 3 +--
.../sis/test/integration/ConsistencyTest.java | 5 ++---
.../test/integration/CoordinateOperationTest.java | 3 +--
.../integration/CoordinateReferenceSystemTest.java | 7 +++---
.../sis/test/integration/DatumShiftTest.java | 1 -
.../apache/sis/test/integration/MetadataTest.java | 3 +--
.../sis/test/integration/MetadataVerticalTest.java | 6 ++---
.../apache/sis/test/widget/SwingAssertions.java | 1 +
.../CC_GeneralOperationParameterTest.java | 3 +--
.../CC_OperationParameterGroupTest.java | 7 +++---
.../apache/sis/xml/bind/referencing/CodeTest.java | 3 +--
.../referencing/SecondDefiningParameterTest.java | 3 +--
.../main/org/apache/sis/storage/landsat/Band.java | 1 -
.../apache/sis/storage/landsat/MetadataReader.java | 1 -
.../storage/landsat/LandsatStoreProviderTest.java | 3 +--
.../sis/storage/landsat/MetadataReaderTest.java | 3 +--
.../sis/storage/geotiff/CompressedSubset.java | 5 ++---
.../org/apache/sis/storage/geotiff/DataCube.java | 3 +--
.../org/apache/sis/storage/geotiff/DataSubset.java | 9 ++++----
.../sis/storage/geotiff/ImageFileDirectory.java | 5 ++---
.../apache/sis/storage/geotiff/NativeMetadata.java | 7 +++---
.../org/apache/sis/storage/geotiff/Writer.java | 5 ++---
.../sis/storage/geotiff/inflater/Inflater.java | 1 -
.../sis/storage/geotiff/reader/CRSBuilder.java | 1 -
.../sis/storage/geotiff/reader/GeoKeysLoader.java | 3 +--
.../geotiff/reader/ImageMetadataBuilder.java | 3 +--
.../sis/storage/geotiff/reader/XMLMetadata.java | 1 -
.../sis/storage/geotiff/writer/GeoEncoder.java | 5 ++---
.../storage/geotiff/writer/ReformattedImage.java | 3 +--
.../sis/storage/geotiff/SelfConsistencyTest.java | 5 ++---
.../org/apache/sis/storage/geotiff/WriterTest.java | 5 ++---
.../sis/storage/geotiff/base/CompressionTest.java | 3 +--
.../sis/storage/geotiff/base/GeoCodesTest.java | 3 +--
.../sis/storage/geotiff/base/GeoKeysTest.java | 3 +--
.../apache/sis/storage/geotiff/base/TagsTest.java | 8 +++----
.../sis/storage/geotiff/inflater/CCITTRLETest.java | 3 +--
.../sis/storage/geotiff/inflater/InflaterTest.java | 3 +--
.../sis/storage/geotiff/reader/CRSBuilderTest.java | 3 +--
.../sis/storage/geotiff/reader/TypeTest.java | 3 +--
.../storage/geotiff/reader/XMLMetadataTest.java | 3 +--
.../apache/sis/storage/netcdf/MetadataReader.java | 1 -
.../apache/sis/storage/netcdf/base/Variable.java | 1 -
.../sis/storage/netcdf/MetadataReaderTest.java | 3 +--
.../storage/netcdf/NetcdfStoreProviderTest.java | 5 ++---
.../apache/sis/storage/netcdf/NetcdfStoreTest.java | 3 +--
.../sis/storage/netcdf/SelfConsistencyTest.java | 3 +--
.../apache/sis/storage/netcdf/base/AxisTest.java | 3 +--
.../sis/storage/netcdf/base/DataTypeTest.java | 3 +--
.../sis/storage/netcdf/base/DecoderTest.java | 3 +--
.../apache/sis/storage/netcdf/base/GridTest.java | 5 ++---
.../apache/sis/storage/netcdf/base/TestCase.java | 1 -
.../apache/sis/storage/netcdf/base/TestData.java | 1 -
.../sis/storage/netcdf/base/VariableTest.java | 3 +--
.../storage/netcdf/classic/ChannelDecoderTest.java | 2 +-
.../sis/storage/netcdf/classic/GridInfoTest.java | 2 +-
.../storage/netcdf/classic/VariableInfoTest.java | 2 +-
.../apache/sis/storage/sql/ResourceDefinition.java | 1 -
.../apache/sis/storage/sql/SQLStoreProvider.java | 1 -
.../sis/storage/sql/feature/TableReference.java | 1 -
.../sis/storage/sql/postgis/RasterReader.java | 1 -
.../org/apache/sis/storage/sql/SQLStoreTest.java | 5 ++---
.../storage/sql/feature/GeometryGetterTest.java | 3 +--
.../sql/feature/SelectionClauseWriterTest.java | 3 +--
.../sql/feature/TemporalValueGetterTest.java | 5 ++---
.../apache/sis/storage/sql/postgis/BandTest.java | 3 +--
.../sis/storage/sql/postgis/PostgresTest.java | 9 ++++----
.../sis/storage/sql/postgis/RasterReaderTest.java | 3 +--
.../sis/storage/sql/postgis/RasterWriterTest.java | 3 +--
.../apache/sis/storage/sql/postgis/TestRaster.java | 1 +
.../org/apache/sis/storage/gpx/MetadataTest.java | 3 +--
.../org/apache/sis/storage/gpx/ReaderTest.java | 3 +--
.../test/org/apache/sis/storage/gpx/TypesTest.java | 3 +--
.../org/apache/sis/storage/gpx/UpdaterTest.java | 3 +--
.../org/apache/sis/storage/gpx/WriterTest.java | 3 +--
.../main/org/apache/sis/io/stream/ChannelData.java | 1 -
.../org/apache/sis/io/stream/ChannelDataInput.java | 1 -
.../apache/sis/io/stream/ChannelDataOutput.java | 1 -
.../apache/sis/io/stream/FileCacheByteChannel.java | 1 -
.../main/org/apache/sis/io/stream/Region.java | 3 +--
.../aggregate/ConcatenatedGridCoverage.java | 1 -
.../apache/sis/storage/base/MetadataBuilder.java | 1 -
.../apache/sis/storage/base/ResourceLineage.java | 1 -
.../apache/sis/storage/base/TiledGridCoverage.java | 17 +++++++-------
.../apache/sis/storage/base/TiledGridResource.java | 1 -
.../sis/storage/base/WritableAggregateSupport.java | 8 +++----
.../apache/sis/storage/esri/RawRasterReader.java | 11 +++++----
.../apache/sis/storage/esri/RawRasterStore.java | 3 +--
.../sis/storage/image/WorldFileResource.java | 3 +--
.../apache/sis/io/stream/ChannelDataInputTest.java | 1 -
.../sis/io/stream/ChannelDataOutputTest.java | 3 +--
.../sis/io/stream/ChannelImageInputStreamTest.java | 3 +--
.../io/stream/ChannelImageOutputStreamTest.java | 3 +--
.../apache/sis/io/stream/ComputedInputStream.java | 1 +
.../org/apache/sis/io/stream/DripByteChannel.java | 1 -
.../sis/io/stream/FileCacheByteChannelTest.java | 3 +--
.../sis/io/stream/HyperRectangleReaderTest.java | 3 +--
.../sis/io/stream/HyperRectangleWriterTest.java | 3 +--
.../org/apache/sis/io/stream/IOUtilitiesTest.java | 3 +--
.../sis/io/stream/ImageInputStreamComparator.java | 1 +
.../sis/io/stream/InputStreamArrayGetterTest.java | 3 +--
.../sis/io/stream/RewindableLineReaderTest.java | 3 +--
.../io/stream/SubsampledRectangleWriterTest.java | 3 +--
.../apache/sis/io/stream/UpdatableWriteTest.java | 3 +--
.../org/apache/sis/storage/CoverageQueryTest.java | 3 +--
.../org/apache/sis/storage/CoverageSubsetTest.java | 3 +--
.../apache/sis/storage/DataStoreProviderTest.java | 3 +--
.../org/apache/sis/storage/DataStoresTest.java | 3 +--
.../org/apache/sis/storage/FeatureNamingTest.java | 3 +--
.../org/apache/sis/storage/FeatureQueryTest.java | 3 +--
.../org/apache/sis/storage/GridResourceMock.java | 1 +
.../org/apache/sis/storage/ProbeResultTest.java | 6 ++---
.../apache/sis/storage/StorageConnectorTest.java | 7 +++---
.../aggregate/BandAggregateGridResourceTest.java | 3 +--
.../aggregate/ConcatenatedFeatureSetTest.java | 3 +--
.../storage/aggregate/CoverageAggregatorTest.java | 3 +--
.../sis/storage/aggregate/JoinFeatureSetTest.java | 3 +--
.../org/apache/sis/storage/base/CodeTypeTest.java | 3 +--
.../sis/storage/base/MemoryGridResourceTest.java | 3 +--
.../sis/storage/base/MetadataBuilderTest.java | 3 +--
.../sis/storage/base/StoreUtilitiesTest.java | 3 +--
.../apache/sis/storage/csv/StoreProviderTest.java | 3 +--
.../test/org/apache/sis/storage/csv/StoreTest.java | 3 +--
.../sis/storage/esri/AsciiGridStoreTest.java | 3 +--
.../sis/storage/esri/BILConsistencyTest.java | 3 +--
.../sis/storage/esri/BIPConsistencyTest.java | 3 +--
.../sis/storage/esri/BSQConsistencyTest.java | 3 +--
.../apache/sis/storage/esri/WritableStoreTest.java | 3 +--
.../sis/storage/event/StoreListenersTest.java | 3 +--
.../org/apache/sis/storage/folder/StoreTest.java | 3 +--
.../sis/storage/image/SelfConsistencyTest.java | 3 +--
.../sis/storage/image/WorldFileStoreTest.java | 3 +--
.../sis/storage/test/CoverageReadConsistency.java | 3 +--
.../apache/sis/storage/test/SubsampledImage.java | 3 ++-
.../apache/sis/storage/wkt/StoreProviderTest.java | 3 +--
.../test/org/apache/sis/storage/wkt/StoreTest.java | 3 +--
.../sis/storage/xml/MimeTypeDetectorTest.java | 5 ++---
.../apache/sis/storage/xml/StoreProviderTest.java | 3 +--
.../test/org/apache/sis/storage/xml/StoreTest.java | 5 ++---
.../main/org/apache/sis/io/Appender.java | 1 -
.../main/org/apache/sis/io/CompoundFormat.java | 1 -
.../main/org/apache/sis/io/TableAppender.java | 1 -
.../main/org/apache/sis/math/DecimalFunctions.java | 1 -
.../main/org/apache/sis/math/Line.java | 3 +--
.../main/org/apache/sis/math/MathFunctions.java | 11 +++++----
.../main/org/apache/sis/math/Plane.java | 7 +++---
.../main/org/apache/sis/math/Statistics.java | 11 +++++----
.../main/org/apache/sis/math/Vector.java | 3 +--
.../main/org/apache/sis/measure/Angle.java | 3 +--
.../main/org/apache/sis/measure/AngleFormat.java | 5 ++---
.../apache/sis/measure/SexagesimalConverter.java | 1 -
.../main/org/apache/sis/measure/Units.java | 1 -
.../main/org/apache/sis/setup/About.java | 5 ++---
.../main/org/apache/sis/setup/OptionKey.java | 3 +--
.../apache/sis/setup/OptionalInstallations.java | 1 -
.../main/org/apache/sis/util/CharSequences.java | 3 +--
.../main/org/apache/sis/util/Classes.java | 1 -
.../main/org/apache/sis/util/Locales.java | 1 -
.../main/org/apache/sis/util/Numbers.java | 3 +--
.../main/org/apache/sis/util/StringBuilders.java | 3 +--
.../main/org/apache/sis/util/Version.java | 1 -
.../sis/util/collection/DefaultTreeTable.java | 1 -
.../org/apache/sis/util/collection/RangeSet.java | 1 -
.../sis/util/collection/TreeTableFormat.java | 1 -
.../apache/sis/util/collection/WeakHashSet.java | 1 -
.../sis/util/collection/WeakValueHashMap.java | 1 -
.../apache/sis/util/internal/CheckedArrayList.java | 1 -
.../apache/sis/util/internal/CheckedHashSet.java | 1 -
.../apache/sis/util/internal/CollectionsExt.java | 1 -
.../apache/sis/util/internal/DefinitionURI.java | 3 +--
.../org/apache/sis/util/internal/Numerics.java | 9 ++++----
.../apache/sis/util/logging/MonolineFormatter.java | 1 -
.../apache/sis/converter/AngleConverterTest.java | 3 +--
.../apache/sis/converter/ArrayConverterTest.java | 3 +--
.../sis/converter/ConverterRegistryTest.java | 5 ++---
.../sis/converter/FallbackConverterTest.java | 3 +--
.../apache/sis/converter/NumberConverterTest.java | 5 ++---
.../apache/sis/converter/PathConverterTest.java | 5 ++---
.../apache/sis/converter/StringConverterTest.java | 3 +--
.../apache/sis/converter/SystemRegistryTest.java | 7 +++---
.../test/org/apache/sis/io/AppenderTestCase.java | 3 +--
.../test/org/apache/sis/io/EchoAppendable.java | 1 +
.../test/org/apache/sis/io/LeftMarginTest.java | 3 +--
.../test/org/apache/sis/io/LineAppenderTest.java | 3 +--
.../test/org/apache/sis/io/TableAppenderTest.java | 3 +--
.../org/apache/sis/io/TabulationExpansionTest.java | 3 +--
.../test/org/apache/sis/io/WordWrapTest.java | 5 ++---
.../org/apache/sis/math/DecimalFunctionsTest.java | 7 +++---
.../test/org/apache/sis/math/FractionTest.java | 3 +--
.../org/apache/sis/math/FunctionPropertyTest.java | 3 +--
.../test/org/apache/sis/math/LineTest.java | 3 +--
.../apache/sis/math/LinearlyDerivedVectorTest.java | 3 +--
.../org/apache/sis/math/MathFunctionsTest.java | 11 +++++----
.../test/org/apache/sis/math/PlaneTest.java | 3 +--
.../org/apache/sis/math/RepeatedVectorTest.java | 3 +--
.../org/apache/sis/math/StatisticsFormatTest.java | 1 -
.../test/org/apache/sis/math/StatisticsTest.java | 9 ++++----
.../test/org/apache/sis/math/VectorTest.java | 5 ++---
.../org/apache/sis/measure/AngleFormatTest.java | 3 +--
.../test/org/apache/sis/measure/AngleTest.java | 7 +++---
.../apache/sis/measure/ConventionalUnitTest.java | 3 +--
.../test/org/apache/sis/measure/DateRangeTest.java | 3 +--
.../measure/FormattedCharacterIteratorTest.java | 13 +++++------
.../apache/sis/measure/LinearConverterTest.java | 5 ++---
.../apache/sis/measure/MeasurementRangeTest.java | 3 +--
.../org/apache/sis/measure/NumberRangeTest.java | 3 +--
.../test/org/apache/sis/measure/PrefixesTest.java | 3 +--
.../org/apache/sis/measure/QuantitiesTest.java | 5 ++---
.../org/apache/sis/measure/RangeFormatTest.java | 11 +++++----
.../test/org/apache/sis/measure/RangeTest.java | 3 +--
.../test/org/apache/sis/measure/ScalarTest.java | 5 ++---
.../sis/measure/SexagesimalConverterTest.java | 5 ++---
.../org/apache/sis/measure/SystemUnitTest.java | 5 ++---
.../org/apache/sis/measure/UnitDimensionTest.java | 3 +--
.../org/apache/sis/measure/UnitFormatTest.java | 3 +--
.../org/apache/sis/measure/UnitServicesTest.java | 3 +--
.../test/org/apache/sis/measure/UnitsTest.java | 7 +++---
.../test/org/apache/sis/setup/OptionKeyTest.java | 5 ++---
.../test/org/apache/sis/system/LoggersTest.java | 3 +--
.../sis/system/ReferenceQueueConsumerTest.java | 3 +--
.../test/org/apache/sis/test/Assertions.java | 1 +
.../test/org/apache/sis/test/Assume.java | 1 +
.../test/org/apache/sis/test/ContentVerifier.java | 1 -
.../test/org/apache/sis/test/GeoapiAssert.java | 1 -
.../test/org/apache/sis/test/LoggingWatcher.java | 1 +
.../test/org/apache/sis/test/OptionalTestData.java | 1 +
.../org/apache/sis/test/ProjectDirectories.java | 1 +
.../test/org/apache/sis/test/TestRunner.java | 5 ++---
.../test/org/apache/sis/test/TestUtilities.java | 3 ++-
.../test/org/apache/sis/test/self/AssertTest.java | 3 +--
.../apache/sis/test/self/TestUtilitiesTest.java | 3 +--
.../org/apache/sis/util/ArgumentChecksTest.java | 3 +--
.../test/org/apache/sis/util/ArraysExtTest.java | 3 +--
.../org/apache/sis/util/CharSequencesTest.java | 5 ++---
.../test/org/apache/sis/util/CharactersTest.java | 6 ++---
.../test/org/apache/sis/util/ClassesTest.java | 5 ++---
.../sis/util/DefaultInternationalStringTest.java | 5 ++---
.../test/org/apache/sis/util/ExceptionsTest.java | 3 +--
.../test/org/apache/sis/util/LocalesTest.java | 3 +--
.../test/org/apache/sis/util/NumbersTest.java | 5 ++---
.../sis/util/SimpleInternationalStringTest.java | 5 ++---
.../org/apache/sis/util/StringBuildersTest.java | 6 ++---
.../test/org/apache/sis/util/UtilitiesTest.java | 3 +--
.../test/org/apache/sis/util/VersionTest.java | 3 +--
.../org/apache/sis/util/collection/CacheTest.java | 5 ++---
.../sis/util/collection/CodeListSetTest.java | 5 ++---
.../sis/util/collection/DefaultTreeTableTest.java | 7 +++---
.../apache/sis/util/collection/DerivedMapTest.java | 3 +--
.../apache/sis/util/collection/DerivedSetTest.java | 3 +--
.../util/collection/FrequencySortedSetTest.java | 3 +--
.../sis/util/collection/IntegerListTest.java | 5 ++---
.../apache/sis/util/collection/LargeCodeList.java | 1 +
.../apache/sis/util/collection/RangeSetTest.java | 7 +++---
.../sis/util/collection/TableColumnTest.java | 5 ++---
.../sis/util/collection/TreeTableFormatTest.java | 5 ++---
.../apache/sis/util/collection/TreeTablesTest.java | 9 ++++----
.../sis/util/collection/WeakHashSetTest.java | 3 +--
.../sis/util/collection/WeakValueHashMapTest.java | 3 +--
.../apache/sis/util/internal/AbstractMapTest.java | 3 +--
.../test/org/apache/sis/util/internal/BagTest.java | 3 +--
.../sis/util/internal/CheckedArrayListTest.java | 3 +--
.../sis/util/internal/CollectionsExtTest.java | 3 +--
.../sis/util/internal/DefinitionURITest.java | 3 +--
.../apache/sis/util/internal/DoubleDoubleTest.java | 5 ++---
.../sis/util/internal/ListOfUnknownSizeTest.java | 3 +--
.../util/internal/LocalizedParseExceptionTest.java | 3 +--
.../org/apache/sis/util/internal/NumericsTest.java | 11 +++++----
.../sis/util/internal/StandardDateFormatTest.java | 3 +--
.../org/apache/sis/util/internal/StringsTest.java | 3 +--
.../org/apache/sis/util/internal/X364Test.java | 8 +++----
.../sis/util/logging/MonolineFormatterTest.java | 3 +--
.../sis/util/logging/PerformanceLevelTest.java | 7 +++---
.../util/resources/IndexedResourceBundleTest.java | 3 +--
.../coveragejson/CoverageJsonStoreTest.java | 1 -
.../storage/coveragejson/binding/BindingTest.java | 1 -
.../sis/storage/shapefile/ShapefileStore.java | 15 ++++++-------
.../sis/storage/shapefile/dbf/DBFHeader.java | 2 +-
.../sis/storage/shapefile/dbf/DBFReader.java | 2 +-
.../sis/storage/shapefile/dbf/DBFRecord.java | 1 +
.../sis/storage/shapefile/dbf/DBFWriter.java | 1 +
.../shapefile/shp/ShapeGeometryEncoder.java | 8 +++----
.../sis/storage/shapefile/shp/ShapeHeader.java | 7 +++---
.../sis/storage/shapefile/shp/ShapeReader.java | 4 ++--
.../sis/storage/shapefile/shp/ShapeRecord.java | 8 +++----
.../sis/storage/shapefile/shp/ShapeType.java | 1 +
.../sis/storage/shapefile/shp/ShapeWriter.java | 4 ++--
.../sis/storage/shapefile/shx/IndexReader.java | 5 ++---
.../sis/storage/shapefile/shx/IndexWriter.java | 3 ++-
.../sis/storage/shapefile/ShapeFileTest.java | 1 -
.../sis/storage/shapefile/ShapefileStoreTest.java | 6 +++--
.../sis/storage/shapefile/dbf/DBFIOTest.java | 3 +++
.../jdbc/AbstractTestBaseForInternalJDBC.java | 3 +--
.../storage/shapefile/jdbc/DBFConnectionTest.java | 1 -
.../storage/shapefile/jdbc/DBFResultSetTest.java | 1 -
.../storage/shapefile/jdbc/DBFStatementTest.java | 1 -
.../shapefile/jdbc/sql/WhereClauseTest.java | 1 -
.../sis/storage/shapefile/shp/ShapeIOTest.java | 26 +++++++++++-----------
.../apache/sis/gui/coverage/CoverageCanvas.java | 1 -
.../apache/sis/gui/coverage/GridSliceSelector.java | 1 -
.../org/apache/sis/gui/dataset/FeatureTable.java | 1 -
.../org/apache/sis/gui/dataset/ResourceTree.java | 1 -
.../org/apache/sis/gui/dataset/WindowHandler.java | 1 -
.../apache/sis/gui/internal/BackgroundThreads.java | 1 -
.../apache/sis/gui/internal/ImageConverter.java | 1 -
.../main/org/apache/sis/gui/internal/Styles.java | 1 -
.../org/apache/sis/gui/map/GestureFollower.java | 1 -
.../main/org/apache/sis/gui/map/MapCanvas.java | 1 -
.../org/apache/sis/gui/map/OperationFinder.java | 1 -
.../main/org/apache/sis/gui/map/StatusBar.java | 1 -
.../org/apache/sis/gui/map/ValuesFormatter.java | 1 -
.../sis/gui/metadata/IdentificationInfo.java | 1 -
.../org/apache/sis/gui/metadata/MetadataTree.java | 1 -
.../sis/gui/metadata/RepresentationInfo.java | 1 -
.../apache/sis/gui/referencing/AuthorityCodes.java | 1 -
.../gui/referencing/PositionableProjection.java | 1 -
.../gui/referencing/RecentReferenceSystems.java | 1 -
.../main/org/apache/sis/gui/referencing/Utils.java | 1 -
.../apache/sis/gui/internal/GUIUtilitiesTest.java | 3 +--
1054 files changed, 1267 insertions(+), 2240 deletions(-)
diff --cc endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
index 9c0c662290,2c243135c5..ad996db89f
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
@@@ -74,11 -75,8 +75,9 @@@ import org.apache.sis.util.resources.Vo
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
- import static java.util.logging.Logger.getLogger;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
+import org.apache.sis.referencing.DefaultObjectDomain;
+import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java
index 96718c1af2,2d8fa33298..571d2d767e
--- a/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java
+++ b/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/MetadataCommandTest.java
@@@ -24,10 -25,8 +25,8 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.junit.Ignore;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java
index 0df0eba5ef,419a7a5759..eb0a8f0a49
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java
@@@ -52,14 -56,9 +56,9 @@@ import org.apache.sis.util.collection.T
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.resources.Errors;
- import static java.lang.Math.min;
- import static java.lang.Math.addExact;
- import static java.lang.Math.subtractExact;
- import static java.lang.Math.toIntExact;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.CannotEvaluateException;
-import org.opengis.coverage.PointOutsideCoverageException;
+// Specific to the main branch:
+import org.apache.sis.coverage.CannotEvaluateException;
+import org.apache.sis.coverage.PointOutsideCoverageException;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
index e56f1ce315,be7ec0526e..972f660c14
--- 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
@@@ -29,9 -29,11 +29,8 @@@ import org.apache.sis.util.Deprecable
import org.apache.sis.util.iso.DefaultNameFactory;
import org.apache.sis.util.iso.Types;
import org.apache.sis.util.resources.Errors;
-
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.IdentifiedType;
-
/**
* Identification and description information inherited by property types and feature types.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java
index 062aa7be96,af02055119..7ee2f76080
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java
@@@ -25,9 -25,11 +25,8 @@@ import org.apache.sis.util.internal.Col
import org.apache.sis.util.collection.Containers;
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.util.resources.Errors;
-
import static org.apache.sis.util.ArgumentChecks.ensureNonNullElement;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-
/**
* Implementation of the map returned by {@link DefaultAttributeType#characteristics()}.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
index 39c116568e,82a50c05c8..17b60a9c69
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
@@@ -26,9 -26,16 +26,8 @@@ import org.opengis.util.InternationalSt
import org.opengis.metadata.Identifier;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.feature.internal.AttributeConvention;
-
import static org.apache.sis.util.ArgumentChecks.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.FeatureAssociation;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.PropertyNotFoundException;
-
/**
* Indicates the role played by the association between two features.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAttributeType.java
index 87acb322ce,3aebef67ff..04ae30afae
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAttributeType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAttributeType.java
@@@ -26,9 -26,12 +26,8 @@@ import java.io.InvalidObjectException
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.apache.sis.util.Classes;
-
import static org.apache.sis.util.ArgumentChecks.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-import org.opengis.feature.AttributeType;
-
/**
* Definition of an attribute in a feature type.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SQLMM.java
index ad7f53adfb,748d06f137..2283eb0346
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SQLMM.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SQLMM.java
@@@ -21,11 -21,13 +21,10 @@@ import javax.measure.Quantity
import org.opengis.geometry.Envelope;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryType;
-
import static org.apache.sis.geometry.wrapper.GeometryType.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.EnumMap;
-import org.opengis.filter.SpatialOperatorName;
-import org.opengis.filter.capability.AvailableFunction;
-import org.apache.sis.setup.GeometryLibrary;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.filter.SpatialOperatorName;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
index cf89a46cd2,0dc30c1872..f410dcb375
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
@@@ -24,10 -25,9 +25,8 @@@ import org.apache.sis.geometry.wrapper.
import org.apache.sis.util.internal.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
- import static java.lang.Double.isNaN;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Expression;
-import org.opengis.filter.InvalidFilterValueException;
+// Specific to the main branch:
+import org.apache.sis.filter.Expression;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
index e3d16af3ca,f94ebc469d..217a7c69c5
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
@@@ -45,10 -46,11 +46,8 @@@ import org.apache.sis.measure.NumberRan
import org.apache.sis.util.internal.Numerics;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.coverage.grid.j2d.ImageUtilities;
-
- import static java.lang.Math.floorDiv;
import static org.apache.sis.util.internal.Numerics.ceilDiv;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.grid.SequenceType;
-
/**
* An iterator over sample values in a raster or an image. This iterator makes easier to read and write efficiently
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
index eadd1d3a62,03f123a749..c079f7f701
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
@@@ -34,10 -35,8 +35,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.crs.HardCodedCRS;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index b41c8749b3,d15ce5ba02..e2ceeef25f
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@@ -42,13 -44,10 +44,10 @@@ import static org.opengis.test.Assert.a
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.crs.HardCodedCRS;
-
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.PointOutsideCoverageException;
+// Specific to the main branch:
+import org.apache.sis.coverage.PointOutsideCoverageException;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
index 32ef594f36,b1bbb5e4ed..fb827c7c50
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
@@@ -47,14 -50,10 +50,10 @@@ import org.apache.sis.test.DependsOn
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
-
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertBetween;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
- import static org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
index d1454d425d,b9f3646dae..2b24e88d0b
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
@@@ -45,11 -44,10 +44,10 @@@ import static org.apache.sis.test.Asser
import static org.apache.sis.test.Assertions.assertMultilinesEquals;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.PointOutsideCoverageException;
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import org.apache.sis.coverage.PointOutsideCoverageException;
-
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
index 90fde933a4,e0823cdc82..ec84bf6414
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
@@@ -39,12 -40,10 +40,10 @@@ import org.apache.sis.test.TestCase
import org.apache.sis.test.DependsOn;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
-
- import static org.junit.Assert.*;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/PixelTranslationTest.java
index b4c37361d2,2d400ebe35..6104ec51df
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/PixelTranslationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/PixelTranslationTest.java
@@@ -26,12 -26,11 +26,11 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/AbstractFeatureTest.java
index 622822c31d,8b6d58b4ea..1ba92ae384
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/AbstractFeatureTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/AbstractFeatureTest.java
@@@ -21,10 -21,15 +21,9 @@@ import java.util.ArrayList
import java.util.Collection;
// Test dependencies
- import org.apache.sis.test.DependsOn;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.Property;
-import org.opengis.feature.PropertyType;
-
/**
* Tests some default method implementations provided in {@link AbstractFeature}.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
index 4ab9c42adc,64d6c63c38..e06ef3b5ca
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
@@@ -24,10 -24,11 +24,11 @@@ import java.awt.geom.PathIterator
import org.apache.sis.image.PixelIterator;
import org.apache.sis.util.Static;
+ // Test dependencies
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.grid.SequenceType;
+// Specific to the main branch:
+import org.apache.sis.image.SequenceType;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/CharacteristicMapTest.java
index b561b851ae,f830fa749b..4e42561d18
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/CharacteristicMapTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/CharacteristicMapTest.java
@@@ -25,10 -26,11 +26,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-
/**
* Tests {@link CharacteristicMap} indirectly, through {@link AbstractAttribute} construction.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/CharacteristicTypeMapTest.java
index 6e94e8e0f4,081ac5b149..4bf855a66e
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/CharacteristicTypeMapTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/CharacteristicTypeMapTest.java
@@@ -22,13 -23,14 +23,11 @@@ import static org.apache.sis.feature.De
// Test dependencies
import org.junit.Test;
+ import static org.junit.Assert.*;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static org.apache.sis.feature.DefaultAssociationRole.NAME_KEY;
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-
/**
* Tests {@link CharacteristicTypeMap} indirectly, through {@link DefaultAttributeType} construction.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
index 29aa4f0102,5bf11a077a..90c235aa55
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
@@@ -31,13 -31,17 +31,12 @@@ import org.apache.sis.geometry.wrapper.
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
- import org.apache.sis.referencing.crs.HardCodedCRS;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.TestCase;
+ import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-
/**
* Tests {@link EnvelopeOperation}.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureFormatTest.java
index e767432065,005a98607a..e82b38d39f
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureFormatTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureFormatTest.java
@@@ -28,9 -28,11 +28,8 @@@ import org.junit.Test
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-
import static org.apache.sis.test.Assertions.assertMultilinesEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.PropertyType;
-
/**
* Tests {@link FeatureFormat}.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
index 712e7783d1,2e10a3e601..99a365283b
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
@@@ -32,11 -34,13 +34,8 @@@ import static org.opengis.test.Assert.a
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.Property;
-
/**
* Tests common to {@link DenseFeatureTest} and {@link SparseFeatureTest}.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeaturesTest.java
index d5dcae7f06,0170cf9f05..45f4317bff
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeaturesTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeaturesTest.java
@@@ -21,8 -22,10 +22,6 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.InvalidPropertyValueException;
--
/**
* Tests {@link Features}.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/GroupAsPolylineOperationTest.java
index c55fe1d437,7534dbddf1..dc7044993b
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/GroupAsPolylineOperationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/GroupAsPolylineOperationTest.java
@@@ -25,10 -25,15 +25,9 @@@ import org.apache.sis.setup.GeometryLib
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-import org.opengis.feature.Feature;
-import org.opengis.feature.Operation;
-import org.opengis.feature.Property;
-
/**
* Tests {@link GroupAsPolylineOperation}.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java
index bf381978c3,6b377aaba5..a7ab5477ca
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/StringJoinOperationTest.java
@@@ -25,8 -26,12 +26,6 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.InvalidPropertyValueException;
--
/**
* Tests {@link StringJoinOperation}.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
index af5ec1a5e4,a6308b3923..74ef8662ae
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
@@@ -21,12 -21,11 +21,11 @@@ import org.apache.sis.util.SimpleIntern
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.FeatureAssociationRole;
+// Specific to the main branch:
+import org.apache.sis.feature.DefaultAssociationRole;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
index b4e905cad5,abe84725ff..fa18c86ef9
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
@@@ -29,17 -31,15 +31,14 @@@ import static org.opengis.test.Assert.a
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertSetEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.Property;
-import org.opengis.feature.PropertyType;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractAttribute;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.DefaultAttributeType;
+import org.apache.sis.feature.DefaultFeatureType;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
index 7ad9c04660,e84353326e..79ee6660a7
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
@@@ -20,13 -20,12 +20,12 @@@ import java.util.Set
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSetEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
+// Specific to the main branch:
+import org.apache.sis.feature.DefaultAttributeType;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
index 96c6eabcd0,9dd11029da..45ca2703ce
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
@@@ -34,12 -35,12 +35,10 @@@ import org.apache.sis.test.DependsOn
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.crs.HardCodedCRS;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.IdentifiedType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.Operation;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.DefaultAttributeType;
+import org.apache.sis.feature.DefaultFeatureType;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/AttributeConventionTest.java
index 12d867f070,ea0270df34..c3170b0d97
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/AttributeConventionTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/AttributeConventionTest.java
@@@ -29,10 -30,10 +30,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.crs.HardCodedCRS;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Property;
-import org.opengis.feature.Operation;
-import org.opengis.feature.IdentifiedType;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractOperation;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ArithmeticFunctionTest.java
index 012871a1b1,d9bf9ece3f..83599c21fa
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ArithmeticFunctionTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ArithmeticFunctionTest.java
@@@ -18,13 -18,14 +18,12 @@@ package org.apache.sis.filter
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.Expression;
-import org.opengis.filter.FilterFactory;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/BinarySpatialFilterTestCase.java
index 5186896aab,281e9fd3a0..8b70ec5e0a
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/BinarySpatialFilterTestCase.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/BinarySpatialFilterTestCase.java
@@@ -37,15 -39,16 +39,12 @@@ import static org.opengis.test.Assert.a
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
-
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.Expression;
-import org.opengis.filter.Literal;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.DistanceOperator;
-import org.opengis.filter.DistanceOperatorName;
-import org.opengis.filter.BinarySpatialOperator;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.pending.geoapi.filter.Literal;
+import org.apache.sis.pending.geoapi.filter.DistanceOperatorName;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java
index 824f983654,a4f0db9f27..e123b0a28c
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java
@@@ -18,16 -18,20 +18,15 @@@ package org.apache.sis.filter
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.Literal;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.ComparisonOperator;
-import org.opengis.filter.ComparisonOperatorName;
-import org.opengis.filter.BinaryComparisonOperator;
-import org.opengis.filter.BetweenComparisonOperator;
-import org.apache.sis.filter.internal.FunctionNames;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.pending.geoapi.filter.ComparisonOperatorName;
+import org.apache.sis.pending.geoapi.filter.BetweenComparisonOperator;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/IdentifierFilterTest.java
index c2113958dc,b97d26038c..63ce015952
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/IdentifierFilterTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/IdentifierFilterTest.java
@@@ -21,14 -21,15 +21,13 @@@ import org.apache.sis.feature.builder.F
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.Filter;
-import org.opengis.filter.FilterFactory;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/LeafExpressionTest.java
index 9a9f1700cb,a11a171b27..9df7b2076f
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/LeafExpressionTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/LeafExpressionTest.java
@@@ -20,15 -20,15 +20,14 @@@ import org.apache.sis.feature.builder.F
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.Literal;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.pending.geoapi.filter.Literal;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/LikeFilterTest.java
index 283e9c6fc3,38b6b191c3..a63ebeb5c0
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/LikeFilterTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/LikeFilterTest.java
@@@ -18,12 -18,13 +18,11 @@@ package org.apache.sis.filter
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.Literal;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/LogicalFilterTest.java
index f26be0afc9,fc7206666e..cf9dc6ed1d
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/LogicalFilterTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/LogicalFilterTest.java
@@@ -27,16 -27,19 +27,15 @@@ import org.apache.sis.math.FunctionProp
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.Expression;
-import org.opengis.filter.Filter;
-import org.opengis.filter.Literal;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.LogicalOperator;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.pending.geoapi.filter.LogicalOperator;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
index e29b6cbd9a,1d0d72ead3..5fd32f6feb
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
@@@ -20,17 -21,18 +21,15 @@@ import static org.apache.sis.util.inter
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
- import org.apache.sis.test.TestUtilities;
-
- import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.TestCase;
+ import org.apache.sis.test.TestUtilities;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.Expression;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.TemporalOperator;
-import org.opengis.filter.TemporalOperatorName;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.pending.geoapi.filter.TemporalOperatorName;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FunctionNamesTest.java
index a96dec9d9b,d239aa8540..4bf7dcf371
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FunctionNamesTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/internal/FunctionNamesTest.java
@@@ -21,10 -21,21 +21,9 @@@ import org.apache.sis.filter.sqlmm.SQLM
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.List;
-import org.opengis.filter.Literal;
-import org.opengis.filter.ValueReference;
-import org.opengis.filter.ComparisonOperator;
-import org.opengis.filter.ComparisonOperatorName;
-import org.opengis.filter.BetweenComparisonOperator;
-import org.opengis.filter.NullOperator;
-import org.opengis.filter.NilOperator;
-import org.opengis.filter.LikeOperator;
-import org.opengis.filter.Expression;
-
/**
* Verifies the values declared in {@link FunctionNames}.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/RegistryTestCase.java
index 3356655c1e,9fd63c3a45..df26d619a6
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/RegistryTestCase.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/RegistryTestCase.java
@@@ -40,14 -42,14 +42,11 @@@ import org.apache.sis.test.TestCase
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.referencing.crs.HardCodedCRS;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.Literal;
-import org.opengis.filter.Expression;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.ValueReference;
-import org.opengis.filter.capability.AvailableFunction;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.filter.Expression;
+import org.apache.sis.pending.geoapi.filter.Literal;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/SQLMMTest.java
index 16253e076a,d0037a9554..b24f327a54
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/SQLMMTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/SQLMMTest.java
@@@ -27,16 -27,16 +27,15 @@@ import org.apache.sis.filter.DefaultFil
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
- import org.apache.sis.referencing.crs.HardCodedCRS;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.TestCase;
+ import org.apache.sis.referencing.crs.HardCodedCRS;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Literal;
-import org.opengis.filter.Expression;
-import org.opengis.filter.FilterFactory;
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import java.util.function.Function;
+import org.apache.sis.filter.Expression;
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandedIteratorTest.java
index 0e608b7557,baabfa66ce..66eff922da
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandedIteratorTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/BandedIteratorTest.java
@@@ -22,8 -22,12 +22,9 @@@ import java.awt.image.DataBuffer
import java.awt.image.WritableRaster;
import java.awt.image.WritableRenderedImage;
+ // Test dependencies
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.grid.SequenceType;
-
/**
* Tests {@link BandedIterator} on floating point values.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/LinearIteratorTest.java
index bbda965a84,1c20cc6e3e..3f1705dbbe
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/LinearIteratorTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/LinearIteratorTest.java
@@@ -20,8 -20,12 +20,9 @@@ import java.awt.Dimension
import java.awt.Rectangle;
import java.awt.image.DataBuffer;
+ // Test dependencies
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.grid.SequenceType;
-
/**
* Tests the linear read-write iterator on signed short integer values.
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/PixelIteratorTest.java
index 7e334c1624,07afaea93b..9903c8ccba
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/PixelIteratorTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/PixelIteratorTest.java
@@@ -41,8 -42,9 +42,6 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.grid.SequenceType;
--
/**
* Base class of {@link PixelIterator}Â tests. This base class tests the default read-write iterator
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
index d13e9e2119,6b77e6ecf3..431cfa789b
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
@@@ -20,11 -20,10 +20,10 @@@ import java.util.Iterator
import java.util.Collection;
import org.apache.sis.util.Emptiable;
import org.apache.sis.util.internal.CollectionsExt;
-
import static org.apache.sis.metadata.ValueExistencePolicy.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
index 93d698e6ef,5dc31db8e1..68a099c166
--- 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
@@@ -41,11 -40,9 +40,10 @@@ import static org.apache.sis.metadata.i
import org.opengis.metadata.Obligation;
import org.opengis.metadata.citation.ResponsibleParty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.AbstractSet;
-import java.util.Iterator;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java
index ae4f675b0d,ad11bc08d7..6701959ab1
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java
@@@ -27,13 -27,6 +27,12 @@@ import org.apache.sis.metadata.TitlePro
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.xml.Namespaces;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Value uniquely identifying an object within a namespace.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
index d7180d3578,9313015996..65315e56f9
--- 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
@@@ -86,15 -86,8 +86,14 @@@ import org.apache.sis.math.FunctionProp
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.citation.ResponsibleParty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.MetadataScope;
+// Specific to the main branch:
+import java.util.LinkedHashMap;
+import org.opengis.annotation.UML;
- import org.apache.sis.xml.bind.metadata.code.MD_CharacterSetCode;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
++import org.apache.sis.xml.bind.metadata.code.MD_CharacterSetCode;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadataScope.java
index fd34715200,c1fe82dee6..121d6a7074
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadataScope.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadataScope.java
@@@ -23,12 -23,8 +23,11 @@@ import org.opengis.util.InternationalSt
import org.opengis.metadata.maintenance.ScopeCode;
import org.apache.sis.util.iso.Types;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.MetadataScope;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/AbstractParty.java
index 328cd94753,143fe50b98..7d413cb0da
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/AbstractParty.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/AbstractParty.java
@@@ -30,12 -30,10 +30,11 @@@ import org.apache.sis.util.iso.Types
import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.bind.NonMarshalledAuthority;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Individual;
-import org.opengis.metadata.citation.Organisation;
-import org.opengis.metadata.citation.Party;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java
index 0bacaac16a,d3324e523e..acd3aa01cc
--- 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
@@@ -45,12 -44,6 +44,11 @@@ import static org.apache.sis.metadata.i
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.citation.ResponsibleParty;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Standardized resource reference.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
index a6888aa431,dba053de9b..4c66e3883f
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
@@@ -38,13 -38,8 +38,12 @@@ import org.apache.sis.metadata.iso.lega
import org.apache.sis.xml.util.LegacyNamespaces;
import org.apache.sis.util.internal.CollectionsExt;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.TelephoneType;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
+import org.opengis.annotation.UML;
- import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
++import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
index 5b60fec56e,e4da2f89f5..2184dddcd0
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
@@@ -23,11 -23,8 +23,10 @@@ import org.opengis.metadata.citation.Co
import org.opengis.util.InternationalString;
import org.apache.sis.util.iso.Types;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Individual;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
index ed59564e65,c190272db0..c19fd68fa6
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
@@@ -28,12 -28,6 +28,11 @@@ import org.apache.sis.xml.bind.gco.Stri
import org.apache.sis.xml.bind.gco.URIAdapter;
import org.apache.sis.metadata.iso.ISOMetadata;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Information about on-line sources from which the dataset, specification, or
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
index 2713e01a82,bda3d51e1c..2483bd4d79
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
@@@ -23,12 -23,9 +23,11 @@@ import jakarta.xml.bind.annotation.XmlR
import org.opengis.metadata.citation.Contact;
import org.opengis.metadata.identification.BrowseGraphic;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Individual;
-import org.opengis.metadata.citation.Organisation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
index e8476a02ea,c8e0224023..d6ae6345e2
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
@@@ -28,13 -28,9 +28,12 @@@ import org.apache.sis.metadata.iso.ISOM
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.code.CI_RoleCode;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Responsibility;
+// Specific to the main branch:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
index 3e282840d7,36ef2c6dfb..347896f084
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
@@@ -31,9 -31,14 +31,8 @@@ import org.apache.sis.util.iso.Types
import org.apache.sis.xml.util.LegacyNamespaces;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Individual;
-import org.opengis.metadata.citation.Organisation;
-import org.opengis.metadata.citation.Responsibility;
-
/**
* Identification of, and means of communication with, person(s) and
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
index 51c40edeab,ac9ec050f4..75288628fa
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
@@@ -32,15 -32,8 +32,14 @@@ import org.apache.sis.xml.bind.gco.Stri
import org.apache.sis.xml.bind.metadata.code.CI_TelephoneTypeCode;
import org.apache.sis.metadata.internal.Dependencies;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.TelephoneType;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
+import org.opengis.annotation.UML;
- import org.apache.sis.pending.geoapi.evolution.InterimType;
- import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
++import org.apache.sis.pending.geoapi.evolution.InterimType;
++import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
index ef89700968,546a8735f1..18e38c7fda
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
@@@ -32,15 -31,13 +32,14 @@@ import org.apache.sis.metadata.iso.ISOM
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.MD_Releasability;
import org.apache.sis.xml.bind.metadata.MD_Scope;
-import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.util.iso.Types;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Responsibility;
-import org.opengis.metadata.constraint.Releasability;
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
+import org.opengis.annotation.UML;
- import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
++import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
index 5e7199b114,0575585a7c..5c55f902c6
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
@@@ -24,12 -24,9 +24,11 @@@ import org.opengis.util.InternationalSt
import org.opengis.metadata.constraint.Restriction;
import org.apache.sis.metadata.iso.ISOMetadata;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.constraint.Releasability;
-import org.opengis.metadata.citation.Responsibility;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
- import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
++import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
index da4df9bc01,0aa5264b6a..340219ccd4
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
@@@ -24,12 -24,8 +24,11 @@@ import org.opengis.metadata.content.Cov
import org.opengis.metadata.content.RangeDimension;
import org.apache.sis.metadata.iso.ISOMetadata;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.AttributeGroup;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java
index 65e938e5c2,2d29983b29..9dd3cb835a
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java
@@@ -35,12 -34,6 +34,11 @@@ import static org.apache.sis.metadata.i
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.content.PolarizationOrientation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Range of wavelengths in the electromagnetic spectrum.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
index be974c5d48,b7f7547db4..8a631e7162
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
@@@ -36,14 -36,10 +36,12 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.MD_Identifier;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.AttributeGroup;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
index 0c4810447a,12b9793aa7..0c18db8760
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
@@@ -32,15 -32,10 +32,13 @@@ import org.apache.sis.xml.bind.lan.PT_L
import org.apache.sis.xml.bind.lan.LocaleAndCharset;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.FeatureTypeInfo;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
index 42530a3a70,850a2cf4c2..9ed23460fb
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
@@@ -23,15 -23,10 +23,13 @@@ import org.opengis.util.GenericName
import org.apache.sis.measure.ValueRange;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.ISOMetadata;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.ensurePositive;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.FeatureTypeInfo;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
index 9a9a54b76a,be7de419ec..1d0b7a92ea
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
@@@ -33,12 -33,8 +33,11 @@@ import org.apache.sis.xml.util.LegacyNa
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gco.InternationalStringAdapter;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.SampleDimension;
+// Specific to the main branch:
+import org.opengis.metadata.content.Band;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
index 6399c07fc7,6c397d023c..ed5c325150
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
@@@ -35,15 -35,10 +35,13 @@@ import org.apache.sis.xml.bind.gco.GO_I
import org.apache.sis.xml.bind.gco.GO_Record;
import org.apache.sis.xml.bind.gco.GO_RecordType;
import org.apache.sis.xml.bind.metadata.MI_RangeElementDescription;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.ensurePositive;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.SampleDimension;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
index 2af6c979e0,5d02f045ee..f783b0ec93
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
@@@ -34,15 -34,8 +34,13 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gts.TM_PeriodDuration;
import org.apache.sis.util.internal.CollectionsExt;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.ensurePositive;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Technical means and media by which a resource is obtained from the distributor.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
index 2d32387f68,d922d179a8..b0f1367b42
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
@@@ -30,12 -30,6 +30,11 @@@ import org.apache.sis.metadata.TitlePro
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.xml.bind.gco.InternationalStringAdapter;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Information about the distributor of and options for obtaining the resource.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
index dc9fdc73a8,0ede0cd45a..3fd87d27ac
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
@@@ -37,13 -37,6 +37,12 @@@ import org.apache.sis.xml.bind.metadata
import org.apache.sis.util.internal.CollectionsExt;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Description of the computer language construct that specifies the representation
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
index f4eb50ae5e,711d17008d..917c08b499
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
@@@ -45,12 -44,9 +44,11 @@@ import org.opengis.metadata.distributio
import org.apache.sis.util.internal.CodeLists;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.AbstractSet;
-import java.util.Iterator;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+import static org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
index 3be47dd14f,e489216d00..f1e29c28c6
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
@@@ -32,13 -32,6 +32,11 @@@ import org.apache.sis.metadata.iso.ISOM
import static org.apache.sis.metadata.internal.ImplementationHelper.toDate;
import static org.apache.sis.metadata.internal.ImplementationHelper.toMilliseconds;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Common ways in which the resource may be obtained or received, and related instructions
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
index 30d429a4d1,89e5d1154d..3eee5653b3
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
@@@ -28,15 -28,8 +28,13 @@@ import org.opengis.metadata.extent.Geog
import org.opengis.metadata.extent.SpatialTemporalExtent;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.metadata.internal.ReferencingServices;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Extent with respect to date/time and spatial boundaries.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
index 0eee273848,2831a2d5d5..09af6cd6ea
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
@@@ -51,14 -51,9 +51,13 @@@ import org.apache.sis.util.iso.Types
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.citation.ResponsibleParty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.AssociatedResource;
-import org.opengis.temporal.Duration;
+// Specific to the main branch:
+import java.util.List;
+import java.util.ArrayList;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
index 0c5ba82de2,760eb8f34e..1a2417928f
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
@@@ -28,14 -28,8 +28,13 @@@ import org.apache.sis.xml.bind.metadata
import org.apache.sis.xml.bind.metadata.code.DS_InitiativeTypeCode;
import org.apache.sis.metadata.iso.ISOMetadata;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.AssociatedResource;
+// Specific to the main branch:
+import org.opengis.metadata.identification.AggregateInformation;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
index 02452a14f2,d6be803b2a..dbb04dea3b
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
@@@ -31,12 -31,6 +31,11 @@@ import org.apache.sis.xml.Namespaces
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gcx.MimeFileTypeAdapter;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Graphic that provides an illustration of the dataset (should include a legend for the graphic).
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
index db0b99c3a8,cb5e6d8a0d..e3bc720f6e
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
@@@ -34,11 -34,9 +34,10 @@@ import org.apache.sis.xml.bind.gco.GO_G
import org.apache.sis.util.internal.Constants;
import org.apache.sis.util.iso.Names;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.CoupledResource;
-import org.opengis.metadata.identification.OperationMetadata;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
index 058ade0dd7,e90fc2754e..172d08d6ec
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
@@@ -39,13 -39,6 +39,12 @@@ import org.apache.sis.metadata.internal
import java.util.stream.Collectors;
import org.opengis.metadata.identification.CharacterSet;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
- import org.apache.sis.xml.bind.metadata.code.MD_CharacterSetCode;
-
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
++import org.apache.sis.xml.bind.metadata.code.MD_CharacterSetCode;
+
/**
* Information required to identify a dataset.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
index 25a35aeb53,018e3af69a..47734466b4
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
@@@ -29,11 -29,8 +29,10 @@@ import org.apache.sis.xml.bind.metadata
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.util.iso.Types;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.KeywordClass;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
index 7e027451e8,65609a0149..ba87b298f9
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
@@@ -26,12 -26,9 +26,11 @@@ import org.apache.sis.metadata.iso.ISOM
import org.apache.sis.util.iso.Types;
import org.apache.sis.xml.Namespaces;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.OperationChainMetadata;
-import org.opengis.metadata.identification.OperationMetadata;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
index 04ce2a7f51,aeb27cdf20..bfc64233c2
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
@@@ -28,15 -28,9 +28,14 @@@ import org.apache.sis.metadata.TitlePro
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.xml.Namespaces;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.DistributedComputingPlatform;
-import org.opengis.metadata.identification.OperationMetadata;
+// Specific to the main branch:
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.opengis.util.CodeList;
+import org.opengis.annotation.UML;
- import org.apache.sis.xml.bind.metadata.code.DCPList;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
++import org.apache.sis.xml.bind.metadata.code.DCPList;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java
index f8ca4da436,757875fe3a..604fb25942
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java
@@@ -30,15 -30,8 +30,13 @@@ import org.apache.sis.xml.bind.gco.Inte
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.util.resources.Messages;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.ensurePositive;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Level of detail expressed as a scale factor or a ground distance.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
index 5abdeb1073,1e86ce0781..bf87bb7e9c
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
@@@ -29,16 -29,11 +29,15 @@@ import org.opengis.metadata.distributio
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.bind.FilterByVersion;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.CoupledResource;
-import org.opengis.metadata.identification.CouplingType;
-import org.opengis.metadata.identification.OperationChainMetadata;
-import org.opengis.metadata.identification.OperationMetadata;
+// Specific to the main branch:
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.opengis.util.CodeList;
+import org.opengis.annotation.UML;
- import org.apache.sis.xml.bind.metadata.code.SV_CouplingType;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
++import org.apache.sis.xml.bind.metadata.code.SV_CouplingType;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultUsage.java
index 68ac46ff48,adc675c94d..0077e9fe21
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultUsage.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultUsage.java
@@@ -35,12 -34,6 +34,11 @@@ import static org.apache.sis.metadata.i
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.citation.ResponsibleParty;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Brief description of ways in which the resource(s) is/are currently or has been used.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
index 293ec9d820,4faa4c3ed4..e448b84714
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
@@@ -32,12 -32,8 +32,11 @@@ import org.apache.sis.metadata.iso.main
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.MD_Scope;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
index 1a66111e3c,f1881f9296..f93e6c90e7
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
@@@ -42,12 -42,8 +42,11 @@@ import org.apache.sis.metadata.internal
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.citation.ResponsibleParty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultSource.java
index be7a51e60c,6489127c0c..fae035cc51
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultSource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultSource.java
@@@ -45,13 -45,8 +45,12 @@@ import org.apache.sis.xml.util.LegacyNa
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.util.iso.Types;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
index c14c8d75db,b9571b8343..09cb2770b5
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
@@@ -44,12 -43,8 +43,11 @@@ import static org.apache.sis.metadata.i
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.citation.ResponsibleParty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScope.java
index d9a5ad34a8,a58349d970..57cde0b37a
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScope.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScope.java
@@@ -26,16 -26,9 +26,15 @@@ import org.opengis.metadata.maintenance
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.xml.Namespaces;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
+import org.opengis.annotation.UML;
++import static org.opengis.annotation.Obligation.OPTIONAL;
++import static org.opengis.annotation.Specification.ISO_19115;
+import org.apache.sis.metadata.internal.Dependencies;
+import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
+import org.apache.sis.util.internal.CollectionsExt;
- import static org.opengis.annotation.Obligation.OPTIONAL;
- import static org.opengis.annotation.Specification.ISO_19115;
-
/**
* The target resource and physical extent for which information is reported.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractDataEvaluation.java
index 31e2680c4c,8ff2b9cd9e..32bb11bd03
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractDataEvaluation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractDataEvaluation.java
@@@ -20,10 -20,11 +20,9 @@@ import jakarta.xml.bind.annotation.XmlT
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlSeeAlso;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.DataEvaluation;
-import org.opengis.metadata.quality.FullInspection;
-import org.opengis.metadata.quality.IndirectEvaluation;
-import org.opengis.metadata.quality.SampleBasedInspection;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java
index ae6116c3b4,b93c037314..bdc8a4195a
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java
@@@ -44,15 -44,13 +44,13 @@@ import org.apache.sis.metadata.iso.lega
import org.apache.sis.metadata.iso.legacy.TemporalToDate;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.xml.util.LegacyNamespaces;
-
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.TemporalQuality;
-import org.opengis.metadata.quality.EvaluationMethod;
-import org.opengis.metadata.quality.MeasureReference;
-import org.opengis.metadata.quality.Metaquality;
+// Specific to the main branch:
+import org.opengis.metadata.quality.TemporalAccuracy;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractMetaquality.java
index 6bf68543de,3bec1326cf..b01ace4a62
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractMetaquality.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractMetaquality.java
@@@ -20,10 -20,11 +20,9 @@@ import jakarta.xml.bind.annotation.XmlT
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlSeeAlso;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.Metaquality;
-import org.opengis.metadata.quality.Confidence;
-import org.opengis.metadata.quality.Representativity;
-import org.opengis.metadata.quality.Homogeneity;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractResult.java
index 47f5256407,3380c3d6f0..7971ee981f
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractResult.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractResult.java
@@@ -29,12 -29,9 +29,11 @@@ import org.opengis.metadata.quality.Qua
import org.apache.sis.xml.bind.metadata.MD_Scope;
import org.apache.sis.xml.bind.gco.GO_Temporal;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.DescriptiveResult;
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
index 30f8f3a005,7650b12022..318c7d2c5e
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
@@@ -24,10 -24,8 +24,9 @@@ import org.opengis.metadata.quality.Tem
import org.opengis.metadata.quality.AccuracyOfATimeMeasurement;
import org.opengis.metadata.quality.TemporalAccuracy;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.TemporalQuality;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultAggregationDerivation.java
index 6b27a3eedb,df88548b8d..e1a39d9585
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultAggregationDerivation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultAggregationDerivation.java
@@@ -19,10 -19,8 +19,9 @@@ package org.apache.sis.metadata.iso.qua
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.AggregationDerivation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultBasicMeasure.java
index d34dc0b153,6b67edddf3..cc69315dc7
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultBasicMeasure.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultBasicMeasure.java
@@@ -23,12 -23,9 +23,11 @@@ import org.opengis.util.TypeName
import org.opengis.util.InternationalString;
import org.apache.sis.xml.Namespaces;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.Description;
-import org.opengis.metadata.quality.BasicMeasure;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultConfidence.java
index 0b7b5b7c07,3566066db0..f642dd4a48
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultConfidence.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultConfidence.java
@@@ -19,10 -19,8 +19,9 @@@ package org.apache.sis.metadata.iso.qua
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.Confidence;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
index 63244fce40,ac9ec53cac..2759dada28
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
@@@ -30,12 -30,6 +30,11 @@@ import org.opengis.metadata.spatial.Spa
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.util.LegacyNamespaces;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
+
/**
* Result of a data quality measure organising the measured values as a coverage.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
index b141dc2415,15d63d2be2..7a020062ac
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
@@@ -30,12 -30,8 +30,11 @@@ import org.apache.sis.xml.util.LegacyNa
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.quality.Scope;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.StandaloneQualityReportInformation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
- import org.apache.sis.metadata.iso.ISOMetadata;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
++import org.apache.sis.metadata.iso.ISOMetadata;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDescriptiveResult.java
index a2c2ce1d0a,a41261dcbf..00366eb44c
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDescriptiveResult.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDescriptiveResult.java
@@@ -22,11 -22,8 +22,10 @@@ import jakarta.xml.bind.annotation.XmlR
import org.opengis.util.InternationalString;
import org.apache.sis.util.iso.Types;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.DescriptiveResult;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
index 2dd778422e,cd17f22a8a..eeaf63982f
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
@@@ -36,12 -36,10 +36,10 @@@ import org.apache.sis.util.resources.Er
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
import static org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.EvaluationMethod;
-import org.opengis.metadata.quality.DataEvaluation;
-import org.opengis.metadata.quality.AggregationDerivation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationReportInformation.java
index d381150c16,d29283b53c..e53b528e0c
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationReportInformation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationReportInformation.java
@@@ -22,11 -22,8 +22,10 @@@ import jakarta.xml.bind.annotation.XmlR
import org.opengis.util.InternationalString;
import org.opengis.metadata.citation.Citation;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.StandaloneQualityReportInformation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultFullInspection.java
index 54988e3237,e90f302036..d51797c491
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultFullInspection.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultFullInspection.java
@@@ -19,10 -19,8 +19,9 @@@ package org.apache.sis.metadata.iso.qua
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.FullInspection;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultHomogeneity.java
index 4d3b559c1f,914eece78a..7155a84165
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultHomogeneity.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultHomogeneity.java
@@@ -19,10 -19,8 +19,9 @@@ package org.apache.sis.metadata.iso.qua
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.Homogeneity;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultIndirectEvaluation.java
index d03fcc9fc2,507721fa6e..a37eefe49c
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultIndirectEvaluation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultIndirectEvaluation.java
@@@ -22,11 -22,8 +22,10 @@@ import jakarta.xml.bind.annotation.XmlR
import org.opengis.util.InternationalString;
import org.apache.sis.util.iso.Types;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.IndirectEvaluation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureDescription.java
index 8b55d231fc,892101f864..c5b99f0ab8
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureDescription.java
@@@ -24,12 -24,8 +24,11 @@@ import org.opengis.metadata.identificat
import org.apache.sis.util.iso.Types;
import org.apache.sis.xml.Namespaces;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.Description;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
index a108287fac,7a727c5cf2..884e697ec9
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
@@@ -25,12 -25,8 +25,11 @@@ import org.opengis.metadata.Identifier
import org.opengis.metadata.quality.Element;
import org.apache.sis.util.internal.CollectionsExt;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.MeasureReference;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
index f93a402dc6,29f0309373..9200bab2c5
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
@@@ -21,10 -21,8 +21,9 @@@ import jakarta.xml.bind.annotation.XmlS
import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.metadata.quality.NonQuantitativeAttributeAccuracy;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.NonQuantitativeAttributeCorrectness;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultQualityMeasure.java
index 35fab7d839,6358b3924d..93f45c6620
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultQualityMeasure.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultQualityMeasure.java
@@@ -26,13 -26,12 +26,12 @@@ import org.opengis.parameter.ParameterD
import org.opengis.metadata.Identifier;
import org.apache.sis.xml.Namespaces;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.Measure;
-import org.opengis.metadata.quality.BasicMeasure;
-import org.opengis.metadata.quality.Description;
-import org.opengis.metadata.quality.SourceReference;
-import org.opengis.metadata.quality.ValueStructure;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultRepresentativity.java
index a2e788af0e,dab48a93c6..d48ab94e02
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultRepresentativity.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultRepresentativity.java
@@@ -19,10 -19,8 +19,9 @@@ package org.apache.sis.metadata.iso.qua
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.Representativity;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultSampleBasedInspection.java
index 29e6c0c6c3,f7e95cb3d5..a064e537c8
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultSampleBasedInspection.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultSampleBasedInspection.java
@@@ -21,11 -21,8 +21,10 @@@ import jakarta.xml.bind.annotation.XmlE
import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.util.InternationalString;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.SampleBasedInspection;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultSourceReference.java
index cfb8fd3db6,b8cf6ca8d6..6a69eb7f34
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultSourceReference.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultSourceReference.java
@@@ -22,11 -22,8 +22,10 @@@ import jakarta.xml.bind.annotation.XmlR
import org.opengis.metadata.citation.Citation;
import org.apache.sis.xml.Namespaces;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.SourceReference;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
index 069090347f,f24c62a3ba..4e6eb3d37a
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
@@@ -30,15 -30,8 +30,13 @@@ import org.apache.sis.metadata.TitlePro
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.util.ArgumentChecks;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.ensurePositive;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Axis properties.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
index d63d96e878,e93d417174..bf90988817
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
@@@ -21,12 -21,8 +21,11 @@@ import org.opengis.metadata.extent.Exte
import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.metadata.extent.TemporalExtent;
import org.opengis.metadata.extent.VerticalExtent;
-
import static org.apache.sis.util.internal.CollectionsExt.singletonOrEmpty;
+// Specific to the main branch:
+import org.opengis.util.InternationalString;
+
/**
* A trivial implementation of {@link Extent} containing only geographic, vertical and temporal extent.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/geoapi/evolution/Interim.java
index 53b6102495,0000000000..1aba3a5484
mode 100644,000000..100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/geoapi/evolution/Interim.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/geoapi/evolution/Interim.java
@@@ -1,70 -1,0 +1,69 @@@
+/*
+ * 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.pending.geoapi.evolution;
+
+// Specific to the main branch:
+import java.lang.reflect.Method;
++import static java.util.logging.Logger.getLogger;
+import org.opengis.geometry.Envelope;
+import org.opengis.geometry.Geometry;
+import org.apache.sis.util.Static;
+import org.apache.sis.util.logging.Logging;
+import org.apache.sis.system.Modules;
+
- import static java.util.logging.Logger.getLogger;
-
+
+/**
+ * Temporary methods used until a new major GeoAPI release provides the missing functionalities.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @version 1.1
+ * @since 0.8
+ */
+public final class Interim extends Static {
+ /**
+ * Do not allow instantiation of this class.
+ */
+ private Interim() {
+ }
+
+ /**
+ * Returns the return type of the given method, or the interim type if the method is annotated
+ * with {@link InterimType}.
+ *
+ * @param method the method from which to get the return type.
+ * @return the return type or the interim type.
+ */
+ public static Class<?> getReturnType(final Method method) {
+ final InterimType an = method.getAnnotation(InterimType.class);
+ return (an != null) ? an.value() : method.getReturnType();
+ }
+
+ /**
+ * Invokes {@code Geometry.getEnvelope()} if that method exists.
+ *
+ * @param geometry the geometry from which to get the envelope.
+ * @return the geometry envelope, or {@code null} if none.
+ */
+ public static Envelope getEnvelope(final Geometry geometry) {
+ try {
+ return (Envelope) geometry.getClass().getMethod("getEnvelope").invoke(geometry);
+ } catch (ReflectiveOperationException | ClassCastException e) {
+ Logging.recoverableException(getLogger(Modules.METADATA), Interim.class, "getEnvelope", e);
+ return null;
+ }
+ }
+}
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/geoapi/evolution/UnsupportedCodeList.java
index 607fee7589,0000000000..32179593dd
mode 100644,000000..100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/geoapi/evolution/UnsupportedCodeList.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/geoapi/evolution/UnsupportedCodeList.java
@@@ -1,100 -1,0 +1,99 @@@
+/*
+ * Copyright 2014 desruisseaux.
+ *
+ * Licensed 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.pending.geoapi.evolution;
+
+// Specific to the main branch:
+import java.util.List;
+import java.util.ArrayList;
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
-
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
+
+/**
+ * Placeholder for code list not yet available in GeoAPI.
+ * Currently defines constants mostly for {@code org.opengis.metadata.citation.TelephoneType},
+ * but constants for other code list can be constructed like below:
+ *
+ * {@snippet lang="java" :
+ * operation.getDistributedComputingPlatforms().add(UnsupportedCodeList.valueOf("SOAP"));
+ * }
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @version 1.0
+ * @since 0.5
+ */
+public final class UnsupportedCodeList extends CodeList<UnsupportedCodeList> {
+ /**
+ * For cross-version compatibility.
+ */
+ private static final long serialVersionUID = 7205015191869240829L;
+
+ /**
+ * The list of constants defined in this code list.
+ */
+ private static final List<UnsupportedCodeList> VALUES = new ArrayList<UnsupportedCodeList>(3);
+
+ /**
+ * A frequently used code list element.
+ */
+ @UML(identifier="voice", obligation=CONDITIONAL, specification=ISO_19115)
+ public static final CodeList<?> VOICE = new UnsupportedCodeList("VOICE");
+
+ /**
+ * A frequently used code list element.
+ */
+ @UML(identifier="facsimile", obligation=CONDITIONAL, specification=ISO_19115)
+ public static final CodeList<?> FACSIMILE = new UnsupportedCodeList("FACSIMILE");
+
+ /**
+ * A frequently used code list element.
+ */
+ @UML(identifier="WebServices", obligation=CONDITIONAL, specification=ISO_19115)
+ public static final CodeList<?> WEB_SERVICES = new UnsupportedCodeList("WEB_SERVICES");
+
+ /**
+ * Constructor for new code list element.
+ *
+ * @param name The code list name.
+ */
+ private UnsupportedCodeList(String name) {
+ super(name, VALUES);
+ }
+
+ /**
+ * Returns the list of codes of the same kind than this code list element.
+ *
+ * @return All code values for this code list.
+ */
+ @Override
+ public UnsupportedCodeList[] family() {
+ synchronized (VALUES) {
+ return VALUES.toArray(new UnsupportedCodeList[VALUES.size()]);
+ }
+ }
+
+ /**
+ * Returns the telephone type that matches the given string, or returns a new one if none match it.
+ *
+ * @param code The name of the code to fetch or to create.
+ * @return A code matching the given name.
+ */
+ public static UnsupportedCodeList valueOf(String code) {
+ return valueOf(UnsupportedCodeList.class, code);
+ }
+}
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java
index e8f26bc0d2,c53852b304..fc68d434bb
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java
@@@ -24,12 -24,11 +24,11 @@@ import jakarta.xml.bind.annotation.XmlV
import org.opengis.util.CodeList;
import org.apache.sis.util.iso.Types;
import org.apache.sis.xml.bind.Context;
-
import static org.apache.sis.metadata.internal.ImplementationHelper.ISO_NAMESPACE;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
-import org.opengis.annotation.ResourceBundles;
+// Specific to the main branch:
+import java.util.ResourceBundle;
+import org.apache.sis.util.internal.CodeLists;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
index 1ae49c60e9,7e88a16530..824c683909
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
@@@ -22,11 -22,10 +22,10 @@@ import jakarta.xml.bind.annotation.XmlE
import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.util.internal.Strings;
-
import static org.apache.sis.xml.util.LegacyNamespaces.VERSION_3_0;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.temporal.Period;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.temporal.Period;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
index baf4d99318,df76123809..eff7abf93a
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
@@@ -30,18 -30,14 +30,17 @@@ import org.apache.sis.xml.Namespaces
import org.apache.sis.xml.util.LegacyNamespaces;
// Test dependencies
- import org.apache.sis.xml.test.DocumentComparator;
-
import static org.junit.Assert.*;
+ import org.apache.sis.xml.test.DocumentComparator;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Responsibility;
-import org.opengis.metadata.maintenance.Scope;
-import org.opengis.metadata.content.FeatureTypeInfo;
+// Specific to the main branch:
+import org.apache.sis.metadata.iso.citation.DefaultCitation;
+import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
+import org.apache.sis.metadata.iso.content.DefaultFeatureCatalogueDescription;
+import org.apache.sis.metadata.iso.content.DefaultFeatureTypeInfo;
+import org.apache.sis.metadata.iso.lineage.DefaultSource;
+import org.apache.sis.metadata.iso.maintenance.DefaultScope;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/IdentifiersTest.java
index cb396417bd,b55f0f8223..607e612321
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/IdentifiersTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/IdentifiersTest.java
@@@ -25,13 -25,9 +25,12 @@@ import org.apache.sis.metadata.iso.cita
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Tests {@link Identifiers}.
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/MergerTest.java
index 6159647915,8d88a2e203..0b47a2dcd6
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/MergerTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/internal/MergerTest.java
@@@ -36,11 -36,13 +36,10 @@@ import org.apache.sis.metadata.iso.cont
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSetEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.CoverageDescription;
-
/**
* Tests the {@link Merger} class.
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/CustomMetadataTest.java
index fb61485be0,671cb7caf1..dd6716182a
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/CustomMetadataTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/CustomMetadataTest.java
@@@ -37,17 -37,9 +37,16 @@@ import org.apache.sis.xml.XML
// Test dependencies
import org.junit.Test;
- import org.apache.sis.xml.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.xml.test.TestCase;
+// Specific to the main branch:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.constraint.Constraints;
+import org.opengis.metadata.distribution.Format;
+import org.opengis.metadata.maintenance.MaintenanceInformation;
+import org.opengis.metadata.spatial.SpatialRepresentationType;
+
/**
* Tests XML marshalling of custom implementation of metadata interfaces. The custom implementations
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
index c2ad79e94a,67b1ae9e44..a2b84706e1
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
@@@ -28,10 -29,8 +29,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.xml.test.TestCase;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.TelephoneType;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
index 0aa50ec1d9,55d7c4b1b5..d9913d2050
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
@@@ -30,10 -31,9 +31,8 @@@ import org.apache.sis.xml.bind.metadata
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.OperationMetadata;
-import org.opengis.metadata.identification.DistributedComputingPlatform;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
index c14d0206d2,e2b2cb2c63..f0b5a49678
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
@@@ -21,13 -21,12 +21,12 @@@ import org.opengis.metadata.maintenance
// Test dependencies
import org.junit.Test;
- import org.apache.sis.xml.test.TestCase;
-
import static org.junit.jupiter.api.Assertions.*;
+ import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
index 055c90d7b2,44e3ef1d9c..cc358dae64
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
@@@ -26,12 -27,11 +27,10 @@@ import static org.apache.sis.util.inter
// Test dependencies
import org.junit.Test;
-
- import static org.apache.sis.util.internal.CollectionsExt.first;
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Responsibility;
+// Specific to the main branch:
+import org.opengis.metadata.citation.ResponsibleParty;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
index 35fb35c95e,dfe6b1e041..013977e4db
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
@@@ -33,8 -34,9 +34,6 @@@ import org.apache.sis.test.DependsOn
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestStep;
- import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.apache.sis.test.TestUtilities.getSingleton;
--
/**
* Tests {@link MetadataSource}.
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
index f5ccfa4c25,b592776d4f..7924d348fe
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@@ -33,10 -34,11 +34,8 @@@ import org.apache.sis.test.TestUtilitie
import org.apache.sis.test.DependsOn;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Contact;
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Responsibility;
-import org.apache.sis.util.internal.URLs;
+// Specific to the main branch:
+import org.opengis.metadata.citation.ResponsibleParty;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypesTest.java
index a28293bd51,0101f6209e..01cad73e39
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypesTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypesTest.java
@@@ -36,13 -36,12 +36,12 @@@ import org.apache.sis.util.DefaultInter
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.parameter.ParameterDirection;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
index 8f422104d8,e2b6c8b679..1047a72035
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
@@@ -28,17 -29,14 +29,15 @@@ import static org.apache.sis.metadata.i
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.xml.test.TestCase;
-
- import static org.apache.sis.metadata.internal.ImplementationHelper.ISO_NAMESPACE;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOnMethod;
+ import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+import org.apache.sis.metadata.iso.DefaultIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonTest.java
index d97bdf1c2c,aa4ce1c083..198914f2ce
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonTest.java
@@@ -26,12 -26,11 +26,11 @@@ import org.apache.sis.util.ArraysExt
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.jupiter.api.Assertions.*;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Responsibility;
+// Specific to the main branch:
+import org.opengis.metadata.citation.ResponsibleParty;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java
index 5e84179f75,9efdf5e2ab..2d797ebdad
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java
@@@ -33,14 -33,13 +33,13 @@@ import org.apache.sis.xml.util.LegacyNa
// Test dependencies
import org.junit.Test;
+ import static org.junit.Assert.*;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.xml.test.TestCase;
-
- import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Responsibility;
+// Specific to the main branch:
+import org.opengis.metadata.citation.ResponsibleParty;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
index c6b8927630,7794a7296c..63d5734751
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
@@@ -36,11 -38,11 +38,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.mock.MetadataMock;
import org.apache.sis.xml.test.TestCase;
-
- import static org.apache.sis.util.internal.StandardDateFormat.UTC;
- import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.apache.sis.test.TestUtilities.getSingleton;
-
/**
* Tests the XML marshalling of {@code Locale} when used for a language.
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/QualityParameterTest.java
index ed27984c92,ae85432d2a..0a1efd4ee3
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/QualityParameterTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/QualityParameterTest.java
@@@ -24,13 -24,14 +24,12 @@@ import org.apache.sis.xml.Namespaces
// Test dependencies
import org.junit.Test;
- import org.apache.sis.xml.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import org.opengis.referencing.operation.Matrix;
-import org.opengis.metadata.quality.ValueStructure;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/ServiceParameterTest.java
index 5d6d262a8d,0e5fffbda8..7af9b08070
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/ServiceParameterTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/ServiceParameterTest.java
@@@ -23,13 -23,13 +23,12 @@@ import org.apache.sis.util.iso.Names
// Test dependencies
import org.junit.Test;
- import org.apache.sis.xml.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import org.opengis.parameter.ParameterDirection;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/HaloTest.java
index c746bd32ce,2d22ec8643..30f1e679e7
--- a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/HaloTest.java
+++ b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/HaloTest.java
@@@ -18,11 -18,10 +18,10 @@@ package org.apache.sis.style.se1
// Test dependencies
import org.junit.Test;
-
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/LineSymbolizerTest.java
index ad2e960d6c,0cff31759f..944e8ec88b
--- a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/LineSymbolizerTest.java
+++ b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/LineSymbolizerTest.java
@@@ -20,11 -20,10 +20,10 @@@ import java.awt.Color
// Test dependencies
import org.junit.Test;
-
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointPlacementTest.java
index e03aadae75,289b530920..b444455668
--- a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointPlacementTest.java
+++ b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointPlacementTest.java
@@@ -18,11 -18,10 +18,10 @@@ package org.apache.sis.style.se1
// Test dependencies
import org.junit.Test;
-
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointSymbolizerTest.java
index 951c2b698f,3f82ad86b9..f2efa5cc84
--- a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointSymbolizerTest.java
+++ b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PointSymbolizerTest.java
@@@ -18,11 -18,10 +18,10 @@@ package org.apache.sis.style.se1
// Test dependencies
import org.junit.Test;
-
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PolygonSymbolizerTest.java
index 77939a1030,37ef635a10..7536c2ab99
--- a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PolygonSymbolizerTest.java
+++ b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/PolygonSymbolizerTest.java
@@@ -20,11 -20,10 +20,10 @@@ import java.awt.Color
// Test dependencies
import org.junit.Test;
-
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RuleTest.java
index 18bec16250,a0ab5cd8e1..074f5dd765
--- a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RuleTest.java
+++ b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/RuleTest.java
@@@ -21,11 -21,10 +21,10 @@@ import org.apache.sis.metadata.iso.cita
// Test dependencies
import org.junit.Test;
-
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Filter;
+// Specific to the main branch:
+import org.apache.sis.filter.Filter;
/**
diff --cc endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StyleTestCase.java
index eaeb0b5cae,00b6a28ed4..e9bac1b1c0
--- a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StyleTestCase.java
+++ b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/StyleTestCase.java
@@@ -21,15 -21,14 +21,14 @@@ import java.util.Optional
import org.apache.sis.util.SimpleInternationalString;
// Test dependencies
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.Literal;
-import org.opengis.filter.Expression;
+// Specific to the main branch:
+import org.apache.sis.filter.Expression;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.pending.geoapi.filter.Literal;
/**
diff --cc endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/TextSymbolizerTest.java
index d403b07d5e,a5c78ccaf6..ec61e7d779
--- a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/TextSymbolizerTest.java
+++ b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/TextSymbolizerTest.java
@@@ -18,11 -18,10 +18,10 @@@ package org.apache.sis.style.se1
// Test dependencies
import org.junit.Test;
-
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
index 231a196a40,3187f44fb2..33d97ee854
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
@@@ -34,8 -35,10 +35,6 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.gazetteer.Location;
-import org.opengis.referencing.gazetteer.LocationType;
--
/**
* Tests methods from the {@link GeohashReferenceSystem} class.
diff --cc endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
index 440d023555,2216a9b6ef..ec6290fbd6
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
@@@ -45,10 -48,10 +48,6 @@@ import org.apache.sis.test.DependsOn
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
- import static org.apache.sis.metadata.internal.ReferencingServices.NAUTICAL_MILE;
- import static org.apache.sis.measure.Units.ARC_MINUTE;
- import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.gazetteer.Location;
-import org.opengis.referencing.gazetteer.LocationType;
--
/**
* Tests {@link MilitaryGridReferenceSystem}.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java
index 9130bd25d9,8d8a015c42..2463d88486
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java
@@@ -31,9 -31,12 +31,8 @@@ import org.apache.sis.io.wkt.Formatter
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Debug;
import org.apache.sis.util.resources.Errors;
-
import static org.apache.sis.xml.bind.referencing.CC_GeneralOperationParameter.DEFAULT_OCCURRENCE;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Objects;
-import static org.apache.sis.util.Utilities.deepEquals;
-
/**
* Abstract definition of a parameter or group of parameters used by a coordinate operation or a process.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
index 265b965dd5,aa17f0fcdf..472c74d2ea
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
@@@ -37,9 -37,11 +37,8 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.internal.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
-
import static org.apache.sis.util.Utilities.deepEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.parameter.ParameterDirection;
-
/**
* The definition of a group of related parameters used by an operation method.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
index c83e8db1de,11ad27e72f..f44de79245
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
@@@ -48,11 -48,10 +48,10 @@@ import org.apache.sis.metadata.iso.cita
import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
import org.apache.sis.referencing.factory.NoSuchAuthorityFactoryException;
-
import static org.apache.sis.util.internal.CollectionsExt.nonNull;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
index 7f26453c2d,af953eeaf4..add74c2032
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
@@@ -30,11 -30,10 +30,10 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.util.ComparisonMode;
-
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
index 2a68b554cd,ff48c278e0..cb031f3f23
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
@@@ -33,11 -33,10 +33,10 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.FormattableObject;
-
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
index 16d76f46db,c265ccaaab..379ed6d9c3
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
@@@ -32,11 -32,10 +32,10 @@@ import org.apache.sis.xml.util.LegacyNa
import org.apache.sis.referencing.util.WKTKeywords;
import org.apache.sis.referencing.internal.VerticalDatumTypes;
import org.apache.sis.metadata.internal.ImplementationHelper;
-
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
index 3aee0f14a3,fe2919bbcd..9477b5795a
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
@@@ -28,21 -29,6 +29,19 @@@ import org.apache.sis.referencing.cs.De
import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
import org.apache.sis.referencing.util.ReferencingUtilities;
- import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
-
+// Specific to the main branch:
+import java.util.List;
+import java.util.Objects;
+import java.util.Collection;
+import org.opengis.referencing.ReferenceSystem;
+import org.opengis.referencing.IdentifiedObject;
+import org.opengis.util.InternationalString;
+import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.operation.CoordinateOperation;
+import org.apache.sis.referencing.DefaultObjectDomain;
+import org.apache.sis.referencing.AbstractIdentifiedObject;
+
/**
* Utilities related to version 1 of Well Known Text format, or to ISO 19111:2007.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
index 252109595a,1cbe288787..2caff2fe07
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
@@@ -69,28 -70,8 +70,26 @@@ import org.apache.sis.util.resources.Vo
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
- import static java.util.logging.Logger.getLogger;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import java.util.Map;
+import org.opengis.util.NoSuchIdentifierException;
+import org.opengis.util.TypeName;
+import org.opengis.referencing.ReferenceIdentifier;
+import org.opengis.referencing.crs.CRSFactory;
+import org.opengis.referencing.cs.CSFactory;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
+import org.opengis.referencing.operation.MathTransformFactory;
+import org.opengis.referencing.operation.OperationMethod;
+import org.opengis.referencing.operation.SingleOperation;
+import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.datum.DatumFactory;
+import org.apache.sis.metadata.internal.NameToIdentifier;
+import org.apache.sis.util.Deprecable;
+import org.apache.sis.referencing.cs.DefaultParametricCS;
+import org.apache.sis.referencing.datum.DefaultParametricDatum;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
+import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
+import org.apache.sis.metadata.iso.citation.DefaultCitation;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
index 3df474b820,d957fa3dc7..26d121e133
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
@@@ -71,13 -71,8 +71,12 @@@ import org.apache.sis.util.internal.Col
import org.apache.sis.util.internal.UnmodifiableArrayList;
import org.apache.sis.system.Semaphores;
import org.apache.sis.system.Loggers;
-
import static org.apache.sis.util.Utilities.deepEquals;
+// Specific to the main branch:
+import org.opengis.metadata.extent.Extent;
+import org.apache.sis.referencing.internal.Legacy;
+
/**
* Describes the operation for transforming coordinates in the source CRS to coordinates in the target CRS.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
index c741038fee,6ac2cc3205..76bc58c5ce
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
@@@ -62,10 -63,8 +63,8 @@@ import org.apache.sis.util.internal.Num
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
- import static java.lang.Math.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxisDirections.java
index 0b8293bd1c,1d0e5ed683..c92f1be520
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxisDirections.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxisDirections.java
@@@ -33,13 -35,10 +35,10 @@@ import org.apache.sis.util.ArraysExt
import org.apache.sis.util.Static;
import org.apache.sis.util.iso.Types;
import org.apache.sis.measure.Units;
-
- import static org.opengis.referencing.cs.AxisDirection.*;
- import static org.opengis.annotation.Obligation.CONDITIONAL;
import static org.apache.sis.util.CharSequences.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.annotation.Specification.ISO_19162;
+// Specific to the main branch:
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
index ae70b84392,320ccc22f8..b993706406
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
@@@ -28,11 -28,13 +28,10 @@@ import org.apache.sis.referencing.facto
import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assume.assumeNotNull;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.test.DependsOn;
-
/**
* Compares the result of some WKT parsing with the expected result from EPSG database.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/MathTransformParserTest.java
index 9090550ca0,7f0edffa39..a5f2cda9ef
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/MathTransformParserTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/MathTransformParserTest.java
@@@ -31,10 -32,8 +32,8 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTDictionaryTest.java
index a33c90c3c7,37245b10c6..61b035720f
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTDictionaryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTDictionaryTest.java
@@@ -42,14 -43,11 +43,11 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSetEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
-
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
index a4c610da59,052b56de5b..2346b923c4
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
@@@ -47,15 -48,10 +48,13 @@@ import org.apache.sis.referencing.opera
import org.apache.sis.util.internal.Constants;
// Test dependencies
- import org.apache.sis.test.TestUtilities;
-
- import static java.lang.StrictMath.*;
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestUtilities;
import static org.apache.sis.test.Assertions.assertMultilinesEquals;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Assertion methods used by the {@code org.apache.sis.referencing} module in addition of the ones inherited
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java
index 5215b9a4bb,7777b5bdf2..186cb0b3b9
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java
@@@ -35,11 -36,6 +36,9 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Tests {@link Builder}.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
index 4eddc77cf9,45fbc06d78..46cca3629c
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
@@@ -47,12 -52,10 +52,6 @@@ import org.apache.sis.test.TestCase
import org.apache.sis.test.widget.VisualCheck;
import org.apache.sis.referencing.crs.HardCodedCRS;
- import static java.lang.StrictMath.*;
- import static org.apache.sis.metadata.internal.ReferencingServices.AUTHALIC_RADIUS;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertBetween;
- import static org.opengis.test.Assert.assertInstanceOf;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.cs.AxisDirection;
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
--
/**
* Tests {@link GeodeticCalculator}. Test values come from the following sources:
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/NamedIdentifierTest.java
index 266a5ece90,e55e7015e7..1844e5388d
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/NamedIdentifierTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/NamedIdentifierTest.java
@@@ -30,12 -31,10 +31,10 @@@ import static org.junit.Assert.*
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
index d5c4032653,598e52153c..2ecd2d6b4b
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
@@@ -37,16 -42,10 +42,10 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static java.lang.Double.NaN;
- import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
- import static org.apache.sis.referencing.IdentifiedObjects.getProperties;
- import static org.apache.sis.referencing.cs.CoordinateSystems.*;
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
index e05cc81346,4cf8d72627..405e76c8e7
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
@@@ -27,10 -28,8 +28,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
index 3de9b5233d,623c0894bc..ed80592b9c
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
@@@ -27,10 -28,8 +28,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
index fe993c13a0,d8a5f050db..8d21d549be
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
@@@ -25,10 -26,8 +26,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
index 9784885dcf,9c60353900..6a650f67ef
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
@@@ -28,14 -28,13 +28,13 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import org.junit.Test;
+ import static org.junit.Assert.*;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
index 872aeac4ba,f6dc531e6e..1bfcf0eb57
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
@@@ -27,13 -29,10 +29,10 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static org.apache.sis.referencing.util.Formulas.JULIAN_YEAR_LENGTH;
- import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
index a5eaa0acb4,55050afda5..b6b855bd2a
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
@@@ -63,16 -68,10 +68,10 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.crs.HardCodedCRS;
-
- import static org.apache.sis.referencing.util.Formulas.LINEAR_TOLERANCE;
- import static org.apache.sis.referencing.util.Formulas.ANGULAR_TOLERANCE;
- import static org.apache.sis.referencing.util.PositionalAccuracyConstant.DATUM_SHIFT_APPLIED;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertSetEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.Assert;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
index db8dfb4042,470212cf22..55981f7be7
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
@@@ -42,14 -43,12 +43,12 @@@ import org.junit.Test
import static org.junit.Assume.assumeTrue;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOnMethod;
+ import org.apache.sis.test.DependsOn;
import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
index 6967b52c96,d1ab84482f..6cdb305281
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
@@@ -48,12 -49,10 +49,10 @@@ import org.apache.sis.referencing.cs.Ha
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.parameter.DefaultParameterDescriptorTest;
-
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
index 3ab5e02e31,d907c24db5..1473674ffa
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
@@@ -26,16 -26,15 +26,15 @@@ import org.opengis.referencing.operatio
// Test dependencies
import org.junit.Test;
+ import static org.junit.Assert.*;
import org.opengis.test.Validators;
+ import static org.opengis.test.Assert.assertInstanceOf;
import org.apache.sis.test.DependsOn;
import org.apache.sis.xml.test.TestCase;
-
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertIdentifierEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
index cf4dd812c3,cebfe32f50..95e6a0f3ab
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
@@@ -35,12 -36,10 +36,10 @@@ import org.apache.sis.test.TestCase
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.operation.HardCodedConversions;
-
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertMapEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
index 7657ef2632,8a623a2d5a..0a751d9fe2
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
@@@ -29,11 -30,6 +30,9 @@@ import org.apache.sis.test.TestCase
import org.apache.sis.test.DependsOn;
import org.apache.sis.referencing.operation.HardCodedConversions;
- import static org.junit.Assert.*;
-
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
+
/**
* Tests {@link Linearizer}.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
index 773777d41c,ce01d2233a..1818354500
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
@@@ -26,10 -27,8 +27,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatricesTest.java
index 2bf6e64c5e,cea854130a..a723e8e949
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatricesTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatricesTest.java
@@@ -32,14 -35,10 +35,10 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static java.lang.Double.NaN;
- import static org.opengis.referencing.cs.AxisDirection.*;
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertMultilinesEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
index 6400728335,91acf15999..afc61f9662
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
@@@ -16,16 -16,16 +16,16 @@@
*/
package org.apache.sis.referencing.operation.matrix;
- // Test dependencies
- import org.junit.Test;
- import org.apache.sis.test.DependsOn;
-
import static java.lang.Double.NaN;
import static org.apache.sis.referencing.operation.matrix.Matrix4.SIZE;
+
+ // Test dependencies
+ import org.junit.Test;
import static org.junit.Assert.*;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
index b4c94761b0,68cafd913c..c6634218fc
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
@@@ -28,13 -30,10 +30,10 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOnMethod;
-
- import static java.lang.StrictMath.*;
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
index 44de1b98fa,f0b75edac5..0e016a30ec
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
@@@ -24,11 -26,8 +26,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
- import static java.lang.Double.NaN;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
index cfad05506b,267a63abbd..8e2a568b28
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
@@@ -26,10 -29,9 +29,6 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
- import static java.lang.StrictMath.*;
- import static java.lang.Double.NaN;
- import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.ToleranceModifier;
--
/**
* Tests the {@link AlbersEqualArea} class. We test using various values of standard parallels.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
index 5827c07523,36f1eb8462..615b52bbf8
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
@@@ -27,9 -29,9 +29,6 @@@ import org.apache.sis.referencing.opera
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
- import static java.lang.StrictMath.*;
- import static java.lang.Double.NaN;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.ToleranceModifier;
--
/**
* Tests the {@link CylindricalEqualArea} class.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
index 26b554f8c1,4114754652..4d5db1618a
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
@@@ -34,15 -37,10 +37,11 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
-
- import static java.lang.StrictMath.*;
- import static java.lang.Double.*;
- import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.referencing.operation.provider.LambertConformalMichigan;
+// Specific to the main branch:
+import static org.junit.Assume.assumeTrue;
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
index 19e0fba4d6,8a7b43547d..10c92120d1
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
@@@ -32,12 -34,12 +34,9 @@@ import org.apache.sis.referencing.opera
import org.apache.sis.referencing.datum.GeodeticDatumMock;
// Test dependencies
- import org.apache.sis.test.TestUtilities;
-
- import static java.lang.Double.isNaN;
- import static java.lang.StrictMath.*;
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestUtilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.ParameterizedTransformTest;
-
/**
* Base class of map projection tests.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
index 3fa4f06204,0006d6866f..5edc4ccd9b
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
@@@ -32,18 -35,14 +35,14 @@@ import static org.apache.sis.referencin
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
-
- import static java.lang.Double.*;
- import static java.lang.StrictMath.*;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertBetween;
- import static org.apache.sis.referencing.operation.projection.ConformalProjectionTest.LN_INFINITY;
+ import org.apache.sis.test.DependsOnMethod;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.referencing.operation.provider.MercatorSpherical;
-import org.apache.sis.referencing.operation.provider.RegionalMercator;
+// Specific to the main branch:
+import static org.junit.Assume.assumeTrue;
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
index ae6b885f67,a87e222fd9..5c33e281b5
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
@@@ -16,16 -16,16 +16,16 @@@
*/
package org.apache.sis.referencing.operation.projection;
- // Test dependencies
- import org.junit.Test;
- import org.apache.sis.test.DependsOn;
-
import static java.lang.StrictMath.*;
import static org.apache.sis.metadata.internal.ReferencingServices.NAUTICAL_MILE;
+
+ // Test dependencies
+ import org.junit.Test;
import static org.junit.Assert.*;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
+// Specific to the main branch:
+import org.apache.sis.referencing.operation.transform.TransformTestCase;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
index 89c598c622,1a0f15094f..cf8fb29cc8
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
@@@ -27,8 -28,11 +28,6 @@@ import org.apache.sis.parameter.Paramet
import org.junit.*;
import org.apache.sis.test.DependsOn;
- import static java.lang.StrictMath.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.FactoryException;
-import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
-import org.opengis.test.ToleranceModifier;
--
/**
* Tests the {@link ObliqueMercator} class.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
index 62bf815574,b88b3068a5..e258c4060c
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
@@@ -32,11 -34,8 +34,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
- import static java.lang.StrictMath.*;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.referencing.operation.matrix.Matrix2;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java
index 0702cdf774,62992542df..aba556b024
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java
@@@ -25,8 -26,9 +26,6 @@@ import org.apache.sis.parameter.Paramet
import org.junit.*;
import org.apache.sis.test.DependsOn;
- import static java.lang.StrictMath.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.FactoryException;
--
/**
* Tests the {@link Orthographic} class.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ParameterizedTransformTestMock.java
index 0bd2b96716,0000000000..240bd72a22
mode 100644,000000..100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ParameterizedTransformTestMock.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ParameterizedTransformTestMock.java
@@@ -1,78 -1,0 +1,77 @@@
+/*
+ * 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.referencing.operation.projection;
+
+// Specific to the main branch:
+import org.opengis.referencing.operation.MathTransformFactory;
-
+import static org.junit.Assume.*;
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
+
+
+/**
+ * Placeholder for a GeoAPI 3.1 method which was not available in GeoAPI 3.0.
+ * This placeholder does nothing. See Apache SIS JDK6 branch for a real test.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ */
+final class ParameterizedTransformTestMock {
+ ParameterizedTransformTestMock(MathTransformFactory factory) {
+ // See GeoAPI 3.1 for real construction.
+ }
+
+ public void testMercator1SP() {
+ // See GeoAPI 3.1 for the real test.
+ // The test is run on Apache SIS branches.
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped.
+ }
+
+ public void testMercator2SP() {
+ // See GeoAPI 3.1 for the real test.
+ // The test is run on Apache SIS branches.
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped.
+ }
+
+ public void testPseudoMercator() {
+ // See GeoAPI 3.1 for the real test.
+ // The test is run on Apache SIS branches.
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped.
+ }
+
+ public void testMiller() {
+ // See GeoAPI 3.1 for the real test.
+ // The test is run on Apache SIS branches.
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped.
+ }
+
+ public void testLambertConicConformal1SP() {
+ // See GeoAPI 3.1 for the real test.
+ // The test is run on Apache SIS branches.
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped.
+ }
+
+ public void testLambertConicConformal2SP() {
+ // See GeoAPI 3.1 for the real test.
+ // The test is run on Apache SIS branches.
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped.
+ }
+
+ public void testLambertConicConformalBelgium() {
+ // See GeoAPI 3.1 for the real test.
+ // The test is run on Apache SIS branches.
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped.
+ }
+}
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
index 958a703725,2b827fc858..e853ab691f
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
@@@ -32,13 -36,11 +36,8 @@@ import org.junit.Test
import org.apache.sis.test.OptionalTestData;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-
- import static java.lang.Double.NaN;
- import static java.lang.StrictMath.abs;
- import static java.lang.StrictMath.toRadians;
- import static org.apache.sis.referencing.operation.provider.TransverseMercator.LATITUDE_OF_ORIGIN;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.CalculationType;
-
/**
* Tests the {@link TransverseMercator} class.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
index a3772df3ec,63ea004711..f1ed16bafb
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
@@@ -35,13 -36,16 +36,11 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
-
- import static java.lang.StrictMath.toRadians;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOnMethod;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Arrays;
-import org.opengis.test.ToleranceModifier;
-import org.apache.sis.referencing.datum.HardCodedDatum;
-
/**
* Tests {@link GeocentricTranslation} and {@link GeocentricTranslation3D}.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
index da0e6da5b1,fd6f1eda78..bd3647ad76
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
@@@ -26,14 -26,13 +26,13 @@@ import org.apache.sis.parameter.Paramet
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOn;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/LongitudeRotationTest.java
index 7bc68fe05e,99b9172d5d..7f7d2b1fe0
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/LongitudeRotationTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/LongitudeRotationTest.java
@@@ -27,12 -28,10 +28,10 @@@ import static org.opengis.test.Assert.a
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
index 38b857aed3,7a90ae91b3..423338a0a0
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
@@@ -40,12 -41,10 +41,10 @@@ import org.junit.Test
import static org.junit.Assume.assumeTrue;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProvidersTest.java
index a2c5995c83,8f0c0ba782..1b4782107a
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProvidersTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProvidersTest.java
@@@ -31,11 -32,6 +32,9 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
+// Specific to the main branch:
+import org.apache.sis.parameter.DefaultParameterDescriptor;
+
/**
* Tests some consistency rules of all providers defined in this package.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
index 8510c0dd99,f64bd611fa..62e8d70215
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
@@@ -26,12 -29,11 +29,8 @@@ import static org.opengis.test.Assert.a
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.datum.HardCodedDatum;
-
- import static java.lang.StrictMath.toRadians;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.CalculationType;
-
/**
* Tests {@link AbridgedMolodenskyTransform2D}. This class takes {@link MolodenskyTransform}
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
index 19ce2b446a,a5850c4cc8..a445c0dfbc
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
@@@ -28,13 -28,12 +28,12 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOn;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.Assert;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
index 6e21d65159,eace65b537..5f637c31f4
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
@@@ -31,12 -34,8 +34,8 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static java.lang.StrictMath.PI;
- import static java.lang.StrictMath.toRadians;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
index 5432c612b8,cdd64c8936..164d93f976
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
@@@ -49,11 -51,8 +51,8 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.crs.HardCodedCRS;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
index 26f6175794,602f391861..6d7abed7a1
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
@@@ -34,12 -37,11 +37,8 @@@ import static org.opengis.test.Assert.a
import org.apache.sis.referencing.operation.provider.GeocentricTranslationTest;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-
- import static java.lang.StrictMath.toRadians;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.ToleranceModifier;
-
/**
* Tests {@link EllipsoidToCentricTransform}.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
index bd9bbe5b76,5514cd7f06..58c1f84102
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
@@@ -21,14 -22,18 +22,12 @@@ import org.opengis.referencing.operatio
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.DependsOnMethod;
-
- import static java.lang.StrictMath.*;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOn;
+ import org.apache.sis.test.DependsOnMethod;
import static org.apache.sis.referencing.Assertions.assertIsNotIdentity;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.EnumSet;
-import org.opengis.test.CalculationType;
-import org.opengis.test.ToleranceModifier;
-import org.opengis.test.ToleranceModifiers;
-
/**
* Tests the {@link ExponentialTransform1D} class. Note that this is closely related to
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
index feb8e35a9e,7cfea898da..c1be2ef256
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
@@@ -23,11 -23,13 +23,10 @@@ import org.opengis.referencing.operatio
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOnMethod;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOnMethod;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
-
/**
* Test {@link LinearInterpolator1D} class.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
index e60901315e,8c94d8c29a..8d33800e4a
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
@@@ -23,13 -23,9 +23,12 @@@ import org.apache.sis.referencing.util.
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOn;
-
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOn;
+// Specific to the main branch:
+import org.junit.Ignore;
+
/**
* Tests various implementation of the {@link LinearTransform} interface by inheriting the tests defined
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
index aac6d0cd78,16528cb48c..f82ba6b980
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
@@@ -21,13 -22,14 +22,11 @@@ import org.opengis.referencing.operatio
// Test dependencies
import org.junit.Test;
+ import static org.opengis.test.Assert.assertInstanceOf;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-
- import static java.lang.StrictMath.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.referencing.Assertions.assertIsNotIdentity;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.ToleranceModifier;
-
/**
* Tests the {@link LogarithmicTransform1D} class. Note that this is closely related to
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
index f02229f432,a4531a7064..b29d9854c5
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
@@@ -33,17 -34,22 +34,15 @@@ import org.apache.sis.util.ArraysExt
import org.apache.sis.io.TableAppender;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.io.wkt.FormattableObject;
+ import org.apache.sis.referencing.operation.matrix.MatrixTestCase;
// Test dependencies
+ import static org.junit.Assert.*;
import org.opengis.test.Validators;
+ import static org.opengis.test.Assert.assertInstanceOf;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.referencing.Assertions;
- import org.apache.sis.referencing.operation.matrix.MatrixTestCase;
-
- import static java.lang.StrictMath.*;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.Factory;
-import org.opengis.geometry.DirectPosition;
-import org.apache.sis.measure.Longitude;
-import org.opengis.test.CalculationType;
-import org.opengis.test.referencing.TransformTestCase;
-
/**
* Base class for tests of {@link AbstractMathTransform} implementations.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
index bcfbd3e376,97417657c9..220b531983
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
@@@ -35,11 -37,8 +37,8 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index 2534d35280,7c128d8502..0f59b28d13
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@@ -36,13 -39,22 +39,9 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.TestUtilities;
import org.apache.sis.referencing.datum.HardCodedDatum;
- import static java.lang.StrictMath.*;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.io.IOException;
-import org.opengis.referencing.operation.MathTransform;
-import org.apache.sis.referencing.operation.provider.AbridgedMolodensky;
-import org.apache.sis.math.StatisticsFormat;
-import org.apache.sis.math.Statistics;
-import static org.apache.sis.metadata.internal.ReferencingServices.NAUTICAL_MILE;
-import org.opengis.test.CalculationType;
-import org.opengis.test.ToleranceModifier;
-import org.opengis.test.ToleranceModifiers;
-import org.opengis.test.referencing.ParameterizedTransformTest;
-import org.apache.sis.test.TestCase;
--
/**
- * Tests {@link MolodenskyTransform}. The {@link #compareWithGeocentricTranslation()}
+ * Tests {@link MolodenskyTransform}. The {@code compareWithGeocentricTranslation()}
* method uses {@link EllipsoidToCentricTransform} as a reference implementation.
* The errors compared to geocentric translations should not be greater than
* approximately 1 centimetre.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
index 70272186d3,f2dad366c9..3b2056bd89
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
@@@ -31,13 -31,13 +31,12 @@@ import org.apache.sis.util.ArraysExt
// Test dependencies
import org.junit.Test;
+ import static org.junit.Assert.*;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
-
- import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.CalculationType;
-import org.opengis.test.ToleranceModifier;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
index 20fcb35c1b,d87b2a09e6..51028dd50c
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
@@@ -25,8 -26,9 +26,6 @@@ import org.junit.Test
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
- import static java.lang.StrictMath.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
--
/**
* Tests {@link PolarToCartesian}.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
index d226bd5e27,4d0bc94fc0..a3d4769d3c
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
@@@ -39,12 -39,11 +39,11 @@@ import org.junit.Test
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.junit.Assert.*;
-import org.opengis.test.Assert;
-import org.opengis.test.referencing.AffineTransformTest;
-import static org.opengis.test.Assert.assertInstanceOf;
+// Specific to the main branch:
+import org.junit.Ignore;
+import org.opengis.test.referencing.TransformTestCase;
-
+import static org.opengis.test.Assert.*;
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
index 39e710e717,4b69a312e8..ce8f5aa0d4
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
@@@ -24,14 -24,13 +24,13 @@@ import org.apache.sis.util.internal.Dou
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOnMethod;
- import org.apache.sis.test.DependsOn;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOnMethod;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.Assert;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
index cbac8ad508,77405de7bb..b280e787e5
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
@@@ -25,8 -26,9 +26,6 @@@ import org.junit.Test
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
- import static java.lang.StrictMath.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
--
/**
* Tests {@link SphericalToCartesian}.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
index 500c26aa65,ab982517bf..97d5529ac2
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
@@@ -29,11 -31,8 +31,8 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
index ba608798fe,84359e6054..1f934c8958
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
@@@ -26,10 -26,11 +26,11 @@@ import org.opengis.referencing.operatio
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.NoninvertibleTransformException;
+ // Test dependencies
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
index 58b4a729a8,6d7483902e..ea289a1d70
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
@@@ -38,12 -41,8 +41,8 @@@ import org.apache.sis.test.DependsOn
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.datum.HardCodedDatum;
- import static java.lang.Double.NaN;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformTestCase.java
index 589edf8d3b,0000000000..2665a07c8c
mode 100644,000000..100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformTestCase.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformTestCase.java
@@@ -1,66 -1,0 +1,65 @@@
+/*
+ * 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.referencing.operation.transform;
+
+// Specific to the main branch:
+import java.util.Random;
-
+import static org.junit.Assume.*;
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
+
+
+/**
+ * Placeholder for a GeoAPI 3.1 method which was not available in GeoAPI 3.0.
+ * This placeholder does nothing. See Apache SIS JDK6 branch for a real test.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ */
+public class TransformTestCase extends org.opengis.test.referencing.TransformTestCase {
+ /**
+ * The deltas to use for approximating math transform derivatives by the finite differences method.
+ */
+ protected double[] derivativeDeltas;
+
+ /**
+ * Placeholder for a GeoAPI 3.1 method which was not available in GeoAPI 3.0.
+ * This placeholder does nothing. See Apache SIS JDK6 branch for a real test.
+ *
+ * @param coordinate Ignored.
+ */
+ protected final void verifyDerivative(final double... coordinate) {
+ // See GeoAPI 3.1 for the real test.
+ // The test is run on Apache SIS branches.
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped.
+ }
+
+ /**
+ * Placeholder for a GeoAPI 3.1 method which was not available in GeoAPI 3.0.
+ * This placeholder does nothing. See Apache SIS JDK6 branch for a real test.
+ *
+ * @param minOrdinates Ignored.
+ * @param maxOrdinates Ignored.
+ * @param numOrdinates Ignored.
+ * @param randomGenerator Ignored.
+ */
+ protected final void verifyInDomain(final double[] minOrdinates, final double[] maxOrdinates,
+ final int[] numOrdinates, final Random randomGenerator)
+ {
+ // See GeoAPI 3.1 for the real test.
+ // The test is run on Apache SIS branches.
+ assumeTrue(PENDING_NEXT_GEOAPI_RELEASE); // For reporting the test as skippped.
+ }
+}
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
index 62cd5fd8da,b32365fe11..7230f10093
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
@@@ -28,10 -29,8 +29,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.Assert;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
index 124965fa5d,9422dfa562..b940424e2d
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
@@@ -32,10 -33,8 +33,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.crs.HardCodedCRS;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/GeodeticObjectBuilderTest.java
index 11a7076483,963f929ad9..3c90eb376c
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/GeodeticObjectBuilderTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/GeodeticObjectBuilderTest.java
@@@ -25,12 -25,11 +25,11 @@@ import org.apache.sis.measure.Units
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
index 4081d75df8,2f9ed8c436..9321f0438b
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
@@@ -74,11 -75,6 +75,9 @@@ import org.apache.sis.test.DependsOn
import org.apache.sis.xml.test.DocumentComparator;
import org.apache.sis.xml.test.TestCase;
- import static org.junit.Assert.*;
-
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
+
/**
* Tests XML (un)marshalling of a metadata object containing various elements
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
index 13cee52539,4ebec5e894..4485e98ab8
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
@@@ -47,15 -49,11 +49,11 @@@ import static org.opengis.test.Assert.a
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOn;
import org.apache.sis.xml.test.TestCase;
-
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.nio.charset.StandardCharsets;
-import static org.opengis.test.Assert.assertIdentifierEquals;
+// Specific to the main branch:
+import org.opengis.metadata.identification.CharacterSet;
-
+import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java
index 1f65c668aa,6d9ae3ad7b..c908515e54
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java
@@@ -29,10 -30,8 +30,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.storage.earthobservation/test/org/apache/sis/storage/landsat/MetadataReaderTest.java
index 7c69936fc7,038cf6e6d1..fe013416e8
--- a/endorsed/src/org.apache.sis.storage.earthobservation/test/org/apache/sis/storage/landsat/MetadataReaderTest.java
+++ b/endorsed/src/org.apache.sis.storage.earthobservation/test/org/apache/sis/storage/landsat/MetadataReaderTest.java
@@@ -20,10 -20,32 +20,9 @@@ import java.util.regex.Matcher
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import org.opengis.metadata.Metadata;
-import org.opengis.metadata.acquisition.Context;
-import org.opengis.metadata.acquisition.OperationType;
-import org.opengis.metadata.citation.Role;
-import org.opengis.metadata.citation.DateType;
-import org.opengis.metadata.content.CoverageContentType;
-import org.opengis.metadata.content.TransferFunctionType;
-import org.opengis.metadata.identification.Progress;
-import org.opengis.metadata.identification.TopicCategory;
-import org.opengis.metadata.extent.TemporalExtent;
-import org.opengis.metadata.maintenance.ScopeCode;
-import org.opengis.metadata.spatial.DimensionNameType;
-import org.opengis.util.FactoryException;
-import org.apache.sis.storage.AbstractResource;
-import org.apache.sis.storage.DataStoreException;
-import org.apache.sis.storage.event.StoreListeners;
-import org.opengis.test.dataset.ContentVerifier;
-import static org.apache.sis.test.TestUtilities.date;
-
/**
* Tests {@link MetadataReader}.
diff --cc endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java
index cbf35e64b2,ca10eaf821..30623f712b
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java
@@@ -73,11 -73,10 +73,10 @@@ import org.apache.sis.util.internal.Str
import org.apache.sis.util.resources.Errors;
import org.apache.sis.measure.Units;
import org.apache.sis.math.Vector;
-
import static org.apache.sis.storage.netcdf.AttributeNames.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.NameFactory;
+// Specific to the main branch:
+import org.apache.sis.util.iso.DefaultNameFactory;
/**
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
index 5aad195121,32a4ee5fe8..7a7a394489
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
@@@ -34,15 -34,14 +34,14 @@@ import org.apache.sis.storage.netcdf.ba
// Test dependencies
import org.junit.Test;
+ import static org.junit.Assert.*;
import org.apache.sis.storage.netcdf.classic.ChannelDecoderTest;
import org.apache.sis.test.DependsOn;
-
- import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.ContentVerifier;
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
+import org.apache.sis.test.ContentVerifier;
/**
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
index ddc47b3db6,2a6e9ee5dc..1b63868c9f
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
@@@ -31,13 -30,13 +30,13 @@@ import org.apache.sis.util.Version
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOn;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.storage.netcdf.classic.ChannelDecoderTest;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
index cefe03751e,fee4c8ead1..bb25767a37
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
@@@ -26,10 -27,8 +27,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/GridTest.java
index 5020936d90,29731620cc..26fe427b7b
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/GridTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/GridTest.java
@@@ -23,13 -23,15 +23,12 @@@ import org.apache.sis.storage.DataStore
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.DependsOnMethod;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOn;
+ import org.apache.sis.test.DependsOnMethod;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
-
/**
* Tests the {@link Grid} implementation. The default implementation tests
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestCase.java
index 7c3d82a542,1e36fb534e..07374bbc27
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestCase.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestCase.java
@@@ -35,9 -35,11 +35,8 @@@ import org.apache.sis.storage.event.Sto
// Test dependencies
import org.junit.AfterClass;
-
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
-
/**
* Base class of netCDF tests. The base class uses the UCAR decoder, which is taken as a reference implementation.
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestData.java
index b47d7ebc40,2dd08f7e4d..e030c23b7b
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestData.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestData.java
@@@ -14,13 -14,12 +14,12 @@@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.style.se1;
+package org.apache.sis.storage.netcdf.base;
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Expression;
+// Specific to the main branch:
+import java.net.URL;
+import java.io.InputStream;
-
+import static org.junit.Assume.*;
/**
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/VariableTest.java
index 62bb96ee5f,7fcf543e45..88e7285240
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/VariableTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/VariableTest.java
@@@ -28,10 -28,12 +28,9 @@@ import org.apache.sis.measure.Units
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOn;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
-
/**
* Tests the {@link Variable} implementation. The default implementation tests
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/ChannelDecoderTest.java
index c6e4ae2aaa,18da8c5115..2da24b3206
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/ChannelDecoderTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/ChannelDecoderTest.java
@@@ -27,10 -26,11 +26,11 @@@ import org.apache.sis.io.stream.Channel
import org.apache.sis.setup.GeometryLibrary;
// Test dependencies
+ import org.apache.sis.storage.netcdf.base.DecoderTest;
import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/GridInfoTest.java
index 9051638602,2c0634b3a3..724c0a37d3
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/GridInfoTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/GridInfoTest.java
@@@ -23,11 -23,11 +23,11 @@@ import org.apache.sis.storage.netcdf.ba
import org.apache.sis.util.ArraysExt;
// Test dependencies
+ import org.apache.sis.storage.netcdf.base.GridTest;
import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/VariableInfoTest.java
index 3ec23fb9c2,50f10e6b7f..ba692f7d16
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/VariableInfoTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/VariableInfoTest.java
@@@ -19,13 -19,13 +19,13 @@@ package org.apache.sis.storage.netcdf.c
import java.io.IOException;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.netcdf.base.Decoder;
- import org.apache.sis.storage.netcdf.base.VariableTest;
// Test dependencies
+ import org.apache.sis.storage.netcdf.base.VariableTest;
import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
index 3e97b43d93,e3b37da768..e4ff809cbc
--- a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
+++ b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
@@@ -36,19 -36,20 +36,18 @@@ import org.apache.sis.storage.sql.featu
import org.apache.sis.storage.sql.feature.TableReference;
// Test dependencies
- import org.apache.sis.test.TestUtilities;
- import org.apache.sis.metadata.sql.TestDatabase;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.TestUtilities;
+ import org.apache.sis.metadata.sql.TestDatabase;
import static org.apache.sis.test.Assertions.assertSetEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.SortOrder;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.DefaultAttributeType;
+import org.apache.sis.feature.DefaultAssociationRole;
/**
diff --cc endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
index e9017bfe6d,2410a2d212..ff35c4d41e
--- a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
+++ b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
@@@ -32,12 -33,12 +33,10 @@@ import org.apache.sis.test.TestCase
import org.apache.sis.metadata.sql.TestDatabase;
import org.apache.sis.referencing.crs.HardCodedCRS;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.Filter;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.SpatialOperator;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.filter.Filter;
/**
diff --cc endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
index eb6a0298f6,250754e1d1..bbafb9d1cc
--- a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
+++ b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
@@@ -56,11 -58,8 +58,8 @@@ import org.apache.sis.test.TestCase
import org.apache.sis.metadata.sql.TestDatabase;
import org.apache.sis.referencing.crs.HardCodedCRS;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/MetadataTest.java
index e5aeec119c,b6ccddf52b..4defd25369
--- a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/MetadataTest.java
+++ b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/MetadataTest.java
@@@ -25,13 -26,8 +26,11 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
+// Specific to the main branch:
+import org.junit.Ignore;
+
/**
* Tests the {@link Metadata} class.
diff --cc endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/TypesTest.java
index 175e401121,906891eca0..c203d8d984
--- a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/TypesTest.java
+++ b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/TypesTest.java
@@@ -24,13 -24,12 +24,12 @@@ import org.apache.sis.storage.IllegalNa
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
+// Specific to the main branch:
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.AbstractIdentifiedType;
/**
diff --cc endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java
index 3829d98840,9b6acd9a97..390c523404
--- a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java
+++ b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java
@@@ -36,14 -36,13 +36,13 @@@ import org.junit.AfterClass
import org.junit.Before;
import org.junit.After;
import org.junit.Test;
+ import static org.junit.Assert.*;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/WriterTest.java
index fd33789138,08801c522c..01902e3b8f
--- a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/WriterTest.java
+++ b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/WriterTest.java
@@@ -37,12 -38,10 +38,10 @@@ import org.apache.sis.test.DependsOn
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
index abd31ea958,42de890c71..6482afc153
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
@@@ -32,11 -32,10 +32,10 @@@ import org.apache.sis.storage.internal.
import org.apache.sis.util.internal.Numerics;
import org.apache.sis.util.collection.Cache;
import org.apache.sis.util.logging.Logging;
-
import static org.apache.sis.coverage.grid.j2d.ImageUtilities.LOGGER;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.CannotEvaluateException;
+// Specific to the main branch:
+import org.apache.sis.coverage.CannotEvaluateException;
/**
diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
index 7b29942c45,852b17066c..12398e3986
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
@@@ -92,11 -92,12 +92,10 @@@ import org.apache.sis.coverage.SampleDi
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.measure.Units;
-
import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.temporal.Duration;
-import org.opengis.feature.FeatureType;
-import org.apache.sis.metadata.simple.SimpleDuration;
+// Specific to the main branch:
+import org.apache.sis.feature.DefaultFeatureType;
/**
diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java
index 0a872b6f07,549d4ad711..9486596b4f
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java
@@@ -29,11 -29,10 +29,10 @@@ import org.apache.sis.util.internal.Col
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.metadata.iso.lineage.DefaultSource;
import org.apache.sis.metadata.iso.maintenance.DefaultScope;
-
import static org.apache.sis.util.internal.CollectionsExt.nonNull;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.MetadataScope;
+// Specific to the main branch:
+import org.opengis.metadata.identification.DataIdentification;
/**
diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java
index 50e66f9321,dba4177747..085c3cc974
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java
@@@ -38,19 -46,10 +46,10 @@@ import org.apache.sis.storage.tiling.Ti
import org.apache.sis.storage.internal.Resources;
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.util.resources.Errors;
-
- import static java.lang.Math.addExact;
- import static java.lang.Math.subtractExact;
- import static java.lang.Math.multiplyExact;
- import static java.lang.Math.multiplyFull;
- import static java.lang.Math.incrementExact;
- import static java.lang.Math.decrementExact;
- import static java.lang.Math.toIntExact;
- import static java.lang.Math.floorDiv;
import static org.apache.sis.util.internal.Numerics.ceilDiv;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.CannotEvaluateException;
+// Specific to the main branch:
+import org.apache.sis.coverage.CannotEvaluateException;
/**
diff --cc endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
index a77388f133,8afb88139d..dc8957c9e8
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
@@@ -33,15 -34,19 +34,13 @@@ import static org.junit.Assert.*
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.IdentifiedType;
-import org.opengis.feature.Operation;
-import org.opengis.filter.Expression;
-import org.opengis.filter.Filter;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.MatchAction;
-import org.opengis.filter.SortOrder;
-import org.opengis.filter.SortProperty;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.DefaultAttributeType;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.AbstractOperation;
+import org.apache.sis.filter.Expression;
/**
diff --cc endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java
index 5c67cad90d,1d0e760101..2759c00f8d
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java
@@@ -34,14 -35,12 +35,12 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.BinaryComparisonOperator;
-import org.opengis.filter.MatchAction;
+// Specific to the main branch:
+import org.apache.sis.filter.Filter;
+import org.apache.sis.feature.AbstractAttribute;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.pending.geoapi.filter.BinaryComparisonOperator;
/**
diff --cc endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
index c84259b700,ed06786a2c..3855721556
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
@@@ -29,13 -29,12 +29,12 @@@ import org.apache.sis.storage.ProbeResu
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.Identification;
+// Specific to the main branch:
+import org.opengis.metadata.identification.DataIdentification;
/**
diff --cc endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
index 7ffb140623,5ed87f3cef..c63b6b791b
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
@@@ -34,13 -34,12 +34,12 @@@ import org.apache.sis.util.ArraysExt
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.Identification;
+// Specific to the main branch:
+import org.opengis.metadata.identification.DataIdentification;
/**
diff --cc endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreTest.java
index 04296d7be9,8ff57cb322..1d215c281d
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreTest.java
@@@ -31,10 -32,8 +32,8 @@@ import org.apache.sis.test.TestUtilitie
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/StoreTest.java
index dfa9d32650,a3d693b9a5..2a26da58b9
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/StoreTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/StoreTest.java
@@@ -27,15 -27,14 +27,14 @@@ import org.apache.sis.xml.util.LegacyNa
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.DependsOn;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.DependsOn;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.nio.charset.StandardCharsets;
+// Specific to the main branch:
+import org.opengis.metadata.identification.CharacterSet;
/**
diff --cc endorsed/src/org.apache.sis.util/test/org/apache/sis/test/ContentVerifier.java
index db131c29b8,0b7eb20164..59a017e091
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/ContentVerifier.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/ContentVerifier.java
@@@ -14,12 -14,13 +14,11 @@@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.cql;
+package org.apache.sis.test;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.locationtech.jts.geom.GeometryFactory;
-import org.opengis.filter.FilterFactory;
-import org.opengis.feature.Feature;
-import org.apache.sis.filter.DefaultFilterFactory;
+// Specific to the main branch:
+import org.opengis.metadata.Metadata;
-
+import static org.junit.Assume.assumeTrue;
/**
diff --cc endorsed/src/org.apache.sis.util/test/org/apache/sis/test/GeoapiAssert.java
index d1d44f5cdf,0000000000..65fd059698
mode 100644,000000..100644
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/GeoapiAssert.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/GeoapiAssert.java
@@@ -1,195 -1,0 +1,194 @@@
+/*
+ * 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.test;
+
+// Specific to the main branch:
+import org.opengis.metadata.citation.Citation;
+import org.opengis.referencing.ReferenceIdentifier;
+import org.opengis.referencing.cs.AxisDirection;
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.util.InternationalString;
+import org.apache.sis.util.Static;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+
+/**
+ * Temporary class for test methods that are expected to be provided in next GeoAPI release.
+ * Those methods are defined in a separated class in order to make easier for us to identify
+ * which methods may be removed from SIS (actually moved to GeoAPI) in a future GeoAPI release.
+ *
+ * <p>This class is needed for Apache SIS trunk, since the later is linked to GeoAPI official release.
+ * But this class can be removed on Apache SIS branches which are linked to a GeoAPI development branch.</p>
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ */
+public final class GeoapiAssert extends Static {
+ /**
+ * A flag for code that are pending next GeoAPI release before to be enabled.
+ * This flag is always set to {@code false}, except occasionally just before
+ * a GeoAPI release for testing purpose. It shall be used as below:
+ *
+ * {@snippet lang="java" :
+ * if (PENDING_NEXT_GEOAPI_RELEASE) {
+ * // Do some stuff here.
+ * }
+ * }
+ *
+ * The intend is to make easier to identify test cases that fail with the current version
+ * of the {@code geoapi-conformance} module, but should pass with the development snapshot.
+ */
+ public static final boolean PENDING_NEXT_GEOAPI_RELEASE = false;
+
+ /**
+ * The keyword for unrestricted value in {@link String} arguments.
+ */
+ private static final String UNRESTRICTED = "##unrestricted";
+
+ /**
+ * Do not allow instantiation of this class.
+ */
+ private GeoapiAssert() {
+ }
+
+ /**
+ * Returns the concatenation of the given message with the given extension.
+ * This method returns the given extension if the message is null or empty.
+ *
+ * <p>Invoking this method is equivalent to invoking {@code nonNull(message) + ext},
+ * but avoid the creation of temporary objects in the common case where the message
+ * is null.</p>
+ *
+ * @param message The message, or {@code null}.
+ * @param ext The extension to append after the message.
+ * @return The concatenated string.
+ */
+ private static String concat(String message, final String ext) {
+ if (message == null || (message = message.trim()).isEmpty()) {
+ return ext;
+ }
+ return message + ' ' + ext;
+ }
+
+ /**
+ * Verifies if we expected a null value, then returns {@code true} if the value is null as expected.
+ */
+ private static boolean isNull(final String message, final Object expected, final Object actual) {
+ final boolean isNull = (actual == null);
+ if (isNull != (expected == null)) {
+ fail(concat(message, isNull ? "Value is null." : "Expected null."));
+ }
+ return isNull;
+ }
+
+ /**
+ * Asserts that the title or an alternate title of the given citation is equal to the given string.
+ * This method is typically used for testing if a citation stands for the OGC, OGP or EPSG authority
+ * for instance. Such abbreviations are often declared as {@linkplain Citation#getAlternateTitles()
+ * alternate titles} rather than the main {@linkplain Citation#getTitle() title}, but this method
+ * tests both for safety.
+ *
+ * @param message Header of the exception message in case of failure, or {@code null} if none.
+ * @param expected The expected title or alternate title.
+ * @param actual The citation to test.
+ */
+ public static void assertAnyTitleEquals(final String message, final String expected, final Citation actual) {
+ if (isNull(message, expected, actual)) {
+ return;
+ }
+ InternationalString title = actual.getTitle();
+ if (title != null && expected.equals(title.toString())) {
+ return;
+ }
+ for (final InternationalString t : actual.getAlternateTitles()) {
+ if (expected.equals(t.toString())) {
+ return;
+ }
+ }
+ fail(concat(message, '"' + expected + "\" not found in title or alternate titles."));
+ }
+
+ /**
+ * Asserts that the given identifier is equals to the given authority, code space, version and code.
+ * If any of the above-cited properties is {@code ""##unrestricted"}, then it will not be verified.
+ * This flexibility is useful in the common case where a test accepts any {@code version} value.
+ *
+ * @param message Header of the exception message in case of failure, or {@code null} if none.
+ * @param authority The expected authority title or alternate title (may be {@code null}), or {@code "##unrestricted"}.
+ * @param codeSpace The expected code space (may be {@code null}), or {@code "##unrestricted"}.
+ * @param version The expected version (may be {@code null}), or {@code "##unrestricted"}.
+ * @param code The expected code value (may be {@code null}), or {@code "##unrestricted"}.
+ * @param actual The identifier to test.
+ */
+ public static void assertIdentifierEquals(final String message, final String authority, final String codeSpace,
+ final String version, final String code, final ReferenceIdentifier actual)
+ {
+ if (actual == null) {
+ fail(concat(message, "Identifier is null"));
+ } else {
+ if (!UNRESTRICTED.equals(authority)) assertAnyTitleEquals(message, authority, actual.getAuthority());
+ if (!UNRESTRICTED.equals(codeSpace)) assertEquals (concat(message, "Wrong code space"), codeSpace, actual.getCodeSpace());
+ if (!UNRESTRICTED.equals(version)) assertEquals (concat(message, "Wrong version"), version, actual.getVersion());
+ if (!UNRESTRICTED.equals(code)) assertEquals (concat(message, "Wrong code"), code, actual.getCode());
+ }
+ }
+
+ /**
+ * Asserts that all axes in the given coordinate system are pointing toward the given directions, in the same order.
+ *
+ * @param message Header of the exception message in case of failure, or {@code null} if none.
+ * @param cs The coordinate system to test.
+ * @param expected The expected axis directions.
+ */
+ public static void assertAxisDirectionsEqual(String message,
+ final CoordinateSystem cs, final AxisDirection... expected)
+ {
+ assertEquals(concat(message, "Wrong coordinate system dimension."), expected.length, cs.getDimension());
+ message = concat(message, "Wrong axis direction.");
+ for (int i=0; i<expected.length; i++) {
+ assertEquals(message, expected[i], cs.getAxis(i).getDirection());
+ }
+ }
+
+ /**
+ * Asserts that the given matrix is equals to the expected one, up to the given tolerance value.
+ *
+ * @param message Header of the exception message in case of failure, or {@code null} if none.
+ * @param expected The expected matrix, which may be {@code null}.
+ * @param actual The matrix to compare, or {@code null}.
+ * @param tolerance The tolerance threshold.
+ */
+ public static void assertMatrixEquals(final String message, final Matrix expected, final Matrix actual, final double tolerance) {
+ if (isNull(message, expected, actual)) {
+ return;
+ }
+ final int numRow = actual.getNumRow();
+ final int numCol = actual.getNumCol();
+ assertEquals("numRow", expected.getNumRow(), numRow);
+ assertEquals("numCol", expected.getNumCol(), numCol);
+ for (int j=0; j<numRow; j++) {
+ for (int i=0; i<numCol; i++) {
+ final double e = expected.getElement(j,i);
+ final double a = actual.getElement(j,i);
+ if (!(StrictMath.abs(e - a) <= tolerance) && Double.doubleToLongBits(a) != Double.doubleToLongBits(e)) {
+ fail("Matrix.getElement(" + j + ", " + i + "): expected " + e + " but got " + a);
+ }
+ }
+ }
+ }
+}
diff --cc endorsed/src/org.apache.sis.util/test/org/apache/sis/test/LoggingWatcher.java
index a810723862,c04b2cce74..5d5c2070dc
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/LoggingWatcher.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/LoggingWatcher.java
@@@ -25,11 -25,12 +25,12 @@@ import java.util.logging.Logger
import java.util.logging.LogRecord;
import java.util.logging.SimpleFormatter;
+ // Test dependencies
import static org.junit.Assert.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
+// Specific to the main branch:
+import org.junit.rules.TestWatchman;
+import org.junit.runners.model.FrameworkMethod;
/**
diff --cc incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
index 68984f7c48,1e9029216b..5d2a1958ca
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
@@@ -48,7 -48,15 +48,13 @@@ import java.util.logging.Level
import java.util.logging.Logger;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-
+ import org.locationtech.jts.geom.Geometry;
+ import org.locationtech.jts.geom.LineString;
+ import org.locationtech.jts.geom.MultiLineString;
+ import org.locationtech.jts.geom.MultiPoint;
+ import org.locationtech.jts.geom.MultiPolygon;
+ import org.locationtech.jts.geom.Point;
+ import org.locationtech.jts.geom.Polygon;
-import org.opengis.util.FactoryException;
-import org.opengis.util.GenericName;
import org.opengis.geometry.Envelope;
import org.opengis.metadata.Metadata;
import org.opengis.parameter.ParameterValueGroup;
@@@ -94,26 -100,20 +100,19 @@@ import org.apache.sis.storage.shapefile
import org.apache.sis.storage.shapefile.shp.ShapeWriter;
import org.apache.sis.storage.shapefile.shx.IndexWriter;
import org.apache.sis.util.collection.BackingStoreException;
- import org.locationtech.jts.geom.Geometry;
- import org.locationtech.jts.geom.LineString;
- import org.locationtech.jts.geom.MultiLineString;
- import org.locationtech.jts.geom.MultiPoint;
- import org.locationtech.jts.geom.MultiPolygon;
- import org.locationtech.jts.geom.Point;
- import org.locationtech.jts.geom.Polygon;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.CodeList;
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.filter.Expression;
-import org.opengis.filter.Filter;
-import org.opengis.filter.Literal;
-import org.opengis.filter.LogicalOperator;
-import org.opengis.filter.LogicalOperatorName;
-import org.opengis.filter.SpatialOperatorName;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.DefaultAttributeType;
+import org.apache.sis.filter.Expression;
+import org.apache.sis.filter.Filter;
+import org.apache.sis.pending.geoapi.filter.Literal;
+import org.apache.sis.pending.geoapi.filter.LogicalOperator;
+import org.apache.sis.pending.geoapi.filter.LogicalOperatorName;
+import org.apache.sis.pending.geoapi.filter.SpatialOperatorName;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
index 5dbc92b826,81d2da30a7..35b95f1a28
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
@@@ -28,15 -29,17 +29,16 @@@ import org.apache.sis.referencing.Commo
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.FeatureQuery;
import org.apache.sis.storage.FeatureSet;
+
+ // Test dependencies
+ import static org.junit.jupiter.api.Assertions.*;
import org.junit.Ignore;
import org.junit.Test;
- import org.locationtech.jts.geom.Point;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.FilterFactory;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.DefaultAttributeType;
/**
diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
index a8e0aefb55,43b7f7868f..4ccfd3b964
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
@@@ -44,14 -44,14 +44,13 @@@ import org.apache.sis.storage.FeatureSe
import org.apache.sis.feature.internal.AttributeConvention;
import org.apache.sis.gui.internal.IdentityValueFactory;
import org.apache.sis.gui.internal.ExceptionReporter;
-
import static org.apache.sis.gui.internal.LogHandler.LOGGER;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureAssociationRole;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.DefaultAttributeType;
/**
diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
index 067040c9c8,e302285195..b12938a52e
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
@@@ -43,11 -43,10 +43,10 @@@ import org.apache.sis.measure.UnitForma
import org.apache.sis.util.Characters;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.internal.Numerics;
-
import static org.apache.sis.gui.internal.LogHandler.LOGGER;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.CannotEvaluateException;
+// Specific to the main branch:
+import org.apache.sis.coverage.CannotEvaluateException;
/**
diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
index 906e23535c,83b3e38490..34e0e8f13c
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
@@@ -57,12 -57,8 +57,11 @@@ import org.apache.sis.storage.DataStore
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Workaround;
import org.apache.sis.util.resources.Vocabulary;
-
import static org.apache.sis.util.internal.CollectionsExt.nonNull;
+// Specific to the main branch:
+import org.opengis.metadata.identification.DataIdentification;
+
/**
* The pane where to show the values of {@link Identification} objects.