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 01f8dc22a908357a77f4999572bacd75f1bb3a9e
Merge: 6affdaa155 80a27652f1
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Sep 28 18:21:13 2023 +0200
Merge branch 'geoapi-3.1'.
.../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/TransformCommand.java | 3 +-
.../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 +-
.../org/apache/sis/filter/AssociationValue.java | 2 +-
.../main/org/apache/sis/filter/PropertyValue.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/pending/geoapi/filter/Name.java | 4 +--
.../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 ++
.../apache/sis/filter/ComparisonFilterTest.java | 1 +
.../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/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 +--
.../apache/sis/metadata/iso/DefaultMetadata.java | 3 +-
.../sis/metadata/iso/citation/DefaultContact.java | 2 +-
.../metadata/iso/citation/DefaultTelephone.java | 8 ++---
.../iso/constraint/DefaultConstraints.java | 2 +-
.../iso/constraint/DefaultReleasability.java | 2 +-
.../sis/metadata/iso/content/DefaultBand.java | 4 +--
.../iso/content/DefaultSampleDimension.java | 2 +-
.../metadata/iso/distribution/DefaultMedium.java | 7 ++--
.../apache/sis/metadata/iso/extent/Extents.java | 2 +-
.../identification/DefaultDataIdentification.java | 3 +-
.../DefaultServiceIdentification.java | 2 +-
.../sis/metadata/iso/maintenance/DefaultScope.java | 2 +-
.../metadata/iso/quality/DefaultDataQuality.java | 2 +-
.../iso/quality/DefaultQuantitativeResult.java | 2 +-
.../apache/sis/metadata/simple/SimpleMetadata.java | 6 ++--
.../sis/pending/geoapi/evolution/Interim.java | 4 +--
.../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/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 +-
.../xml/bind/metadata/geometry/ObjectFactory.java | 2 +-
.../xml/bind/metadata/replace/RS_Identifier.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 | 12 ++++---
.../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 ++-
.../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 +++---
.../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 | 8 +++--
.../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 ++-
.../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 | 6 ++--
.../sis/openoffice/ReferencingFunctionsTest.java | 6 ++--
.../org/apache/sis/openoffice/TransformerTest.java | 6 ++--
.../main/org/apache/sis/style/se1/Symbolizer.java | 2 +-
.../MultiResolutionCoverageLoaderTest.java | 4 ++-
.../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 | 2 +-
.../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 +-
.../sis/referencing/AbstractReferenceSystem.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/AbstractDatum.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 +-
.../apache/sis/referencing/internal/Legacy.java | 7 ++--
.../sis/referencing/internal/ReferencingTypes.java | 2 +-
.../referencing/internal/ServicesForMetadata.java | 6 ++--
.../operation/DefaultPassThroughOperation.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 ++-
.../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 | 10 +++---
.../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/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 | 4 ++-
.../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 | 6 ++--
.../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/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 | 4 +--
.../operation/transform/MathTransformsTest.java | 4 ++-
.../transform/MolodenskyTransformTest.java | 8 ++---
.../transform/OperationMethodSetTest.java | 4 ++-
.../transform/PassThroughTransformTest.java | 2 ++
.../operation/transform/PolarToCartesianTest.java | 7 ++--
.../operation/transform/PoleRotationTest.java | 4 ++-
.../transform/ProjectiveTransformTest.java | 11 ++++---
.../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 ++-
.../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 | 8 +++--
.../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 | 4 ++-
.../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 ++-
.../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/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/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 | 10 +++---
.../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/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 +-
.../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 ++-
.../test/org/apache/sis/test/ContentVerifier.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 ++--
.../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 ++-
832 files changed, 2422 insertions(+), 1176 deletions(-)
diff --cc
endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
index 1797f1ede6,122bd10076..1796b2c12f
---
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
@@@ -76,10 -76,8 +76,9 @@@ import org.apache.sis.util.logging.Logg
import static java.util.logging.Logger.getLogger;
- import org.apache.sis.referencing.DefaultObjectDomain;
-
-// 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.feature/main/org/apache/sis/filter/AssociationValue.java
index 5a5324ac93,8533a49e91..88f87cab79
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/AssociationValue.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/AssociationValue.java
@@@ -27,14 -27,14 +27,14 @@@ import org.apache.sis.feature.builder.F
import org.apache.sis.feature.builder.PropertyTypeBuilder;
import org.apache.sis.math.FunctionProperty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.PropertyNotFoundException;
-import org.opengis.filter.Expression;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
++import org.opengis.util.ScopedName;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.DefaultAssociationRole;
+import org.apache.sis.feature.DefaultFeatureType;
- import org.opengis.util.ScopedName;
+import org.apache.sis.pending.geoapi.filter.Name;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java
index 69b18c76e7,ff8a1699ec..4f74ff605f
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java
@@@ -29,15 -29,15 +29,15 @@@ import org.apache.sis.feature.builder.A
import org.apache.sis.filter.internal.XPath;
import org.apache.sis.util.resources.Errors;
-// 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.feature.PropertyNotFoundException;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
++import org.opengis.util.ScopedName;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.AbstractOperation;
+import org.apache.sis.feature.DefaultAttributeType;
+import org.apache.sis.feature.DefaultFeatureType;
- import org.opengis.util.ScopedName;
+import org.apache.sis.pending.geoapi.filter.Name;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
index 0c438571af,e518c0befe..9e010b3967
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
@@@ -59,10 -40,29 +40,29 @@@ import org.locationtech.jts.geom.Polygo
import org.locationtech.jts.io.WKTWriter;
import org.locationtech.jts.simplify.DouglasPeuckerSimplifier;
import org.locationtech.jts.simplify.TopologyPreservingSimplifier;
+ import org.opengis.util.FactoryException;
+ import org.opengis.geometry.DirectPosition;
+ import org.opengis.referencing.crs.CoordinateReferenceSystem;
+ import org.opengis.referencing.operation.CoordinateOperation;
+ import org.opengis.referencing.operation.TransformException;
+ import org.apache.sis.referencing.util.ReferencingUtilities;
+ import org.apache.sis.geometry.DirectPosition2D;
+ import org.apache.sis.geometry.GeneralDirectPosition;
+ import org.apache.sis.geometry.GeneralEnvelope;
+ import org.apache.sis.geometry.wrapper.Geometries;
+ import org.apache.sis.geometry.wrapper.GeometryType;
+ import org.apache.sis.geometry.wrapper.GeometryWrapper;
+ import org.apache.sis.util.collection.BackingStoreException;
+ import org.apache.sis.util.UnconvertibleObjectException;
+ import org.apache.sis.util.ArgumentChecks;
+ import org.apache.sis.util.ArraysExt;
+ import org.apache.sis.util.Debug;
+ import org.apache.sis.util.resources.Errors;
+ import org.apache.sis.filter.sqlmm.SQLMM;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.SpatialOperatorName;
-import org.opengis.filter.DistanceOperatorName;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.filter.SpatialOperatorName;
+import org.apache.sis.pending.geoapi.filter.DistanceOperatorName;
/**
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/pending/geoapi/filter/Name.java
index 038fe86a1c,0000000000..530f611a41
mode 100644,000000..100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/pending/geoapi/filter/Name.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/pending/geoapi/filter/Name.java
@@@ -1,42 -1,0 +1,42 @@@
+/*
+ * 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.filter;
+
+// Specific to the main branch:
- import org.apache.sis.filter.internal.FunctionNames;
- import org.apache.sis.util.iso.Names;
+import org.opengis.util.LocalName;
+import org.opengis.util.ScopedName;
++import org.apache.sis.filter.internal.FunctionNames;
++import org.apache.sis.util.iso.Names;
+
+
+/**
+ * Placeholder for GeoAPI 3.1 interfaces (not yet released).
+ * Shall not be visible in public API, as it will be deleted after next
GeoAPI release.
+ */
+@SuppressWarnings("doclint:missing")
+public final class Name {
+ static final LocalName STANDARD = Names.createLocalName(null, null,
"fes");
+
+ static final LocalName EXTENSION = Names.createLocalName(null, null,
"extension");
+
+ public static final ScopedName LITERAL = Names.createScopedName(STANDARD,
null, FunctionNames.Literal);
+
+ public static final ScopedName VALUE_REFERENCE =
Names.createScopedName(STANDARD, null, FunctionNames.ValueReference);
+
+ private Name() {
+ }
+}
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
index 6b3a22ff45,6a81570de2..e803ff2853
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
@@@ -59,10 -62,9 +62,9 @@@ import static org.opengis.test.Assert.a
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
import static org.apache.sis.feature.Assertions.assertValuesEqual;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
- import static org.opengis.referencing.datum.PixelInCell.CELL_CENTER;
-// 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.feature/test/org/apache/sis/feature/CharacteristicTypeMapTest.java
index fc62008ca4,1caeb6713d..b15174039d
---
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
@@@ -18,16 -18,20 +18,17 @@@ package org.apache.sis.feature
import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
+ import org.apache.sis.util.iso.Names;
+
+ // 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.apache.sis.feature.DefaultAssociationRole.NAME_KEY;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
- import static org.apache.sis.feature.DefaultAssociationRole.NAME_KEY;
-
- import org.apache.sis.util.iso.Names;
-// 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/DefaultAssociationRoleTest.java
index e284de0557,a77d2a62fb..6718913d8e
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/DefaultAssociationRoleTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/DefaultAssociationRoleTest.java
@@@ -23,13 -26,16 +26,12 @@@ 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.apache.sis.feature.DefaultAssociationRole.NAME_KEY;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
- import static org.apache.sis.feature.DefaultAssociationRole.NAME_KEY;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.FeatureType;
-
/**
* Tests {@link DefaultAssociationRole}.
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java
index db56bc5d68,f1cdbfb6c8..30ea4a549d
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java
@@@ -18,12 -18,23 +18,14 @@@ package org.apache.sis.filter
import java.util.Date;
import java.io.Serializable;
+
+ // Test dependencies
import org.apache.sis.test.TestUtilities;
-// 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.temporal.Period;
-import org.opengis.temporal.Duration;
-import org.opengis.temporal.RelativePosition;
-import org.opengis.temporal.TemporalPosition;
-import org.opengis.temporal.TemporalPrimitive;
-import org.opengis.temporal.TemporalGeometricPrimitive;
-
-// Specific to the geoapi-3.1 branch:
-import org.opengis.referencing.ReferenceIdentifier;
+// 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.temporal.Period;
/**
diff --cc
endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
index f0b4064b31,03b81a9b2d..d75fac0e4f
---
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
@@@ -24,11 -27,13 +27,10 @@@ import static org.apache.sis.util.inter
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
- 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.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.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
index 9d4b328cce,a80caf3d7d..a0d0a8e9d0
---
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,17 -86,9 +86,16 @@@ 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;
-
/**
* Root entity which defines metadata about a resource or resources.
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
index 9973d73237,6979a0ee6d..9a08838f97
---
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,13 @@@ 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.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
+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;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
index 6bfa8b4fb5,ac9ec050f4..22a4598909
---
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,16 -32,9 +32,16 @@@ 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 static org.opengis.annotation.Obligation.OPTIONAL;
- import static org.opengis.annotation.Obligation.MANDATORY;
- import static org.opengis.annotation.Specification.ISO_19115;
-
+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;
+
/**
* Telephone numbers for contacting the responsible individual or
organization.
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
index d9efebe779,633477ebdc..86d0f610a3
---
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,15 @@@ 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.apache.sis.metadata.iso.citation.DefaultResponsibility;
+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;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
index a716e9462e,0575585a7c..5e7199b114
---
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,12 @@@ 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.apache.sis.metadata.iso.citation.DefaultResponsibility;
+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;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
index 1ce8b0713b,f2c24e3074..ae544ba1a3
---
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
@@@ -42,16 -42,12 +42,15 @@@ import static org.apache.sis.metadata.i
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.distribution.MediumName;
- import org.apache.sis.metadata.iso.citation.DefaultCitation;
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 static
org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
-
+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/identification/DefaultDataIdentification.java
index 82b1c4b0a0,9024dd2da8..8f7c00e2b0
---
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,14 -39,6 +39,13 @@@ 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/DefaultServiceIdentification.java
index dec49cb658,327b908c8e..a8768ef6d1
---
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,16 @@@ 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.apache.sis.xml.bind.metadata.code.SV_CouplingType;
+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;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScope.java
index 978c0af0d2,a58349d970..d9a5ad34a8
---
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,15 -26,8 +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 org.apache.sis.metadata.internal.Dependencies;
+import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
+import org.apache.sis.util.internal.CollectionsExt;
- 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/quality/DefaultDataQuality.java
index 247e393a3f,15d63d2be2..b141dc2415
---
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,12 @@@ 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.apache.sis.metadata.iso.ISOMetadata;
+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;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleMetadata.java
index ca3796b809,541d50768c..af72933f08
---
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
@@@ -32,22 -32,10 +32,22 @@@ import org.opengis.util.InternationalSt
// 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 java.nio.charset.Charset;
-import org.opengis.metadata.MetadataScope;
+// Specific to the main branch:
+import java.util.Date;
+import org.opengis.metadata.ApplicationSchemaInformation;
+import org.opengis.metadata.Identifier;
+import org.opengis.metadata.MetadataExtensionInformation;
+import org.opengis.metadata.PortrayalCatalogueReference;
- import org.opengis.metadata.acquisition.AcquisitionInformation;
+import org.opengis.metadata.citation.Series;
++import org.opengis.metadata.maintenance.MaintenanceInformation;
++import org.opengis.metadata.spatial.SpatialRepresentation;
++import org.opengis.metadata.acquisition.AcquisitionInformation;
+import org.opengis.metadata.constraint.Constraints;
+import org.opengis.metadata.content.ContentInformation;
+import org.opengis.metadata.distribution.Distribution;
+import org.opengis.metadata.distribution.Format;
- import org.opengis.metadata.maintenance.MaintenanceInformation;
+import org.opengis.metadata.quality.DataQuality;
- import org.opengis.metadata.spatial.SpatialRepresentation;
+import org.opengis.referencing.ReferenceSystem;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/geoapi/evolution/Interim.java
index adc692c1b0,0000000000..53b6102495
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,70 @@@
+/*
+ * 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 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 org.opengis.geometry.Envelope;
- import org.opengis.geometry.Geometry;
+
+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/xml/bind/gml/TimePeriodBound.java
index 2504978f6c,c6f62eabd8..d9acce9547
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java
@@@ -20,10 -21,9 +21,9 @@@ import jakarta.xml.bind.annotation.XmlV
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlTransient;
- import javax.xml.datatype.XMLGregorianCalendar;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.temporal.Instant;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.temporal.Instant;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/CI_TelephoneTypeCode.java
index 5ab147d92d,51573e82fe..e4bd6b554e
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/CI_TelephoneTypeCode.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/CI_TelephoneTypeCode.java
@@@ -20,9 -20,9 +20,9 @@@ import jakarta.xml.bind.annotation.XmlE
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.bind.cat.CodeListUID;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.TelephoneType;
-import org.apache.sis.xml.bind.cat.CodeListAdapter;
+// Specific to the main branch:
- import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeListAdapter;
+import org.apache.sis.xml.bind.FilterByVersion;
++import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeListAdapter;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index a2558ef313,532ce20044..951b8765a9
---
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
@@@ -62,16 -67,12 +67,13 @@@ import static org.apache.sis.test.TestU
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.citation.ResponsibleParty;
- import org.opengis.referencing.ReferenceSystem;
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;
-import org.opengis.temporal.Duration;
+// Specific to the main branch:
++import org.opengis.referencing.ReferenceSystem;
+import org.apache.sis.metadata.iso.content.DefaultAttributeGroup;
+import org.apache.sis.metadata.iso.identification.AbstractIdentification;
+import org.apache.sis.metadata.iso.identification.DefaultAssociatedResource;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
index 23d60ed67b,41cd476bfd..0e8c17ff36
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@@ -31,8 -34,10 +34,7 @@@ import org.junit.Test
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.AnnotationConsistencyCheck;
- import org.junit.Test;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
-
/**
* Base class for tests done on metadata objects using reflection. This base
class tests JAXB annotations
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/AllMetadataTest.java
index e4e43c3236,4b93a21c8e..0e969cd434
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/AllMetadataTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/AllMetadataTest.java
@@@ -21,13 -21,16 +21,15 @@@ import org.opengis.annotation.UML
import org.apache.sis.xml.bind.Context;
import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.metadata.PropertyConsistencyCheck;
- import org.apache.sis.test.LoggingWatcher;
- import org.apache.sis.test.DependsOn;
+
+ // Test dependencies
import org.junit.Rule;
import org.junit.Test;
+ import org.apache.sis.test.LoggingWatcher;
+ import org.apache.sis.test.DependsOn;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.annotation.Stereotype;
-import org.opengis.util.ControlledVocabulary;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
index 3580f2b451,738c2b2e9a..9ab49f7208
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
@@@ -38,12 -41,8 +41,11 @@@ 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.metadata.Assertions.assertTitleEquals;
- import static org.apache.sis.metadata.iso.citation.Citations.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Tests {@link Citations}.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
index 2409dd2b23,e852484eb3..18232eb7c4
---
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
@@@ -23,14 -23,17 +23,16 @@@ import org.opengis.metadata.citation.Ci
import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.metadata.simple.CitationConstant;
import org.apache.sis.metadata.iso.citation.Citations;
- import org.apache.sis.test.sql.TestDatabase;
+
+ // Test dependencies
import org.junit.Test;
+ import org.apache.sis.test.sql.TestDatabase;
- import static org.junit.Assert.*;
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/test/xml/AnnotationConsistencyCheck.java
index b9a5efbd44,4a074ac64e..a6c013d46a
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
@@@ -41,9 -45,12 +45,7 @@@ import org.junit.Test
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
- import org.junit.Test;
- import junit.framework.AssertionFailedError;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.annotation.Classifier;
-import org.opengis.annotation.Stereotype;
-import org.opengis.util.ControlledVocabulary;
-
/**
* Verifies consistency between {@link UML}, {@link XmlElement} and other
annotations.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
index df7b09dbf4,77a0e27b18..207a05e92a
---
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
@@@ -32,11 -35,9 +35,10 @@@ import static org.apache.sis.metadata.i
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
- import static
org.apache.sis.metadata.internal.ImplementationHelper.ISO_NAMESPACE;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
- import org.apache.sis.metadata.iso.DefaultIdentifier;
+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/bind/lan/LanguageCodeTest.java
index a08f10c1d5,8e3bac8a6d..9bfe7577ec
---
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
@@@ -34,11 -33,17 +33,14 @@@ import org.apache.sis.xml.util.LegacyNa
import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
+ import org.apache.sis.test.DependsOnMethod;
+ import org.apache.sis.test.mock.MetadataMock;
+ import org.apache.sis.test.xml.TestCase;
+ import static org.apache.sis.util.internal.StandardDateFormat.UTC;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
- import static org.apache.sis.util.internal.StandardDateFormat.UTC;
-// 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.portrayal/test/org/apache/sis/style/se1/RuleTest.java
index fec2bd1d64,3df94be9d9..f66e4f75c2
---
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
@@@ -17,13 -17,15 +17,15 @@@
package org.apache.sis.style.se1;
import java.util.List;
- import org.junit.Test;
import org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
+ // 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.referencing/main/org/apache/sis/referencing/AbstractReferenceSystem.java
index 26bcf03908,3c35b0cf24..89dc56ceb7
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractReferenceSystem.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractReferenceSystem.java
@@@ -22,10 -22,8 +22,10 @@@ import org.opengis.util.GenericName
import org.opengis.util.InternationalString;
import org.opengis.referencing.ReferenceSystem;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
- import org.apache.sis.referencing.internal.Legacy;
+import org.opengis.referencing.ReferenceIdentifier;
+import org.opengis.metadata.extent.Extent;
++import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
index 8fa5db6599,285fc1c1c1..77438f4f2e
---
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
@@@ -35,7 -35,9 +35,9 @@@ import org.apache.sis.referencing.util.
// 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.opengis.referencing.ObjectDomain;
++// Specific to the main branch:
+import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
index 9ceaa44165,42ca05dd72..8e849e0a6f
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
@@@ -43,10 -43,8 +43,10 @@@ import org.apache.sis.io.wkt.Formatter
import static org.apache.sis.util.Utilities.deepEquals;
import static org.apache.sis.util.collection.Containers.property;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
- import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.ReferenceIdentifier;
++import org.opengis.metadata.extent.Extent;
+import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
index f941993f1d,23b81df4f1..521ff15eb3
---
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,20 -28,8 +28,21 @@@ 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.ReferenceSystem;
- import org.opengis.referencing.IdentifiedObject;
+import org.opengis.referencing.operation.CoordinateOperation;
+import org.apache.sis.referencing.DefaultObjectDomain;
+import org.apache.sis.referencing.AbstractIdentifiedObject;
- import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
+
/**
* 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 062c232646,c3d0b1b816..1951cef3b6
---
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
@@@ -71,26 -71,8 +71,26 @@@ import org.apache.sis.util.logging.Logg
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.datum.Datum;
- import org.opengis.referencing.datum.DatumFactory;
+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;
- import org.apache.sis.util.Deprecable;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
index 10e3fe02c6,40dd40f84f..d523ce2357
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
@@@ -29,11 -32,7 +32,10 @@@ import static org.junit.Assert.*
import static org.opengis.test.Validators.validate;
import static org.apache.sis.referencing.Assertions.assertContains;
import static org.apache.sis.referencing.Assertions.assertDisjoint;
- import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
+
/**
* Tests the methods defined in the {@link AbstractEnvelope} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralEnvelopeTest.java
index aad298baab,8ce71e63a1..df9746abae
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralEnvelopeTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralEnvelopeTest.java
@@@ -33,12 -37,7 +37,10 @@@ import static org.junit.Assert.*
import static org.opengis.test.Validators.validate;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
- import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
- import static
org.apache.sis.referencing.crs.HardCodedCRS.WGS84_LATITUDE_FIRST;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
+
/**
* Tests the {@link GeneralEnvelope} class. The {@link Envelope2D} class will
also be tested as a
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
index 4f8d8ffc71,def422530c..3f0d4fc4d5
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
@@@ -32,8 -35,10 +35,7 @@@ import static org.junit.Assert.*
import static org.opengis.test.Validators.validate;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
- import static org.opengis.referencing.IdentifiedObject.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.parameter.ParameterDirection;
-
/**
* Tests the {@link DefaultParameterDescriptorGroup} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorParametersTest.java
index 6c26253b03,3af8866433..18f5ca04ff
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorParametersTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorParametersTest.java
@@@ -33,9 -37,10 +37,7 @@@ import static org.junit.Assert.*
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static
org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals;
import static org.apache.sis.referencing.Assertions.assertAliasTipEquals;
- import static org.apache.sis.util.internal.Constants.NUM_ROW;
- import static org.apache.sis.util.internal.Constants.NUM_COL;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Validators.validate;
-
/**
* Tests the {@link TensorParameters} class.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
index 0da72e1ac4,20151ca72f..f3969436c7
---
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
@@@ -49,8 -52,12 +52,7 @@@ import static org.apache.sis.metadata.i
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertBetween;
import static org.opengis.test.Assert.assertInstanceOf;
- import static
org.apache.sis.metadata.internal.ReferencingServices.AUTHALIC_RADIUS;
-// 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/datum/DefaultGeodeticDatumTest.java
index f9c2006b2d,d1d85c7347..ef55462738
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
@@@ -44,10 -47,9 +47,9 @@@ import static org.opengis.test.Assert.a
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
- import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
-// 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/DefaultTemporalDatumTest.java
index 6d792d3e98,f7e1d0167c..a35846f797
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
@@@ -30,10 -33,9 +33,9 @@@ import static org.apache.sis.util.inter
import static org.junit.Assert.*;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
- import static
org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
-// 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/datum/GeodeticDatumMock.java
index 14734daccb,c59d3cf3a5..2bde2d04c5
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/GeodeticDatumMock.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/GeodeticDatumMock.java
@@@ -24,12 -24,9 +24,14 @@@ import org.opengis.referencing.datum.Pr
import org.apache.sis.metadata.internal.ReferencingServices;
import org.apache.sis.measure.Units;
+ // Test dependencies
+ import org.apache.sis.test.mock.IdentifiedObjectMock;
+
+// Specific to the main branch:
+import java.util.Date;
+import org.opengis.util.InternationalString;
+import org.opengis.metadata.extent.Extent;
+
/**
* A dummy implementation of {@link GeodeticDatum}, which is also its own
ellipsoid.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
index 07495d0724,766172c7f9..6fd43244ad
---
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
@@@ -24,14 -27,13 +27,13 @@@ 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.apache.sis.referencing.util.Formulas.JULIAN_YEAR_LENGTH;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
- import static org.apache.sis.referencing.util.Formulas.JULIAN_YEAR_LENGTH;
-// 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/SingleOperationMarshallingTest.java
index 14acd4e010,7248960024..81f59d9d1a
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
@@@ -44,17 -47,16 +47,16 @@@ import org.apache.sis.xml.bind.referenc
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
- import org.junit.Test;
import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
- import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertIdentifierEquals;
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals;
+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 34ab5b0d9a,0c27f93be1..cf39070876
---
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,15 -16,16 +16,16 @@@
*/
package org.apache.sis.referencing.operation.matrix;
- import org.apache.sis.test.DependsOn;
+ // Test dependencies
import org.junit.Test;
+ import org.apache.sis.test.DependsOn;
import static java.lang.Double.NaN;
- import static org.junit.Assert.*;
import static org.apache.sis.referencing.operation.matrix.Matrix4.SIZE;
+ 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 cab02f96df,42455be2a5..b14d6a5614
---
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 -25,14 +25,11 @@@ import org.junit.Test
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestUtilities;
- import org.junit.Test;
+ 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/TransverseMercatorTest.java
index a4230ddba5,6b5c167d78..4afed7fdbf
---
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
@@@ -34,9 -36,12 +36,9 @@@ 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.test.Assertions.assertSerializedEquals;
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/MapProjectionTest.java
index b92dff131e,3a9c567ba8..36c22ba006
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java
@@@ -28,10 -31,9 +31,9 @@@ import static org.apache.sis.util.inter
import static org.junit.Assert.*;
import static org.apache.sis.referencing.Assertions.assertOgcIdentifierEquals;
import static
org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals;
- import static org.apache.sis.util.internal.Constants.*;
-// 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/provider/NTv2Test.java
index 243c5f1852,dd1f4ba933..a660b56c29
---
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,10 -43,9 +43,9 @@@ import static org.apache.sis.referencin
import static org.junit.Assume.assumeTrue;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
- import static
org.apache.sis.referencing.operation.provider.DatumShiftGridLoader.DEGREES_TO_SECONDS;
-// 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/AbridgedMolodenskyTransformTest.java
index c383afdb20,55b1eda1a0..41b9ba5083
---
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
@@@ -28,8 -31,10 +31,7 @@@ import static java.lang.StrictMath.toRa
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
- import static java.lang.StrictMath.toRadians;
-// 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/CartesianToPolarTest.java
index c967752151,229e640ab5..a725a2500e
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
@@@ -21,8 -24,10 +24,7 @@@ import org.junit.Test
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
- import org.junit.Test;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
-
/**
* Tests {@link CartesianToPolar}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
index ee73a9bb55,4e81675633..e5466a8aff
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
@@@ -21,8 -24,10 +24,7 @@@ import org.junit.Test
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
- import org.junit.Test;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.TransformTestCase;
-
/**
* Tests {@link CartesianToSpherical}.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
index e296acd158,37009ce42c..08a95fef71
---
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
@@@ -20,12 -20,16 +20,13 @@@ import org.opengis.util.FactoryExceptio
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.MathTransformFactory;
- import static java.lang.StrictMath.*;
-
+ // Test dependencies
+ import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
- import org.junit.Test;
+
+ 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 59c9f0e422,41a297649d..eef1180e70
---
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
@@@ -32,18 -32,19 +32,19 @@@ import org.apache.sis.referencing.opera
import org.apache.sis.util.internal.DoubleDouble;
import org.apache.sis.parameter.Parameterized;
import org.apache.sis.math.Fraction;
- import org.opengis.test.Validators;
- import org.apache.sis.test.DependsOn;
+
+ // Test dependencies
import org.junit.After;
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 org.opengis.test.Assert;
-import org.opengis.test.referencing.AffineTransformTest;
+// Specific to the main branch:
+import org.junit.Ignore;
++import org.opengis.test.referencing.TransformTestCase;
- import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
-import static org.junit.Assert.*;
-import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.*;
-
- import org.opengis.test.referencing.TransformTestCase;
++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 55c4cf0d21,ee9c40754b..cf5970e35d
---
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
@@@ -20,12 -20,16 +20,13 @@@ import org.opengis.util.FactoryExceptio
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.MathTransformFactory;
- import static java.lang.StrictMath.*;
-
+ // Test dependencies
+ import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
- import org.junit.Test;
+
+ 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.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
index fbe424244d,65ce834a68..75381d39cc
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
@@@ -47,8 -48,10 +48,7 @@@ import org.apache.sis.util.collection.T
import org.apache.sis.util.internal.StandardDateFormat;
import org.apache.sis.util.iso.DefaultNameFactory;
import org.apache.sis.referencing.util.ReferencingFactoryContainer;
- import ucar.nc2.constants.CF; // String constants are copied by the
compiler with no UCAR reference left.
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.NameFactory;
-
/**
* The API used internally by Apache SIS for fetching variables and attribute
values from a netCDF file.
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
index f0779b20c3,4d785e3c7e..e877db3bdd
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
@@@ -49,12 -50,11 +50,11 @@@ import org.apache.sis.util.Characters
import org.apache.sis.util.internal.Strings;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.math.Vector;
- import ucar.nc2.constants.CF; // String constants are copied by the
compiler with no UCAR reference left.
-// 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.Attribute;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.AbstractAttribute;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
index fa7b0011c6,d22ee334c8..328bb362fb
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
@@@ -74,10 -75,9 +75,9 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.io.wkt.WKTFormat;
import org.apache.sis.io.wkt.Warnings;
import org.apache.sis.measure.Units;
- import ucar.nc2.constants.CF; // String constants are copied by the
compiler with no UCAR reference left.
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.operation.CoordinateOperationFactory;
+// Specific to the main branch:
+import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/FeaturesWrapper.java
index 8d13ce8789,e0364c7bba..1e992bfb81
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/FeaturesWrapper.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/FeaturesWrapper.java
@@@ -21,11 -22,10 +22,10 @@@ import org.apache.sis.setup.GeometryLib
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.netcdf.base.DiscreteSampling;
import org.apache.sis.storage.event.StoreListeners;
- import ucar.nc2.ft.DsgFeatureCollection;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/DecoderTest.java
index 517c4fe737,372d07b8e0..82fff6037d
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/DecoderTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/DecoderTest.java
@@@ -19,12 -19,17 +19,14 @@@ package org.apache.sis.storage.netcdf.b
import java.util.Date;
import java.io.IOException;
import org.apache.sis.storage.DataStoreException;
+
+ // Test dependencies
import org.junit.Test;
+ import static org.apache.sis.storage.netcdf.AttributeNames.*;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
- import static org.apache.sis.storage.netcdf.AttributeNames.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
-
/**
* Tests the {@link Decoder} implementation. The default implementation tests
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/classic/ChannelDecoderTest.java
index 0dfef86cdd,8d09b02148..c49616d778
---
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
@@@ -25,10 -25,12 +25,12 @@@ import org.apache.sis.storage.netcdf.ba
import org.apache.sis.storage.netcdf.base.DecoderTest;
import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.setup.GeometryLibrary;
+
+ // Test dependencies
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 98a06421d4,2958d4dc0f..36758b42bc
---
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
@@@ -22,10 -22,12 +22,12 @@@ import org.apache.sis.storage.netcdf.ba
import org.apache.sis.storage.netcdf.base.Grid;
import org.apache.sis.storage.netcdf.base.GridTest;
import org.apache.sis.util.ArraysExt;
+
+ // Test dependencies
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 1568bf793a,2fbcb65c0c..6c200f54a7
---
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
@@@ -20,10 -20,12 +20,12 @@@ 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.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.xml/test/org/apache/sis/storage/gpx/ReaderTest.java
index ef25e52003,b4613f5da4..3ee7532383
---
a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/ReaderTest.java
+++
b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/ReaderTest.java
@@@ -41,9 -43,9 +43,9 @@@ import static org.junit.Assert.*
import static org.apache.sis.test.TestUtilities.date;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.FeatureTypeInfo;
-import org.opengis.feature.Feature;
+// Specific to the main branch:
- import org.apache.sis.feature.AbstractFeature;
+import org.opengis.util.GenericName;
++import org.apache.sis.feature.AbstractFeature;
/**
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java
index fa9bcbc9a5,e73d3b2961..2c90430ef6
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java
@@@ -51,12 -52,10 +52,11 @@@ import org.apache.sis.geometry.GeneralE
import org.apache.sis.metadata.internal.Identifiers;
import org.apache.sis.system.Configuration;
import org.apache.sis.system.Modules;
- import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Errors;
-// 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;
+import org.apache.sis.metadata.iso.identification.AbstractIdentification;
/**
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/GeographicEnvelope.java
index 6233b2cc97,af5b2450ce..f82b89559a
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/GeographicEnvelope.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/GeographicEnvelope.java
@@@ -22,15 -22,10 +22,15 @@@ import jakarta.xml.bind.annotation.XmlT
import org.opengis.metadata.extent.Extent;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.metadata.extent.GeographicExtent;
- import org.apache.sis.referencing.CommonCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+ import org.apache.sis.geometry.AbstractEnvelope;
+ import org.apache.sis.referencing.CommonCRS;
+// Specific to the main branch:
+import org.opengis.metadata.extent.TemporalExtent;
+import org.opengis.metadata.extent.VerticalExtent;
+import org.opengis.util.InternationalString;
+
/**
* Base class of geographic bounding boxes to expose also as an envelope and
an ISO 19115 extent.
diff --cc
endorsed/src/org.apache.sis.util/test/org/apache/sis/test/ContentVerifier.java
index c25d096090,98197fdbcb..db131c29b8
---
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,29 -14,39 +14,29 @@@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.style.se1;
+package org.apache.sis.test;
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+// Specific to the main branch:
- import static org.junit.Assume.assumeTrue;
-
+import org.opengis.metadata.Metadata;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Expression;
++import static org.junit.Assume.assumeTrue;
+
/**
- * Adapter for expression in style.
- * This is a place-holder for future work.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.5
- *
- * @param <R> the type of data to style, such as {@code Feature} or {@code
Coverage}.
- *
- * @since 1.5
+ * Place-holder for a GeoAPI 3.1 class. Used only for allowing the code to
compile.
+ * For real test execution, see the development branches on GeoAPI
4.0-SNAPSHOT.
*/
-final class ExpressionAdapter<R> extends XmlAdapter<String, Expression<R,?>> {
- /**
- * Creates an adapter.
- */
- public ExpressionAdapter() {
+@SuppressWarnings("doclint:missing")
+public class ContentVerifier {
+ public void addPropertyToIgnore(Class<?> type, String property) {
+ assumeTrue("This test requires GeoAPI 3.1.", false);
}
- @Override
- public String marshal(Expression<R,?> value) {
- return null;
+ public void addMetadataToVerify(Metadata actual) {
+ assumeTrue("This test requires GeoAPI 3.1.", false);
}
- @Override
- public Expression<R,?> unmarshal(String value) {
- return null;
+ public void assertMetadataEquals(final String path, final Object value,
final Object... others) {
+ assumeTrue("This test requires GeoAPI 3.1.", false);
}
}
diff --cc
incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader.java
index 7431739df0,d42a7629f2..697e48740b
---
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader.java
+++
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/internal/ShapefileByteReader.java
@@@ -29,10 -30,9 +30,9 @@@ import org.apache.sis.feature.DefaultFe
import org.apache.sis.storage.shapefile.InvalidShapefileFormatException;
import org.apache.sis.storage.shapefile.ShapeTypeEnum;
import org.apache.sis.storage.shapefile.jdbc.*;
- import com.esri.core.geometry.*;
-// 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
incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapeFileTest.java
index f2f558968d,b2880fb405..ecb88809cf
---
a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapeFileTest.java
+++
b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapeFileTest.java
@@@ -27,9 -26,11 +26,12 @@@ import org.apache.sis.storage.DataStore
import org.junit.Ignore;
import org.junit.Test;
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertNotNull;
+
-// 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;
+import org.apache.sis.feature.AbstractAttribute;
/**
