This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 80a27652f17105e29998567389fc45343cac04bb
Merge: 611ffb816d 0158ef9590
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Sep 28 16:05:54 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1 (imports reordering).
.../org/apache/sis/buildtools/doclet/Doclet.java | 2 +-
.../org/apache/sis/buildtools/doclet/Include.java | 4 +--
.../apache/sis/buildtools/gradle/ModularJAR.java | 4 +--
.../sis/buildtools/gradle/ModularJavadoc.java | 4 +--
.../resources/IndexedResourceCompilerTest.java | 2 ++
.../apache/sis/cloud/aws/s3/CachedByteChannel.java | 2 +-
.../apache/sis/cloud/aws/s3/ClientFileSystem.java | 4 +--
.../org/apache/sis/cloud/aws/s3/FileService.java | 10 +++---
.../main/org/apache/sis/cloud/aws/s3/KeyPath.java | 6 ++--
.../apache/sis/cloud/aws/s3/ObjectAttributes.java | 6 ++--
.../sis/cloud/aws/s3/ClientFileSystemTest.java | 1 +
.../sis/cloud/aws/s3/KeyPathMatcherTest.java | 1 +
.../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 4 ++-
.../org/apache/sis/console/AboutCommandTest.java | 4 ++-
.../org/apache/sis/console/CRSCommandTest.java | 4 ++-
.../org/apache/sis/console/CommandRunnerTest.java | 4 ++-
.../org/apache/sis/console/HelpCommandTest.java | 4 ++-
.../apache/sis/console/MetadataCommandTest.java | 4 ++-
.../apache/sis/console/MimeTypeCommandTest.java | 4 ++-
.../apache/sis/coverage/grid/PixelTranslation.java | 5 ++-
.../sis/feature/FeatureOperationException.java | 2 +-
.../main/org/apache/sis/filter/Capabilities.java | 4 +--
.../apache/sis/filter/DefaultFilterFactory.java | 2 +-
.../apache/sis/filter/internal/CopyVisitor.java | 2 +-
.../sis/filter/sqlmm/FunctionDescription.java | 2 +-
.../main/org/apache/sis/filter/sqlmm/SQLMM.java | 2 +-
.../geometry/wrapper/SpatialOperationContext.java | 8 ++---
.../apache/sis/geometry/wrapper/jts/Factory.java | 16 ++++-----
.../sis/geometry/wrapper/jts/FilteringContext.java | 4 +--
.../org/apache/sis/geometry/wrapper/jts/JTS.java | 6 ++--
.../wrapper/jts/PackedCoordinateSequence.java | 2 +-
.../geometry/wrapper/jts/PathIteratorAdapter.java | 4 +--
.../sis/geometry/wrapper/jts/ShapeAdapter.java | 6 ++--
.../sis/geometry/wrapper/jts/ShapeConverter.java | 2 +-
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 38 ++++++++++----------
.../main/org/apache/sis/image/ImageProcessor.java | 6 ++--
.../main/org/apache/sis/image/TransferType.java | 4 +--
.../sis/image/processing/isoline/Joiner.java | 2 +-
.../org/apache/sis/coverage/CategoryListTest.java | 4 ++-
.../test/org/apache/sis/coverage/CategoryTest.java | 4 ++-
.../apache/sis/coverage/CoverageCombinerTest.java | 4 ++-
.../apache/sis/coverage/SampleDimensionTest.java | 4 ++-
.../apache/sis/coverage/SampleRangeFormatTest.java | 4 ++-
.../grid/BandAggregateGridCoverageTest.java | 4 ++-
.../coverage/grid/BufferedGridCoverageTest.java | 2 ++
.../coverage/grid/ConvertedGridCoverageTest.java | 6 ++--
.../coverage/grid/DimensionalityReductionTest.java | 4 ++-
.../grid/FractionalGridCoordinatesTest.java | 3 +-
.../sis/coverage/grid/GridCoverage2DTest.java | 4 ++-
.../sis/coverage/grid/GridCoverageBuilderTest.java | 4 ++-
.../sis/coverage/grid/GridDerivationTest.java | 4 ++-
.../apache/sis/coverage/grid/GridExtentTest.java | 4 ++-
.../apache/sis/coverage/grid/GridGeometryTest.java | 4 ++-
.../sis/coverage/grid/GridOrientationTest.java | 4 ++-
.../sis/coverage/grid/PixelTranslationTest.java | 4 ++-
.../coverage/grid/ResampledGridCoverageTest.java | 6 ++--
.../sis/coverage/grid/ReshapedImageTest.java | 4 ++-
.../coverage/grid/TranslatedGridCoverageTest.java | 4 ++-
.../coverage/grid/j2d/ColorModelBuilderTest.java | 4 ++-
.../sis/coverage/grid/j2d/ImageLayoutTest.java | 4 ++-
.../sis/coverage/grid/j2d/ImageUtilitiesTest.java | 6 ++--
.../coverage/grid/j2d/SampleModelFactoryTest.java | 4 ++-
.../coverage/grid/j2d/ScaledColorSpaceTest.java | 6 ++--
.../sis/coverage/internal/RangeArgumentTest.java | 4 ++-
.../apache/sis/feature/AbstractFeatureTest.java | 2 ++
.../apache/sis/feature/AbstractOperationTest.java | 4 ++-
.../apache/sis/feature/CharacteristicMapTest.java | 4 ++-
.../sis/feature/CharacteristicTypeMapTest.java | 9 ++---
.../sis/feature/DefaultAssociationRoleTest.java | 6 ++--
.../sis/feature/DefaultAttributeTypeTest.java | 4 ++-
.../apache/sis/feature/DefaultFeatureTypeTest.java | 4 ++-
.../org/apache/sis/feature/DenseFeatureTest.java | 1 +
.../apache/sis/feature/EnvelopeOperationTest.java | 4 ++-
.../org/apache/sis/feature/FeatureFormatTest.java | 4 ++-
.../apache/sis/feature/FeatureOperationsTest.java | 4 ++-
.../org/apache/sis/feature/FeatureTestCase.java | 4 ++-
.../test/org/apache/sis/feature/FeaturesTest.java | 3 +-
.../sis/feature/GroupAsPolylineOperationTest.java | 4 ++-
.../org/apache/sis/feature/LinkOperationTest.java | 4 ++-
.../sis/feature/MultiValuedAttributeTest.java | 4 ++-
.../apache/sis/feature/PropertySingletonTest.java | 4 ++-
.../sis/feature/SingletonAssociationTest.java | 4 ++-
.../apache/sis/feature/SingletonAttributeTest.java | 4 ++-
.../org/apache/sis/feature/SparseFeatureTest.java | 1 +
.../sis/feature/StringJoinOperationTest.java | 4 ++-
.../builder/AssociationRoleBuilderTest.java | 4 ++-
.../feature/builder/AttributeTypeBuilderTest.java | 4 ++-
.../builder/CharacteristicTypeBuilderTest.java | 4 ++-
.../feature/builder/FeatureTypeBuilderTest.java | 6 ++--
.../feature/internal/AttributeConventionTest.java | 4 ++-
.../apache/sis/filter/ArithmeticFunctionTest.java | 3 +-
.../sis/filter/BinarySpatialFilterTestCase.java | 4 ++-
.../filter/BinarySpatialFilterUsingESRI_Test.java | 2 ++
.../BinarySpatialFilterUsingJava2D_Test.java | 2 ++
.../org/apache/sis/filter/CapabilitiesTest.java | 11 +++---
.../apache/sis/filter/ComparisonFilterTest.java | 3 +-
.../apache/sis/filter/IdentifierFilterTest.java | 4 ++-
.../org/apache/sis/filter/LeafExpressionTest.java | 4 ++-
.../test/org/apache/sis/filter/LikeFilterTest.java | 1 +
.../org/apache/sis/filter/LogicalFilterTest.java | 4 ++-
.../test/org/apache/sis/filter/PeriodLiteral.java | 2 ++
.../org/apache/sis/filter/TemporalFilterTest.java | 4 ++-
.../test/org/apache/sis/filter/XPathTest.java | 4 ++-
.../sis/filter/internal/CopyVisitorTest.java | 9 +++--
.../sis/filter/internal/FilterFactoryMock.java | 2 +-
.../apache/sis/filter/internal/FunctionMock.java | 2 +-
.../sis/filter/internal/FunctionNamesTest.java | 4 ++-
.../apache/sis/filter/sqlmm/RegistryTestCase.java | 6 ++--
.../sis/filter/sqlmm/RegistryUsingESRI_Test.java | 2 ++
.../sis/filter/sqlmm/RegistryUsingJava2D_Test.java | 2 ++
.../org/apache/sis/filter/sqlmm/SQLMMTest.java | 8 +++--
.../sis/geometry/wrapper/GeometriesTestCase.java | 4 ++-
.../sis/geometry/wrapper/GeometryTypeTest.java | 4 ++-
.../geometry/wrapper/StandardGeometriesTest.java | 4 ++-
.../sis/geometry/wrapper/esri/FactoryTest.java | 4 ++-
.../sis/geometry/wrapper/j2d/FactoryTest.java | 4 ++-
.../sis/geometry/wrapper/j2d/FlatShapeTest.java | 4 ++-
.../geometry/wrapper/j2d/ShapePropertiesTest.java | 4 ++-
.../sis/geometry/wrapper/jts/FactoryTest.java | 4 ++-
.../apache/sis/geometry/wrapper/jts/JTSTest.java | 12 ++++---
.../sis/geometry/wrapper/jts/ShapeAdapterTest.java | 6 ++--
.../geometry/wrapper/jts/ShapeConverterTest.java | 4 ++-
.../apache/sis/image/BandAggregateImageTest.java | 4 ++-
.../org/apache/sis/image/BandSelectImageTest.java | 4 ++-
.../sis/image/BandedSampleConverterTest.java | 4 ++-
.../org/apache/sis/image/ComputedImageTest.java | 4 ++-
.../test/org/apache/sis/image/DataTypeTest.java | 4 ++-
.../org/apache/sis/image/ImageCombinerTest.java | 4 ++-
.../org/apache/sis/image/ImageProcessorTest.java | 6 ++--
.../test/org/apache/sis/image/ImageTestCase.java | 4 ++-
.../org/apache/sis/image/InterpolationTest.java | 4 ++-
.../test/org/apache/sis/image/MaskedImageTest.java | 4 ++-
.../org/apache/sis/image/PixelIteratorTest.java | 6 ++--
.../test/org/apache/sis/image/PlanarImageTest.java | 4 ++-
.../org/apache/sis/image/ResampledImageTest.java | 4 ++-
.../org/apache/sis/image/ResamplingGridTest.java | 6 ++--
.../apache/sis/image/StatisticsCalculatorTest.java | 6 ++--
.../sis/image/processing/isoline/IsolinesTest.java | 4 ++-
.../apache/sis/index/tree/PointTreeNodeTest.java | 4 ++-
.../org/apache/sis/index/tree/PointTreeTest.java | 4 ++-
.../sis/metadata/MetadataVisitorException.java | 2 +-
.../sis/metadata/internal/MetadataTypes.java | 4 +--
.../sis/metadata/iso/content/DefaultBand.java | 4 +--
.../iso/content/DefaultSampleDimension.java | 2 +-
.../metadata/iso/distribution/DefaultDataFile.java | 2 +-
.../metadata/iso/distribution/DefaultMedium.java | 2 +-
.../apache/sis/metadata/iso/extent/Extents.java | 6 ++--
.../identification/DefaultDataIdentification.java | 2 +-
.../iso/quality/DefaultQuantitativeResult.java | 2 +-
.../apache/sis/metadata/simple/SimpleMetadata.java | 2 +-
.../org/apache/sis/util/iso/DefaultNameSpace.java | 6 ++--
.../main/org/apache/sis/xml/MarshalContext.java | 2 +-
.../main/org/apache/sis/xml/PooledMarshaller.java | 10 +++---
.../org/apache/sis/xml/PooledUnmarshaller.java | 10 +++---
.../main/org/apache/sis/xml/XML.java | 8 ++---
.../org/apache/sis/xml/bind/cat/EnumAdapter.java | 2 +-
.../org/apache/sis/xml/bind/gco/GO_DateTime.java | 6 ++--
.../org/apache/sis/xml/bind/gco/GO_Temporal.java | 6 ++--
.../org/apache/sis/xml/bind/gco/UnitAdapter.java | 2 +-
.../main/org/apache/sis/xml/bind/gml/Measure.java | 4 +--
.../org/apache/sis/xml/bind/gml/TimeInstant.java | 4 +--
.../apache/sis/xml/bind/gml/TimePeriodBound.java | 2 +-
.../bind/metadata/code/CI_TelephoneTypeCode.java | 2 +-
.../apache/sis/xml/bind/metadata/code/DCPList.java | 2 +-
.../xml/bind/metadata/code/SV_CouplingType.java | 2 +-
.../xml/bind/metadata/geometry/ObjectFactory.java | 2 +-
.../xml/bind/metadata/replace/RS_Identifier.java | 4 +--
.../metadata/replace/ReferenceSystemMetadata.java | 4 ++-
.../apache/sis/metadata/AbstractMetadataTest.java | 3 +-
.../test/org/apache/sis/metadata/Assertions.java | 6 ++--
.../test/org/apache/sis/metadata/HashCodeTest.java | 4 ++-
.../apache/sis/metadata/InformationMapTest.java | 4 ++-
.../apache/sis/metadata/MetadataCopierTest.java | 4 ++-
.../apache/sis/metadata/MetadataStandardTest.java | 4 ++-
.../sis/metadata/ModifiableMetadataTest.java | 4 ++-
.../test/org/apache/sis/metadata/NameMapTest.java | 6 ++--
.../apache/sis/metadata/PropertyAccessorTest.java | 10 +++---
.../sis/metadata/PropertyConsistencyCheck.java | 4 ++-
.../sis/metadata/PropertyInformationTest.java | 4 ++-
.../test/org/apache/sis/metadata/PrunerTest.java | 6 ++--
.../org/apache/sis/metadata/SpecialCasesTest.java | 4 ++-
.../apache/sis/metadata/TreeNodeChildrenTest.java | 4 ++-
.../test/org/apache/sis/metadata/TreeNodeTest.java | 4 ++-
.../apache/sis/metadata/TreeTableFormatTest.java | 4 ++-
.../org/apache/sis/metadata/TreeTableViewTest.java | 4 ++-
.../test/org/apache/sis/metadata/TypeMapTest.java | 6 ++--
.../test/org/apache/sis/metadata/ValueMapTest.java | 8 +++--
.../sis/metadata/internal/AxisNamesTest.java | 4 ++-
.../sis/metadata/internal/IdentifiersTest.java | 4 ++-
.../internal/ImplementationHelperTest.java | 6 ++--
.../apache/sis/metadata/internal/MergerTest.java | 4 ++-
.../sis/metadata/internal/NameMeaningTest.java | 4 ++-
.../org/apache/sis/metadata/iso/APIVerifier.java | 4 ++-
.../apache/sis/metadata/iso/AllMetadataTest.java | 6 ++--
.../sis/metadata/iso/CustomMetadataTest.java | 4 ++-
.../sis/metadata/iso/DefaultIdentifierTest.java | 4 ++-
.../sis/metadata/iso/DefaultMetadataTest.java | 4 ++-
.../sis/metadata/iso/citation/CitationsTest.java | 6 ++--
.../iso/citation/DefaultCitationDateTest.java | 4 ++-
.../metadata/iso/citation/DefaultCitationTest.java | 6 ++--
.../metadata/iso/citation/DefaultContactTest.java | 4 ++-
.../iso/citation/DefaultResponsibilityTest.java | 4 ++-
.../constraint/DefaultLegalConstraintsTest.java | 6 ++--
.../sis/metadata/iso/content/DefaultBandTest.java | 6 ++--
.../sis/metadata/iso/extent/DefaultExtentTest.java | 4 ++-
.../extent/DefaultGeographicBoundingBoxTest.java | 4 ++-
.../sis/metadata/iso/extent/ExtentsTest.java | 4 ++-
.../identification/DefaultBrowseGraphicTest.java | 8 +++--
.../identification/DefaultCoupledResourceTest.java | 6 ++--
.../DefaultDataIdentificationTest.java | 4 ++-
.../iso/identification/DefaultKeywordsTest.java | 4 ++-
.../DefaultRepresentativeFractionTest.java | 4 ++-
.../iso/identification/DefaultResolutionTest.java | 8 +++--
.../DefaultServiceIdentificationTest.java | 6 ++--
.../metadata/iso/lineage/DefaultLineageTest.java | 4 ++-
.../iso/lineage/DefaultProcessStepTest.java | 4 ++-
.../maintenance/DefaultScopeDescriptionTest.java | 6 ++--
.../metadata/iso/quality/AbstractElementTest.java | 4 ++-
.../quality/AbstractPositionalAccuracyTest.java | 4 ++-
.../iso/quality/DefaultDomainConsistencyTest.java | 4 ++-
.../iso/quality/DefaultEvaluationMethodTest.java | 4 ++-
.../iso/quality/DefaultQuantitativeResultTest.java | 4 ++-
.../sis/metadata/iso/quality/ScopeCodeTest.java | 4 ++-
.../iso/spatial/DefaultGeorectifiedTest.java | 6 ++--
.../sis/metadata/simple/SimpleIdentifierTest.java | 3 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 4 ++-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 6 ++--
.../sis/metadata/sql/MetadataSourceTest.java | 10 +++---
.../sis/metadata/sql/MetadataWriterTest.java | 10 +++---
.../sis/metadata/sql/util/SQLUtilitiesTest.java | 3 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java | 4 ++-
.../sis/metadata/sql/util/TypeMapperTest.java | 4 ++-
.../sis/metadata/xml/SchemaComplianceTest.java | 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 4 ++-
.../apache/sis/test/mock/FeatureAttributeMock.java | 2 +-
.../test/org/apache/sis/test/sql/TestDatabase.java | 4 ++-
.../sis/test/xml/AnnotationConsistencyCheck.java | 6 ++--
.../apache/sis/test/xml/DocumentComparator.java | 10 +++---
.../org/apache/sis/test/xml/PackageVerifier.java | 2 +-
.../org/apache/sis/test/xml/SchemaCompliance.java | 2 +-
.../test/org/apache/sis/test/xml/TestCase.java | 2 ++
.../apache/sis/util/iso/DefaultLocalNameTest.java | 7 ++--
.../sis/util/iso/DefaultNameFactoryTest.java | 6 ++--
.../sis/util/iso/DefaultRecordSchemaTest.java | 2 ++
.../org/apache/sis/util/iso/DefaultRecordTest.java | 2 ++
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 2 ++
.../apache/sis/util/iso/DefaultScopedNameTest.java | 4 ++-
.../apache/sis/util/iso/NameMarshallingTest.java | 6 ++--
.../test/org/apache/sis/util/iso/NamesTest.java | 4 ++-
.../org/apache/sis/util/iso/TypeNamesTest.java | 6 ++--
.../test/org/apache/sis/util/iso/TypesTest.java | 4 ++-
.../sis/xml/CharSequenceSubstitutionTest.java | 6 ++--
.../test/org/apache/sis/xml/LegacyCodesTest.java | 5 +--
.../org/apache/sis/xml/MarshallerPoolTest.java | 4 ++-
.../test/org/apache/sis/xml/NamespacesTest.java | 5 +--
.../apache/sis/xml/NilReasonMarshallingTest.java | 6 ++--
.../test/org/apache/sis/xml/NilReasonTest.java | 4 ++-
.../org/apache/sis/xml/RenameListGenerator.java | 2 +-
.../test/org/apache/sis/xml/TransformerTest.java | 4 ++-
.../apache/sis/xml/TransformingNamespacesTest.java | 4 ++-
.../org/apache/sis/xml/UUIDMarshallingTest.java | 6 ++--
.../org/apache/sis/xml/ValueConverterTest.java | 4 ++-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 4 ++-
.../test/org/apache/sis/xml/XLinkTest.java | 4 ++-
.../test/org/apache/sis/xml/XPointerTest.java | 4 ++-
.../sis/xml/bind/IdentifierMapAdapterTest.java | 6 ++--
.../sis/xml/bind/ModifiableIdentifierMapTest.java | 6 ++--
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 4 ++-
.../apache/sis/xml/bind/cat/EnumAdapterTest.java | 3 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 4 ++-
.../apache/sis/xml/bind/gco/MultiplicityTest.java | 6 ++--
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 4 ++-
.../apache/sis/xml/bind/gco/StringAdapterTest.java | 4 ++-
.../org/apache/sis/xml/bind/gml/MeasureTest.java | 4 ++-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 6 ++--
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 4 ++-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 10 +++---
.../apache/sis/xml/bind/lan/OtherLocalesTest.java | 2 ++
.../org/apache/sis/xml/bind/lan/PT_LocaleTest.java | 4 ++-
.../metadata/replace/QualityParameterTest.java | 4 ++-
.../metadata/replace/ServiceParameterTest.java | 4 ++-
.../sis/xml/util/DocumentComparatorTest.java | 3 +-
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 6 ++--
.../sis/openoffice/ReferencingFunctions.java | 10 +++---
.../sis/openoffice/ReferencingFunctionsTest.java | 6 ++--
.../org/apache/sis/openoffice/TransformerTest.java | 6 ++--
.../org/apache/sis/map/ExceptionPresentation.java | 2 +-
.../main/org/apache/sis/map/Presentation.java | 2 +-
.../main/org/apache/sis/map/SEPortrayer.java | 32 ++++++++---------
.../main/org/apache/sis/map/SEPresentation.java | 2 +-
.../main/org/apache/sis/portrayal/MapItem.java | 2 +-
.../main/org/apache/sis/portrayal/MapLayer.java | 6 ++--
.../main/org/apache/sis/portrayal/MapLayers.java | 6 ++--
.../main/org/apache/sis/style/se1/Symbolizer.java | 2 +-
.../test/org/apache/sis/map/SEPortrayerTest.java | 22 ++++++------
.../MultiResolutionCoverageLoaderTest.java | 4 ++-
.../org/apache/sis/portrayal/MapLayersTest.java | 3 +-
.../org/apache/sis/style/se1/AnchorPointTest.java | 1 +
.../apache/sis/style/se1/ChannelSelectionTest.java | 1 +
.../sis/style/se1/ContrastEnhancementTest.java | 1 +
.../org/apache/sis/style/se1/DescriptionTest.java | 2 ++
.../org/apache/sis/style/se1/DisplacementTest.java | 1 +
.../apache/sis/style/se1/ExternalGraphicTest.java | 2 ++
.../apache/sis/style/se1/FeatureTypeStyleTest.java | 2 ++
.../test/org/apache/sis/style/se1/FillTest.java | 2 ++
.../test/org/apache/sis/style/se1/FontTest.java | 2 ++
.../apache/sis/style/se1/GraphicStrokeTest.java | 1 +
.../test/org/apache/sis/style/se1/GraphicTest.java | 1 +
.../test/org/apache/sis/style/se1/HaloTest.java | 1 +
.../apache/sis/style/se1/LinePlacementTest.java | 1 +
.../apache/sis/style/se1/LineSymbolizerTest.java | 2 ++
.../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 | 2 ++
.../apache/sis/style/se1/RasterSymbolizerTest.java | 1 +
.../test/org/apache/sis/style/se1/RuleTest.java | 4 ++-
.../apache/sis/style/se1/SelectedChannelTest.java | 1 +
.../org/apache/sis/style/se1/ShadedReliefTest.java | 1 +
.../test/org/apache/sis/style/se1/StrokeTest.java | 2 ++
.../org/apache/sis/style/se1/StyleTestCase.java | 2 ++
.../org/apache/sis/style/se1/SymbolizerTest.java | 2 ++
.../org/apache/sis/style/se1/SymbologyTest.java | 1 +
.../apache/sis/style/se1/TextSymbolizerTest.java | 1 +
.../test/org/apache/sis/style/se1/XmlTest.java | 4 ++-
.../sis/profile/france/FrenchProfileTest.java | 4 ++-
.../sis/xml/bind/fra/DataIdentificationTest.java | 4 ++-
.../xml/bind/fra/DirectReferenceSystemTest.java | 4 ++-
.../apache/sis/profile/japan/netcdf/GCOM_C.java | 2 +-
.../apache/sis/profile/japan/JapanProfileTest.java | 4 ++-
.../gazetteer/GeohashReferenceSystem.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 8 ++---
.../gazetteer/ReferencingByIdentifiers.java | 2 +-
.../gazetteer/GazetteerFactoryTest.java | 3 +-
.../gazetteer/GeohashReferenceSystemTest.java | 4 ++-
.../referencing/gazetteer/LocationFormatTest.java | 4 ++-
.../referencing/gazetteer/LocationTypeTest.java | 4 ++-
.../gazetteer/MilitaryGridReferenceSystemTest.java | 4 ++-
.../gazetteer/ReferencingByIdentifiersTest.java | 4 ++-
.../sis/parameter/DefaultParameterValue.java | 2 +-
.../sis/parameter/UnmodifiableParameterValue.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 2 +-
.../referencing/EllipsoidalHeightSeparator.java | 3 +-
.../apache/sis/referencing/NamedIdentifier.java | 4 +--
.../org/apache/sis/referencing/Properties.java | 2 +-
.../apache/sis/referencing/crs/AbstractCRS.java | 2 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 4 +--
.../sis/referencing/crs/DefaultProjectedCRS.java | 4 +--
.../org/apache/sis/referencing/cs/AbstractCS.java | 2 +-
.../org/apache/sis/referencing/cs/AxisFilter.java | 2 +-
.../main/org/apache/sis/referencing/cs/Codes.java | 2 +-
.../apache/sis/referencing/cs/DefaultAffineCS.java | 2 +-
.../cs/DefaultCoordinateSystemAxis.java | 6 ++--
.../sis/referencing/cs/DefaultCylindricalCS.java | 2 +-
.../sis/referencing/cs/DefaultEllipsoidalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultLinearCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultPolarCS.java | 2 +-
.../sis/referencing/cs/DefaultSphericalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultTimeCS.java | 2 +-
.../sis/referencing/cs/DefaultVerticalCS.java | 2 +-
.../sis/referencing/datum/DefaultEllipsoid.java | 6 ++--
.../referencing/datum/DefaultPrimeMeridian.java | 4 +--
.../org/apache/sis/referencing/datum/Sphere.java | 2 +-
.../referencing/factory/GeodeticObjectFactory.java | 2 +-
.../sis/referencing/internal/DeprecatedName.java | 2 +-
.../referencing/internal/EPSGFactoryProxyCOP.java | 2 +-
.../sis/referencing/internal/ReferencingTypes.java | 2 +-
.../operation/provider/DatumShiftGridLoader.java | 2 +-
.../LambertAzimuthalEqualAreaSpherical.java | 2 +-
.../referencing/operation/provider/Molodensky.java | 2 +-
.../provider/MolodenskyInterpolation.java | 2 +-
.../sis/referencing/operation/provider/NADCON.java | 2 +-
.../sis/referencing/operation/provider/NTv2.java | 2 +-
.../transform/AbstractLinearTransform.java | 2 +-
.../referencing/util/ExtendedPrecisionMatrix.java | 2 +-
.../sis/xml/bind/referencing/package-info.java | 2 +-
.../sis/geometry/AbstractDirectPositionTest.java | 1 +
.../apache/sis/geometry/AbstractEnvelopeTest.java | 6 ++--
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 6 ++--
.../apache/sis/geometry/CoordinateFormatTest.java | 4 ++-
.../org/apache/sis/geometry/CurveExtremumTest.java | 3 +-
.../apache/sis/geometry/DirectPosition1DTest.java | 4 ++-
.../apache/sis/geometry/DirectPosition2DTest.java | 4 ++-
.../org/apache/sis/geometry/Envelope2DTest.java | 6 ++--
.../apache/sis/geometry/EnvelopeReducerTest.java | 4 ++-
.../org/apache/sis/geometry/EnvelopesTest.java | 8 +++--
.../sis/geometry/GeneralDirectPositionTest.java | 6 ++--
.../apache/sis/geometry/GeneralEnvelopeTest.java | 10 +++---
.../apache/sis/geometry/ImmutableEnvelopeTest.java | 5 +--
.../test/org/apache/sis/geometry/Shapes2DTest.java | 2 ++
.../org/apache/sis/geometry/SubEnvelopeTest.java | 3 +-
.../org/apache/sis/geometry/TransformTestCase.java | 6 ++--
.../sis/geometry/WraparoundAdjustmentTest.java | 4 ++-
.../test/org/apache/sis/io/wkt/ColorsTest.java | 3 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 4 ++-
.../test/org/apache/sis/io/wkt/ConventionTest.java | 4 ++-
.../test/org/apache/sis/io/wkt/ElementTest.java | 4 ++-
.../test/org/apache/sis/io/wkt/FormatterTest.java | 4 ++-
.../sis/io/wkt/GeodeticObjectParserTest.java | 6 ++--
.../apache/sis/io/wkt/MathTransformParserTest.java | 4 ++-
.../test/org/apache/sis/io/wkt/SymbolsTest.java | 4 ++-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 4 ++-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 4 ++-
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 4 ++-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 4 +--
.../DefaultParameterDescriptorGroupTest.java | 6 ++--
.../parameter/DefaultParameterDescriptorTest.java | 4 ++-
.../parameter/DefaultParameterValueGroupTest.java | 6 ++--
.../sis/parameter/DefaultParameterValueTest.java | 4 ++-
.../sis/parameter/MapProjectionParametersTest.java | 6 ++--
.../parameter/MatrixParametersAlphaNumTest.java | 3 +-
.../apache/sis/parameter/MatrixParametersTest.java | 3 +-
.../apache/sis/parameter/ParameterBuilderTest.java | 4 ++-
.../apache/sis/parameter/ParameterFormatTest.java | 12 ++++---
.../sis/parameter/ParameterMarshallingTest.java | 10 +++---
.../org/apache/sis/parameter/ParametersTest.java | 4 ++-
.../apache/sis/parameter/TensorParametersTest.java | 10 +++---
.../org/apache/sis/parameter/TensorValuesTest.java | 8 +++--
.../UnmodifiableParameterValueGroupTest.java | 4 ++-
.../parameter/UnmodifiableParameterValueTest.java | 8 +++--
.../referencing/AbstractIdentifiedObjectTest.java | 8 +++--
.../referencing/AbstractReferenceSystemTest.java | 6 ++--
.../org/apache/sis/referencing/Assertions.java | 2 ++
.../sis/referencing/AuthorityFactoriesTest.java | 8 +++--
.../org/apache/sis/referencing/BuilderTest.java | 4 ++-
.../test/org/apache/sis/referencing/CRSTest.java | 8 +++--
.../org/apache/sis/referencing/CommonCRSTest.java | 4 ++-
.../sis/referencing/EPSGFactoryFallbackTest.java | 4 ++-
.../sis/referencing/GeodesicsOnEllipsoidTest.java | 6 ++--
.../sis/referencing/GeodeticCalculatorTest.java | 14 ++++----
.../sis/referencing/IdentifiedObjectsTest.java | 6 ++--
.../sis/referencing/ImmutableIdentifierTest.java | 6 ++--
.../sis/referencing/NamedIdentifierTest.java | 6 ++--
.../sis/referencing/StandardDefinitionsTest.java | 10 +++---
.../sis/referencing/crs/AbstractCRSTest.java | 4 ++-
.../referencing/crs/DefaultCompoundCRSTest.java | 6 ++--
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 6 ++--
.../referencing/crs/DefaultEngineeringCRSTest.java | 4 ++-
.../referencing/crs/DefaultGeocentricCRSTest.java | 6 ++--
.../referencing/crs/DefaultGeodeticCRSTest.java | 6 ++--
.../referencing/crs/DefaultGeographicCRSTest.java | 6 ++--
.../sis/referencing/crs/DefaultImageCRSTest.java | 4 ++-
.../referencing/crs/DefaultProjectedCRSTest.java | 8 +++--
.../referencing/crs/DefaultTemporalCRSTest.java | 8 +++--
.../referencing/crs/DefaultVerticalCRSTest.java | 4 ++-
.../sis/referencing/crs/HardCodedCRSTest.java | 5 +--
.../apache/sis/referencing/crs/SubTypesTest.java | 4 ++-
.../apache/sis/referencing/cs/AbstractCSTest.java | 4 ++-
.../org/apache/sis/referencing/cs/CodesTest.java | 8 +++--
.../sis/referencing/cs/CoordinateSystemsTest.java | 4 ++-
.../sis/referencing/cs/DefaultCartesianCSTest.java | 8 +++--
.../sis/referencing/cs/DefaultCompoundCSTest.java | 4 ++-
.../cs/DefaultCoordinateSystemAxisTest.java | 10 +++---
.../referencing/cs/DefaultCylindricalCSTest.java | 4 ++-
.../referencing/cs/DefaultEllipsoidalCSTest.java | 8 +++--
.../sis/referencing/cs/DefaultPolarCSTest.java | 4 ++-
.../sis/referencing/cs/DefaultSphericalCSTest.java | 4 ++-
.../referencing/cs/DirectionAlongMeridianTest.java | 4 ++-
.../apache/sis/referencing/cs/HardCodedCSTest.java | 5 +--
.../apache/sis/referencing/cs/NormalizerTest.java | 4 ++-
.../referencing/datum/BursaWolfParametersTest.java | 4 ++-
.../referencing/datum/DefaultEllipsoidTest.java | 4 ++-
.../datum/DefaultGeodeticDatumTest.java | 8 +++--
.../datum/DefaultPrimeMeridianTest.java | 8 +++--
.../datum/DefaultTemporalDatumTest.java | 6 ++--
.../datum/DefaultVerticalDatumTest.java | 6 ++--
.../sis/referencing/datum/GeodeticDatumMock.java | 4 ++-
.../sis/referencing/datum/PrimeMeridianMock.java | 4 ++-
.../referencing/datum/TimeDependentBWPTest.java | 6 ++--
.../factory/AuthorityFactoryProxyTest.java | 4 ++-
.../factory/CommonAuthorityFactoryTest.java | 6 ++--
.../factory/ConcurrentAuthorityFactoryTest.java | 4 ++-
.../factory/GeodeticObjectFactoryTest.java | 4 +--
.../factory/IdentifiedObjectFinderTest.java | 4 ++-
.../factory/MultiAuthoritiesFactoryTest.java | 8 +++--
.../referencing/factory/sql/EPSGFactoryTest.java | 2 ++
.../referencing/factory/sql/EPSGInstallerTest.java | 8 +++--
.../sis/referencing/factory/sql/TableInfoTest.java | 3 +-
.../factory/sql/epsg/DataScriptFormatter.java | 2 ++
.../factory/sql/epsg/DataScriptFormatterTest.java | 3 +-
.../internal/ServicesForMetadataTest.java | 4 ++-
.../internal/VerticalDatumTypesTest.java | 6 ++--
.../operation/CoordinateOperationFinderTest.java | 14 ++++----
.../operation/CoordinateOperationRegistryTest.java | 8 +++--
.../DefaultConcatenatedOperationTest.java | 4 ++-
.../operation/DefaultConversionTest.java | 4 ++-
.../DefaultCoordinateOperationFactoryTest.java | 8 +++--
.../referencing/operation/DefaultFormulaTest.java | 4 ++-
.../operation/DefaultOperationMethodTest.java | 4 ++-
.../operation/DefaultPassThroughOperationTest.java | 4 ++-
.../operation/DefaultTransformationTest.java | 6 ++--
.../operation/SingleOperationMarshallingTest.java | 10 +++---
.../builder/LinearTransformBuilderTest.java | 4 ++-
.../operation/builder/LinearizerTest.java | 4 ++-
.../builder/LocalizationGridBuilderTest.java | 6 ++--
.../operation/builder/ResidualGridTest.java | 6 ++--
.../operation/matrix/AffineTransforms2DTest.java | 6 ++--
.../operation/matrix/GeneralMatrixTest.java | 2 ++
.../referencing/operation/matrix/MatricesTest.java | 4 ++-
.../referencing/operation/matrix/Matrix1Test.java | 3 +-
.../referencing/operation/matrix/Matrix2Test.java | 5 +--
.../referencing/operation/matrix/Matrix3Test.java | 5 +--
.../referencing/operation/matrix/Matrix4Test.java | 5 +--
.../operation/matrix/MatrixTestCase.java | 4 ++-
.../operation/matrix/NonSquareMatrixTest.java | 6 ++--
.../referencing/operation/matrix/SolverTest.java | 4 ++-
.../operation/projection/AlbersEqualAreaTest.java | 8 ++---
.../projection/AuthalicConversionTest.java | 4 ++-
.../projection/AzimuthalEquidistantTest.java | 4 ++-
.../operation/projection/CassiniSoldnerTest.java | 4 ++-
.../projection/ConformalProjectionTest.java | 6 ++--
.../projection/CylindricalEqualAreaTest.java | 4 ++-
.../operation/projection/EquirectangularTest.java | 2 ++
.../operation/projection/InitializerTest.java | 4 ++-
.../projection/LambertAzimuthalEqualAreaTest.java | 2 ++
.../projection/LambertConicConformalTest.java | 4 ++-
.../projection/MapProjectionTestCase.java | 4 ++-
.../operation/projection/MercatorTest.java | 4 ++-
.../operation/projection/MeridianArcTest.java | 4 ++-
.../ModifiedAzimuthalEquidistantTest.java | 4 ++-
.../operation/projection/MollweideTest.java | 4 ++-
.../projection/NormalizedProjectionTest.java | 3 +-
.../operation/projection/ObliqueMercatorTest.java | 6 ++--
.../projection/ObliqueStereographicTest.java | 4 ++-
.../operation/projection/OrthographicTest.java | 4 ++-
.../projection/PolarStereographicTest.java | 4 ++-
.../operation/projection/PolyconicTest.java | 4 ++-
.../projection/SatelliteTrackingTest.java | 2 ++
.../operation/projection/SinusoidalTest.java | 4 ++-
.../projection/TransverseMercatorTest.java | 6 ++--
.../operation/projection/ZonedGridSystemTest.java | 4 ++-
.../referencing/operation/provider/AffineTest.java | 4 ++-
.../provider/CoordinateFrameRotationTest.java | 4 ++-
.../operation/provider/DatumShiftGridFileTest.java | 4 ++-
.../operation/provider/DatumShiftTestCase.java | 2 ++
.../FranceGeocentricInterpolationTest.java | 4 ++-
.../provider/GeocentricTranslationTest.java | 8 +++--
.../operation/provider/Geographic3Dto2DTest.java | 4 ++-
.../operation/provider/GeographicOffsetsTest.java | 6 ++--
.../operation/provider/LongitudeRotationTest.java | 4 ++-
.../operation/provider/MapProjectionTest.java | 6 ++--
.../operation/provider/MolodenskyTest.java | 4 ++-
.../referencing/operation/provider/NADCONTest.java | 2 ++
.../referencing/operation/provider/NTv2Test.java | 6 ++--
.../provider/ParameterNameTableGenerator.java | 2 +-
.../provider/PositionVector7ParamTest.java | 6 ++--
.../operation/provider/ProvidersTest.java | 4 ++-
.../operation/provider/TransverseMercatorTest.java | 4 ++-
.../transform/AbridgedMolodenskyTransformTest.java | 6 ++--
.../transform/AbstractMathTransformTest.java | 8 ++---
.../operation/transform/CartesianToPolarTest.java | 4 ++-
.../transform/CartesianToSphericalTest.java | 4 ++-
.../transform/ConcatenatedTransformTest.java | 4 ++-
.../transform/ContextualParametersTest.java | 6 ++--
.../operation/transform/CoordinateDomain.java | 3 +-
.../operation/transform/CoordinateDomainTest.java | 4 ++-
.../transform/CoordinateSystemTransformTest.java | 6 ++--
.../operation/transform/CopyTransformTest.java | 2 ++
.../transform/DefaultMathTransformFactoryTest.java | 4 ++-
.../operation/transform/DomainDefinitionTest.java | 6 ++--
.../transform/EllipsoidToCentricTransformTest.java | 6 ++--
.../transform/ExponentialTransform1DTest.java | 4 +--
.../InterpolatedGeocentricTransformTest.java | 4 ++-
.../InterpolatedMolodenskyTransformTest.java | 6 ++--
.../transform/InterpolatedTransformTest.java | 4 ++-
.../operation/transform/IterationStrategyTest.java | 6 ++--
.../transform/LinearInterpolator1DTest.java | 4 ++-
.../operation/transform/LinearTransformTest.java | 4 ++-
.../transform/LogarithmicTransform1DTest.java | 4 +--
.../operation/transform/MathTransformTestCase.java | 6 ++--
.../operation/transform/MathTransformsTest.java | 4 ++-
.../transform/MolodenskyTransformTest.java | 17 +++++----
.../transform/OperationMethodSetTest.java | 4 ++-
.../transform/PassThroughTransformTest.java | 2 ++
.../operation/transform/PolarToCartesianTest.java | 7 ++--
.../operation/transform/PoleRotationTest.java | 4 ++-
.../transform/ProjectiveTransformTest.java | 9 ++---
.../operation/transform/ScaleTransformTest.java | 4 ++-
.../transform/SpecializableTransformTest.java | 4 ++-
.../transform/SphericalToCartesianTest.java | 7 ++--
.../operation/transform/TransferFunctionTest.java | 4 ++-
.../transform/TransformSeparatorTest.java | 4 ++-
.../transform/TranslationTransformTest.java | 4 ++-
.../operation/transform/UnitConversionTest.java | 4 ++-
.../transform/WraparoundTransformTest.java | 4 ++-
.../report/CoordinateReferenceSystems.java | 2 +-
.../sis/referencing/util/AxesMapperTest.java | 4 ++-
.../sis/referencing/util/AxisDirectionsTest.java | 6 ++--
.../referencing/util/CoordinateOperationsTest.java | 4 ++-
.../referencing/util/DefinitionVerifierTest.java | 4 ++-
.../util/EllipsoidalHeightCombinerTest.java | 4 ++-
.../sis/referencing/util/ExtentSelectorTest.java | 4 ++-
.../apache/sis/referencing/util/FormulasTest.java | 4 ++-
.../util/GeodeticObjectBuilderTest.java | 4 ++-
.../apache/sis/referencing/util/LazySetTest.java | 4 ++-
.../util/PositionalAccuracyConstantTest.java | 4 ++-
.../referencing/util/ReferencingUtilitiesTest.java | 6 ++--
.../sis/referencing/util/WKTKeywordsTest.java | 4 ++-
.../sis/referencing/util/WKTUtilitiesTest.java | 8 +++--
.../referencing/util/WraparoundApplicatorTest.java | 4 ++-
.../referencing/util/j2d/AbstractShapeTest.java | 4 ++-
.../referencing/util/j2d/ShapeUtilitiesTest.java | 4 ++-
.../sis/test/integration/ConsistencyTest.java | 4 ++-
.../test/integration/CoordinateOperationTest.java | 4 ++-
.../integration/CoordinateReferenceSystemTest.java | 4 ++-
.../sis/test/integration/DatumShiftTest.java | 6 ++--
.../apache/sis/test/integration/MetadataTest.java | 8 +++--
.../sis/test/integration/MetadataVerticalTest.java | 12 ++++---
.../org/apache/sis/test/widget/VisualCheck.java | 2 ++
.../CC_GeneralOperationParameterTest.java | 8 +++--
.../CC_OperationParameterGroupTest.java | 6 ++--
.../apache/sis/xml/bind/referencing/CodeTest.java | 4 ++-
.../referencing/SecondDefiningParameterTest.java | 4 ++-
.../apache/sis/storage/landsat/BandGroupName.java | 2 +-
.../storage/landsat/LandsatStoreProviderTest.java | 4 ++-
.../sis/storage/landsat/MetadataReaderTest.java | 6 ++--
.../sis/storage/geotiff/MultiResolutionImage.java | 2 +-
.../apache/sis/storage/geotiff/XMLMetadata.java | 2 +-
.../sis/storage/geotiff/spi/SchemaModifier.java | 4 +--
.../apache/sis/storage/geotiff/CRSBuilderTest.java | 3 +-
.../apache/sis/storage/geotiff/GeoCodesTest.java | 4 ++-
.../apache/sis/storage/geotiff/GeoKeysTest.java | 4 ++-
.../sis/storage/geotiff/SelfConsistencyTest.java | 6 ++--
.../org/apache/sis/storage/geotiff/TagsTest.java | 3 +-
.../org/apache/sis/storage/geotiff/TypeTest.java | 4 ++-
.../sis/storage/geotiff/XMLMetadataTest.java | 4 ++-
.../sis/storage/geotiff/inflater/CCITTRLETest.java | 4 ++-
.../sis/storage/geotiff/inflater/InflaterTest.java | 3 +-
.../storage/geotiff/internal/CompressionTest.java | 3 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 6 ++--
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 4 +--
.../org/apache/sis/storage/netcdf/base/Axis.java | 4 +--
.../apache/sis/storage/netcdf/base/AxisType.java | 4 +--
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 6 ++--
.../apache/sis/storage/netcdf/base/Convention.java | 4 +--
.../apache/sis/storage/netcdf/base/Decoder.java | 2 +-
.../apache/sis/storage/netcdf/base/FeatureSet.java | 2 +-
.../sis/storage/netcdf/base/GridMapping.java | 2 +-
.../apache/sis/storage/netcdf/base/Variable.java | 4 +--
.../sis/storage/netcdf/classic/GridInfo.java | 2 +-
.../sis/storage/netcdf/classic/VariableInfo.java | 4 +--
.../sis/storage/netcdf/ucar/DimensionWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/FeaturesWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/VariableWrapper.java | 2 +-
.../sis/storage/netcdf/MetadataReaderTest.java | 6 ++--
.../storage/netcdf/NetcdfStoreProviderTest.java | 6 ++--
.../apache/sis/storage/netcdf/NetcdfStoreTest.java | 6 ++--
.../sis/storage/netcdf/SelfConsistencyTest.java | 6 ++--
.../apache/sis/storage/netcdf/base/AxisTest.java | 4 ++-
.../sis/storage/netcdf/base/DataTypeTest.java | 4 ++-
.../sis/storage/netcdf/base/DecoderTest.java | 4 ++-
.../sis/storage/netcdf/base/FeatureSetTest.java | 17 +++++----
.../apache/sis/storage/netcdf/base/GridTest.java | 4 ++-
.../apache/sis/storage/netcdf/base/TestCase.java | 10 +++---
.../sis/storage/netcdf/base/VariableTest.java | 4 ++-
.../storage/netcdf/classic/ChannelDecoderTest.java | 2 ++
.../sis/storage/netcdf/classic/FeatureSetTest.java | 2 +-
.../sis/storage/netcdf/classic/GridInfoTest.java | 2 ++
.../storage/netcdf/classic/VariableInfoTest.java | 2 ++
.../sis/storage/sql/postgis/ObjectGetter.java | 2 +-
.../org/apache/sis/storage/sql/SQLStoreTest.java | 2 ++
.../apache/sis/storage/sql/TestOnAllDatabases.java | 3 +-
.../storage/sql/feature/GeometryGetterTest.java | 6 ++--
.../sql/feature/SelectionClauseWriterTest.java | 4 ++-
.../sql/feature/TemporalValueGetterTest.java | 2 ++
.../apache/sis/storage/sql/postgis/BandTest.java | 4 ++-
.../sis/storage/sql/postgis/PostgresTest.java | 10 +++---
.../sis/storage/sql/postgis/RasterReaderTest.java | 4 ++-
.../sis/storage/sql/postgis/RasterWriterTest.java | 4 ++-
.../main/org/apache/sis/storage/gpx/Copyright.java | 2 +-
.../main/org/apache/sis/storage/gpx/Types.java | 2 +-
.../sis/storage/xml/stream/StaxStreamIO.java | 2 +-
.../sis/storage/xml/stream/StaxStreamWriter.java | 4 +--
.../org/apache/sis/storage/gpx/MetadataTest.java | 4 ++-
.../org/apache/sis/storage/gpx/ReaderTest.java | 8 +++--
.../test/org/apache/sis/storage/gpx/TypesTest.java | 4 ++-
.../org/apache/sis/storage/gpx/UpdaterTest.java | 6 ++--
.../org/apache/sis/storage/gpx/WriterTest.java | 8 +++--
.../main/org/apache/sis/storage/DataOptionKey.java | 2 +-
.../sis/storage/IllegalFeatureTypeException.java | 2 +-
.../sis/storage/base/GridResourceWrapper.java | 6 ++--
.../apache/sis/storage/base/MetadataBuilder.java | 2 +-
.../apache/sis/storage/base/StoreUtilities.java | 2 +-
.../main/org/apache/sis/storage/folder/Store.java | 4 +--
.../apache/sis/storage/folder/WritableStore.java | 2 +-
.../org/apache/sis/storage/tiling/TileMatrix.java | 4 +--
.../sis/storage/tiling/WritableTileMatrixSet.java | 2 +-
.../apache/sis/storage/xml/GeographicEnvelope.java | 4 +--
.../main/org/apache/sis/storage/xml/Store.java | 2 +-
.../apache/sis/io/stream/ChannelDataInputTest.java | 2 ++
.../sis/io/stream/ChannelDataOutputTest.java | 4 ++-
.../apache/sis/io/stream/ChannelDataTestCase.java | 4 ++-
.../sis/io/stream/ChannelImageInputStreamTest.java | 6 ++--
.../io/stream/ChannelImageOutputStreamTest.java | 4 ++-
.../sis/io/stream/FileCacheByteChannelTest.java | 4 ++-
.../sis/io/stream/HyperRectangleReaderTest.java | 4 ++-
.../org/apache/sis/io/stream/IOUtilitiesTest.java | 4 ++-
.../sis/io/stream/InputStreamArrayGetterTest.java | 4 ++-
.../sis/io/stream/RewindableLineReaderTest.java | 4 ++-
.../org/apache/sis/storage/CoverageQueryTest.java | 4 ++-
.../org/apache/sis/storage/CoverageSubsetTest.java | 4 ++-
.../apache/sis/storage/DataStoreProviderTest.java | 4 ++-
.../org/apache/sis/storage/DataStoresTest.java | 4 ++-
.../org/apache/sis/storage/FeatureNamingTest.java | 6 ++--
.../org/apache/sis/storage/FeatureQueryTest.java | 6 ++--
.../org/apache/sis/storage/ProbeResultTest.java | 3 +-
.../apache/sis/storage/StorageConnectorTest.java | 4 ++-
.../aggregate/BandAggregateGridResourceTest.java | 4 ++-
.../aggregate/ConcatenatedFeatureSetTest.java | 4 ++-
.../storage/aggregate/CoverageAggregatorTest.java | 4 ++-
.../sis/storage/aggregate/JoinFeatureSetTest.java | 4 ++-
.../org/apache/sis/storage/base/CodeTypeTest.java | 3 +-
.../sis/storage/base/MemoryGridResourceTest.java | 4 ++-
.../sis/storage/base/MetadataBuilderTest.java | 4 ++-
.../sis/storage/base/StoreUtilitiesTest.java | 4 ++-
.../apache/sis/storage/csv/StoreProviderTest.java | 4 ++-
.../test/org/apache/sis/storage/csv/StoreTest.java | 8 +++--
.../sis/storage/esri/AsciiGridStoreTest.java | 4 ++-
.../sis/storage/esri/BILConsistencyTest.java | 4 ++-
.../sis/storage/esri/BIPConsistencyTest.java | 4 ++-
.../sis/storage/esri/BSQConsistencyTest.java | 4 ++-
.../apache/sis/storage/esri/WritableStoreTest.java | 8 +++--
.../sis/storage/event/StoreListenersTest.java | 4 ++-
.../org/apache/sis/storage/folder/StoreTest.java | 4 ++-
.../sis/storage/image/SelfConsistencyTest.java | 4 ++-
.../sis/storage/image/WorldFileStoreTest.java | 4 ++-
.../apache/sis/storage/wkt/StoreProviderTest.java | 4 ++-
.../test/org/apache/sis/storage/wkt/StoreTest.java | 4 ++-
.../sis/storage/xml/MimeTypeDetectorTest.java | 6 ++--
.../apache/sis/storage/xml/StoreProviderTest.java | 4 ++-
.../test/org/apache/sis/storage/xml/StoreTest.java | 4 ++-
.../sis/test/storage/CoverageReadConsistency.java | 6 ++--
.../main/org/apache/sis/measure/DerivedScalar.java | 6 ++--
.../main/org/apache/sis/measure/NumberRange.java | 4 +--
.../main/org/apache/sis/measure/RangeFormat.java | 2 +-
.../main/org/apache/sis/setup/OptionKey.java | 4 +--
.../apache/sis/setup/OptionalInstallations.java | 4 +--
.../sis/util/collection/WeakValueHashMap.java | 2 +-
.../org/apache/sis/util/internal/CodeLists.java | 2 +-
.../apache/sis/util/internal/CollectionsExt.java | 2 +-
.../apache/sis/util/internal/PropertyFormat.java | 2 +-
.../apache/sis/converter/AngleConverterTest.java | 4 ++-
.../apache/sis/converter/ArrayConverterTest.java | 3 +-
.../sis/converter/ConverterRegistryTest.java | 4 ++-
.../sis/converter/FallbackConverterTest.java | 4 ++-
.../apache/sis/converter/NumberConverterTest.java | 4 ++-
.../apache/sis/converter/PathConverterTest.java | 4 ++-
.../apache/sis/converter/StringConverterTest.java | 4 ++-
.../apache/sis/converter/SystemRegistryTest.java | 6 ++--
.../test/org/apache/sis/io/AppenderTestCase.java | 4 ++-
.../test/org/apache/sis/io/LeftMarginTest.java | 4 ++-
.../test/org/apache/sis/io/LineAppenderTest.java | 4 ++-
.../test/org/apache/sis/io/TableAppenderTest.java | 4 ++-
.../org/apache/sis/io/TabulationExpansionTest.java | 4 ++-
.../test/org/apache/sis/io/WordWrapTest.java | 6 ++--
.../sis/io/WordWrapWithLineSeparatorTest.java | 1 +
.../org/apache/sis/math/DecimalFunctionsTest.java | 4 ++-
.../test/org/apache/sis/math/FractionTest.java | 3 +-
.../org/apache/sis/math/FunctionPropertyTest.java | 4 ++-
.../test/org/apache/sis/math/LineTest.java | 4 ++-
.../apache/sis/math/LinearlyDerivedVectorTest.java | 4 ++-
.../org/apache/sis/math/MathFunctionsTest.java | 4 ++-
.../test/org/apache/sis/math/PlaneTest.java | 4 ++-
.../org/apache/sis/math/RepeatedVectorTest.java | 3 +-
.../org/apache/sis/math/StatisticsFormatTest.java | 2 ++
.../test/org/apache/sis/math/StatisticsTest.java | 2 ++
.../test/org/apache/sis/math/VectorTest.java | 4 ++-
.../org/apache/sis/measure/AngleFormatTest.java | 4 ++-
.../test/org/apache/sis/measure/AngleTest.java | 4 ++-
.../apache/sis/measure/ConventionalUnitTest.java | 4 ++-
.../test/org/apache/sis/measure/DateRangeTest.java | 2 ++
.../measure/FormattedCharacterIteratorTest.java | 6 ++--
.../apache/sis/measure/LinearConverterTest.java | 4 ++-
.../apache/sis/measure/MeasurementRangeTest.java | 2 ++
.../org/apache/sis/measure/NumberRangeTest.java | 5 +--
.../test/org/apache/sis/measure/PrefixesTest.java | 6 ++--
.../org/apache/sis/measure/QuantitiesTest.java | 4 ++-
.../org/apache/sis/measure/RangeFormatTest.java | 4 ++-
.../test/org/apache/sis/measure/RangeTest.java | 4 ++-
.../test/org/apache/sis/measure/ScalarTest.java | 4 ++-
.../sis/measure/SexagesimalConverterTest.java | 4 ++-
.../org/apache/sis/measure/SystemUnitTest.java | 4 ++-
.../org/apache/sis/measure/UnitDimensionTest.java | 6 ++--
.../org/apache/sis/measure/UnitFormatTest.java | 4 ++-
.../org/apache/sis/measure/UnitServicesTest.java | 4 ++-
.../test/org/apache/sis/measure/UnitsTest.java | 6 ++--
.../test/org/apache/sis/setup/OptionKeyTest.java | 6 ++--
.../test/org/apache/sis/system/LoggersTest.java | 3 +-
.../sis/system/ReferenceQueueConsumerTest.java | 4 ++-
.../org/apache/sis/test/LogRecordCollector.java | 2 ++
.../test/org/apache/sis/test/TestRunner.java | 4 ++-
.../test/org/apache/sis/test/TestUtilities.java | 2 +-
.../test/org/apache/sis/test/self/AssertTest.java | 1 +
.../apache/sis/test/self/TestUtilitiesTest.java | 1 +
.../org/apache/sis/util/ArgumentChecksTest.java | 3 +-
.../test/org/apache/sis/util/ArraysExtTest.java | 3 +-
.../org/apache/sis/util/CharSequencesTest.java | 6 ++--
.../test/org/apache/sis/util/CharactersTest.java | 5 +--
.../test/org/apache/sis/util/ClassesTest.java | 4 ++-
.../sis/util/DefaultInternationalStringTest.java | 4 ++-
.../test/org/apache/sis/util/ExceptionsTest.java | 4 ++-
.../test/org/apache/sis/util/LocalesTest.java | 4 ++-
.../test/org/apache/sis/util/NumbersTest.java | 6 ++--
.../sis/util/SimpleInternationalStringTest.java | 4 ++-
.../org/apache/sis/util/StringBuildersTest.java | 5 +--
.../test/org/apache/sis/util/UtilitiesTest.java | 4 ++-
.../test/org/apache/sis/util/VersionTest.java | 3 +-
.../org/apache/sis/util/collection/CacheTest.java | 4 ++-
.../sis/util/collection/CodeListSetTest.java | 6 ++--
.../sis/util/collection/DefaultTreeTableTest.java | 4 ++-
.../apache/sis/util/collection/DerivedMapTest.java | 4 ++-
.../apache/sis/util/collection/DerivedSetTest.java | 4 ++-
.../util/collection/FrequencySortedSetTest.java | 4 ++-
.../sis/util/collection/IntegerListTest.java | 4 ++-
.../apache/sis/util/collection/RangeSetTest.java | 8 +++--
.../sis/util/collection/TableColumnTest.java | 4 ++-
.../sis/util/collection/TreeTableFormatTest.java | 6 ++--
.../apache/sis/util/collection/TreeTablesTest.java | 8 +++--
.../sis/util/collection/WeakHashSetTest.java | 4 ++-
.../sis/util/collection/WeakValueHashMapTest.java | 4 ++-
.../apache/sis/util/internal/AbstractMapTest.java | 4 ++-
.../test/org/apache/sis/util/internal/BagTest.java | 4 ++-
.../sis/util/internal/CheckedArrayListTest.java | 4 ++-
.../sis/util/internal/CollectionsExtTest.java | 4 ++-
.../sis/util/internal/DefinitionURITest.java | 3 +-
.../apache/sis/util/internal/DoubleDoubleTest.java | 6 ++--
.../sis/util/internal/ListOfUnknownSizeTest.java | 4 ++-
.../util/internal/LocalizedParseExceptionTest.java | 4 ++-
.../org/apache/sis/util/internal/NumericsTest.java | 6 ++--
.../sis/util/internal/StandardDateFormatTest.java | 6 ++--
.../org/apache/sis/util/internal/StringsTest.java | 4 ++-
.../org/apache/sis/util/internal/X364Test.java | 3 +-
.../sis/util/logging/MonolineFormatterTest.java | 4 ++-
.../sis/util/logging/PerformanceLevelTest.java | 6 ++--
.../util/resources/IndexedResourceBundleTest.java | 6 ++--
.../main/org/apache/sis/cql/CQL.java | 40 +++++++++++-----------
.../org/apache/sis/cql/FilterToCQLVisitor.java | 18 +++++-----
.../test/org/apache/sis/cql/CQLTestCase.java | 4 +--
.../test/org/apache/sis/cql/FilterReadingTest.java | 11 +++---
.../test/org/apache/sis/cql/FilterWritingTest.java | 7 ++--
.../test/org/apache/sis/cql/QueryReadingTest.java | 5 ++-
.../test/org/apache/sis/cql/QueryWritingTest.java | 5 ++-
.../sis/storage/shapefile/InputFeatureStream.java | 12 +++----
.../shapefile/internal/ShapefileByteReader.java | 2 +-
.../sis/storage/shapefile/ShapeFileTest.java | 8 +++--
.../jdbc/AbstractTestBaseForInternalJDBC.java | 10 +++---
.../storage/shapefile/jdbc/DBFConnectionTest.java | 2 ++
.../storage/shapefile/jdbc/DBFResultSetTest.java | 10 +++---
.../storage/shapefile/jdbc/DBFStatementTest.java | 2 ++
.../shapefile/jdbc/sql/WhereClauseTest.java | 10 +++---
.../org/apache/sis/gui/dataset/PathAction.java | 2 +-
.../org/apache/sis/gui/dataset/RootResource.java | 4 +--
.../main/org/apache/sis/gui/map/StatusBar.java | 6 ++--
.../sis/gui/metadata/IdentificationInfo.java | 2 +-
.../sis/gui/coverage/GridSliceSelectorApp.java | 2 +-
.../apache/sis/gui/internal/GUIUtilitiesTest.java | 4 ++-
856 files changed, 2532 insertions(+), 1288 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
index 43e6b6200d,42fff56299..a680b42686
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
@@@ -22,17 -22,17 +22,17 @@@ import jakarta.xml.bind.annotation.XmlT
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.opengis.util.InternationalString;
import org.opengis.metadata.distribution.Format;
import org.opengis.metadata.distribution.DataFile;
++import org.opengis.util.InternationalString;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.util.LegacyNamespaces;
import org.apache.sis.xml.bind.gcx.MimeFileTypeAdapter;
- import org.opengis.util.InternationalString;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.util.GenericName;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.util.LocalName;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
index bc585a9b51,63c515b884..9024dd2da8
---
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
@@@ -35,10 -35,6 +35,10 @@@ import org.apache.sis.xml.bind.lan.PT_L
import org.apache.sis.xml.util.LegacyNamespaces;
import org.apache.sis.metadata.internal.Dependencies;
+// Specific to the main and geoapi-3.1 branches:
- import org.opengis.metadata.identification.CharacterSet;
+import java.util.stream.Collectors;
++import org.opengis.metadata.identification.CharacterSet;
+
/**
* Information required to identify a dataset.
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleMetadata.java
index b150bb462c,7cf9c3840b..541d50768c
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleMetadata.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleMetadata.java
@@@ -29,14 -29,14 +29,14 @@@ import org.opengis.metadata.maintenance
import org.opengis.metadata.spatial.SpatialRepresentationType;
import org.opengis.util.InternationalString;
+// 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 java.util.Map;
- import org.opengis.metadata.MetadataScope;
import java.nio.charset.Charset;
+ import org.opengis.metadata.MetadataScope;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.citation.Responsibility;
-
/**
* An empty implementation of ISO 19115 metadata for dataset (not for
services).
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java
index ee482c1b58,f8dc2d219e..845bc4deee
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java
@@@ -19,14 -19,10 +19,14 @@@ package org.apache.sis.xml.bind.metadat
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.opengis.metadata.Identifier;
+ import org.apache.sis.metadata.TitleProperty;
+ import org.apache.sis.metadata.iso.*;
import org.apache.sis.xml.util.LegacyNamespaces;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.Citation;
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Identifier using {@code <gmd:RS_Identifier>} XML element name.
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java
index be34eabc91,e4a6a7c90d..303e7a4397
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java
@@@ -26,11 -26,13 +26,13 @@@ import org.apache.sis.xml.Namespaces
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
- import org.apache.sis.util.collection.Containers;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
+
+ // Specific to the geoapi-3.1 and geoapi-4.0 branches:
+ import org.apache.sis.util.collection.Containers;
+
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.Identifier;
-
/**
* An implementation of {@link ReferenceSystem} marshalled as specified in
ISO 19115.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index 4608aabbea,b685f8a838..532ce20044
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@@ -59,14 -64,7 +64,11 @@@ import static org.junit.Assert.*
import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
- import static org.apache.sis.metadata.PropertyAccessor.APPEND;
- import static org.apache.sis.metadata.PropertyAccessor.RETURN_NULL;
- import static org.apache.sis.metadata.PropertyAccessor.RETURN_PREVIOUS;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.referencing.ReferenceIdentifier;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.AttributeGroup;
import org.opengis.referencing.ObjectDomain;
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TypeMapTest.java
index 4198f6fbef,dafbebbed9..c69086e8aa
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TypeMapTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TypeMapTest.java
@@@ -32,15 -32,17 +32,17 @@@ import org.opengis.util.InternationalSt
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.extent.AbstractGeographicExtent;
import org.apache.sis.metadata.iso.extent.DefaultGeographicDescription;
+
+ // Test dependencies
+ import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import org.junit.Test;
- import static org.junit.Assert.*;
import static java.util.AbstractMap.SimpleEntry;
+ import static org.junit.Assert.*;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.citation.Responsibility;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/ValueMapTest.java
index 505d210ebb,6f67723957..a2d013b993
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/ValueMapTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/ValueMapTest.java
@@@ -29,16 -32,15 +32,15 @@@ import org.junit.Test
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import org.junit.Test;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static java.util.AbstractMap.SimpleEntry;
import static
org.opengis.metadata.citation.PresentationForm.DOCUMENT_HARDCOPY;
+ import static org.junit.Assert.*;
+ import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
+// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index 212dee6088,9703a12178..b2a0613c1e
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@@ -45,15 -48,11 +48,14 @@@ import org.junit.Test
import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
- import org.junit.Test;
+ import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
- import static org.junit.Assert.*;
+// 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.citation.Party;
import org.opengis.metadata.citation.Responsibility;
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
index cd0a8e86a3,ea817f5804..52b9900bac
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
@@@ -18,15 -18,17 +18,17 @@@ package org.apache.sis.metadata.iso.con
import jakarta.xml.bind.JAXBException;
import org.apache.sis.util.Version;
- import org.apache.sis.test.xml.TestCase;
+
+ // Test dependencies
import org.junit.Test;
+ import org.apache.sis.test.xml.TestCase;
+ import static
org.apache.sis.metadata.internal.ImplementationHelper.ISO_NAMESPACE;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
- import static
org.apache.sis.metadata.internal.ImplementationHelper.ISO_NAMESPACE;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.content.PolarisationOrientation;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.content.PolarizationOrientation;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
index bc8ba8e182,76ad753e30..285fc1c1c1
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
@@@ -33,12 -33,12 +33,12 @@@ import org.apache.sis.util.Deprecable
import org.apache.sis.util.internal.AbstractMap;
import org.apache.sis.referencing.util.CoordinateOperations;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
+
- // Specific to the geoapi-4.0 branch:
+ // Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.Identifier;
-
/**
* An immutable map fetching all properties from the specified identified
object.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
index 35fa97fd2b,e9be6f015f..1bfe49b82e
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
@@@ -33,10 -36,9 +36,9 @@@ import static org.apache.sis.metadata.i
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
- import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.Identifier;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
/**
