You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/12/28 16:07:53 UTC

[sis] branch geoapi-4.0 updated (6b2e63471f -> 7b8f3d62bf)

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git


    from 6b2e63471f     Upgrade JSR-363 dependency to JSR-385.     This is the dependency that defines unit of measurements in the `javax.measure` package.
     new 21add5df50 Set the build requirement to Java 18, but the compilation target stay Java 11. The intent is to replace our custom @preformat javadoc tag by the @snippet tag, which is new in Java 18.
     new 94c8141b4e First round of remplacement of `@preformat` tag by `@snippet`. Apply on Java, SQL, XML, WKT and shell snippets.
     new a4b64aae05 Second round of remplacement of `@preformat` tag by `@snippet`. Replace raw text by `<pre>` blocks.
     new 161f818170 Removal of all `@module` tag, to be replaced by Jigsaw modularization.
     new ed3307ddde Remove `strictfp` keyword in test classes. It has no effect since tests are executed with Java 18, which ignores this keyword.
     new 7b8f3d62bf Final cleanup for https://issues.apache.org/jira/browse/SIS-565

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README                                             |   4 +-
 .../java/org/apache/sis/console/AboutCommand.java  |   1 -
 .../java/org/apache/sis/console/CRSCommand.java    |   1 -
 .../main/java/org/apache/sis/console/Command.java  |   1 -
 .../java/org/apache/sis/console/CommandRunner.java |   1 -
 .../apache/sis/console/FormattedOutputCommand.java |   1 -
 .../java/org/apache/sis/console/HelpCommand.java   |   1 -
 .../org/apache/sis/console/IdentifierCommand.java  |   1 -
 .../sis/console/InvalidCommandException.java       |   1 -
 .../apache/sis/console/InvalidOptionException.java |   1 -
 .../org/apache/sis/console/MetadataCommand.java    |   1 -
 .../org/apache/sis/console/MimeTypeCommand.java    |   5 +-
 .../main/java/org/apache/sis/console/Option.java   |   1 -
 .../java/org/apache/sis/console/OutputFormat.java  |   1 -
 .../apache/sis/console/ResourcesDownloader.java    |   1 -
 .../org/apache/sis/console/TransformCommand.java   |   1 -
 .../java/org/apache/sis/console/package-info.java  |   9 +-
 .../org/apache/sis/console/AboutCommandTest.java   |   3 +-
 .../org/apache/sis/console/CRSCommandTest.java     |   3 +-
 .../org/apache/sis/console/CommandRunnerTest.java  |   3 +-
 .../org/apache/sis/console/HelpCommandTest.java    |   3 +-
 .../apache/sis/console/MetadataCommandTest.java    |   3 +-
 .../apache/sis/console/MimeTypeCommandTest.java    |   3 +-
 .../apache/sis/test/suite/ConsoleTestSuite.java    |   3 +-
 application/sis-javafx/doc/readme.txt              |   2 -
 .../main/java/org/apache/sis/gui/AboutDialog.java  |   1 -
 .../main/java/org/apache/sis/gui/DataViewer.java   |   1 -
 .../java/org/apache/sis/gui/SystemMonitor.java     |   1 -
 .../src/main/java/org/apache/sis/gui/Widget.java   |   1 -
 .../apache/sis/gui/coverage/BandRangeTable.java    |   1 -
 .../sis/gui/coverage/BandSelectionListener.java    |   1 -
 .../org/apache/sis/gui/coverage/CellFormat.java    |   1 -
 .../apache/sis/gui/coverage/CoverageCanvas.java    |   5 +-
 .../apache/sis/gui/coverage/CoverageControls.java  |   1 -
 .../apache/sis/gui/coverage/CoverageExplorer.java  |   1 -
 .../apache/sis/gui/coverage/CoverageStyling.java   |   1 -
 .../java/org/apache/sis/gui/coverage/GridCell.java |   1 -
 .../org/apache/sis/gui/coverage/GridControls.java  |   1 -
 .../org/apache/sis/gui/coverage/GridError.java     |   1 -
 .../java/org/apache/sis/gui/coverage/GridRow.java  |   1 -
 .../org/apache/sis/gui/coverage/GridRowSkin.java   |   1 -
 .../apache/sis/gui/coverage/GridSliceSelector.java |   1 -
 .../java/org/apache/sis/gui/coverage/GridTile.java |   1 -
 .../org/apache/sis/gui/coverage/GridTileCache.java |   1 -
 .../java/org/apache/sis/gui/coverage/GridView.java |   1 -
 .../org/apache/sis/gui/coverage/GridViewSkin.java  |   1 -
 .../sis/gui/coverage/ImagePropertyExplorer.java    |   1 -
 .../org/apache/sis/gui/coverage/ImageRequest.java  |   1 -
 .../sis/gui/coverage/InterpolationConverter.java   |   1 -
 .../apache/sis/gui/coverage/IsolineRenderer.java   |   1 -
 .../gui/coverage/MultiResolutionImageLoader.java   |   1 -
 .../sis/gui/coverage/PropertyPaneCreator.java      |   1 -
 .../org/apache/sis/gui/coverage/Stretching.java    |   1 -
 .../sis/gui/coverage/StyledRenderingData.java      |   1 -
 .../apache/sis/gui/coverage/ViewAndControls.java   |   1 -
 .../org/apache/sis/gui/coverage/package-info.java  |   1 -
 .../org/apache/sis/gui/dataset/ExpandableList.java |   1 -
 .../apache/sis/gui/dataset/ExpandedFeature.java    |   1 -
 .../org/apache/sis/gui/dataset/FeatureList.java    |   1 -
 .../org/apache/sis/gui/dataset/FeatureLoader.java  |   1 -
 .../org/apache/sis/gui/dataset/FeatureTable.java   |   1 -
 .../java/org/apache/sis/gui/dataset/LogViewer.java |   1 -
 .../org/apache/sis/gui/dataset/PathAction.java     |   1 -
 .../org/apache/sis/gui/dataset/ResourceCell.java   |   1 -
 .../apache/sis/gui/dataset/ResourceExplorer.java   |   1 -
 .../org/apache/sis/gui/dataset/ResourceItem.java   |   1 -
 .../org/apache/sis/gui/dataset/ResourceTree.java   |   1 -
 .../org/apache/sis/gui/dataset/RootResource.java   |   1 -
 .../org/apache/sis/gui/dataset/TreeViewType.java   |   1 -
 .../org/apache/sis/gui/dataset/WindowHandler.java  |   1 -
 .../org/apache/sis/gui/dataset/WindowManager.java  |   1 -
 .../org/apache/sis/gui/dataset/package-info.java   |   1 -
 .../org/apache/sis/gui/map/GestureFollower.java    |   1 -
 .../java/org/apache/sis/gui/map/MapCanvas.java     |   8 +-
 .../java/org/apache/sis/gui/map/MapCanvasAWT.java  |   6 +-
 .../main/java/org/apache/sis/gui/map/MapMenu.java  |   1 -
 .../org/apache/sis/gui/map/OperationFinder.java    |   1 -
 .../java/org/apache/sis/gui/map/StatusBar.java     |   1 -
 .../org/apache/sis/gui/map/ValuesFormatter.java    |   1 -
 .../org/apache/sis/gui/map/ValuesFromCoverage.java |   1 -
 .../org/apache/sis/gui/map/ValuesUnderCursor.java  |   2 -
 .../java/org/apache/sis/gui/map/package-info.java  |   1 -
 .../sis/gui/metadata/IdentificationInfo.java       |   1 -
 .../apache/sis/gui/metadata/MetadataSummary.java   |   1 -
 .../org/apache/sis/gui/metadata/MetadataTree.java  |   1 -
 .../sis/gui/metadata/RepresentationInfo.java       |   1 -
 .../java/org/apache/sis/gui/metadata/Section.java  |   1 -
 .../sis/gui/metadata/StandardMetadataTree.java     |   1 -
 .../apache/sis/gui/metadata/VerboseFormats.java    |   1 -
 .../org/apache/sis/gui/metadata/package-info.java  |   1 -
 .../main/java/org/apache/sis/gui/package-info.java |   1 -
 .../apache/sis/gui/referencing/AuthorityCodes.java |   1 -
 .../org/apache/sis/gui/referencing/CRSChooser.java |   1 -
 .../java/org/apache/sis/gui/referencing/Code.java  |   1 -
 .../org/apache/sis/gui/referencing/CodeFilter.java |   1 -
 .../org/apache/sis/gui/referencing/MenuSync.java   |   1 -
 .../sis/gui/referencing/ObjectStringConverter.java |   1 -
 .../gui/referencing/PositionableProjection.java    |   1 -
 .../gui/referencing/RecentReferenceSystems.java    |   1 -
 .../java/org/apache/sis/gui/referencing/Utils.java |   1 -
 .../org/apache/sis/gui/referencing/WKTPane.java    |   1 -
 .../apache/sis/gui/referencing/package-info.java   |   1 -
 .../apache/sis/internal/gui/BackgroundThreads.java |   1 -
 .../org/apache/sis/internal/gui/ColorName.java     |   1 -
 .../org/apache/sis/internal/gui/DataFormats.java   |   1 -
 .../apache/sis/internal/gui/DataStoreOpener.java   |   7 +-
 .../apache/sis/internal/gui/ExceptionReporter.java |   1 -
 .../sis/internal/gui/FixedHeaderColumnSize.java    |   1 -
 .../org/apache/sis/internal/gui/GUIUtilities.java  |   9 +-
 .../sis/internal/gui/IdentityValueFactory.java     |   1 -
 .../apache/sis/internal/gui/ImageConverter.java    |   1 -
 .../sis/internal/gui/ImmutableObjectProperty.java  |   1 -
 .../org/apache/sis/internal/gui/LogHandler.java    |   1 -
 .../org/apache/sis/internal/gui/MouseDrags.java    |   1 -
 .../sis/internal/gui/NonNullObjectProperty.java    |   1 -
 .../sis/internal/gui/OptionalDataDownloader.java   |   1 -
 .../org/apache/sis/internal/gui/PrivateAccess.java |   1 -
 .../sis/internal/gui/PropertyValueFormats.java     |   1 -
 .../sis/internal/gui/PropertyValueFormatter.java   |   1 -
 .../org/apache/sis/internal/gui/PropertyView.java  |   1 -
 .../org/apache/sis/internal/gui/RecentChoices.java |   1 -
 .../org/apache/sis/internal/gui/Resources.java     |   1 -
 .../java/org/apache/sis/internal/gui/Styles.java   |   1 -
 .../org/apache/sis/internal/gui/ToolbarButton.java |   1 -
 .../apache/sis/internal/gui/control/ColorCell.java |   1 -
 .../internal/gui/control/ColorColumnHandler.java   |   1 -
 .../apache/sis/internal/gui/control/ColorRamp.java |   1 -
 .../sis/internal/gui/control/FormatApplicator.java |   1 -
 .../sis/internal/gui/control/FormatTableCell.java  |   1 -
 .../sis/internal/gui/control/SyncWindowList.java   |   1 -
 .../sis/internal/gui/control/TabularWidget.java    |   1 -
 .../sis/internal/gui/control/ValueColorMapper.java |   1 -
 .../sis/internal/gui/control/package-info.java     |   1 -
 .../apache/sis/internal/gui/io/FileAccessItem.java |   3 +-
 .../apache/sis/internal/gui/io/FileAccessView.java |   1 -
 .../apache/sis/internal/gui/io/package-info.java   |   1 -
 .../org/apache/sis/internal/gui/package-info.java  |   1 -
 .../org/apache/sis/internal/setup/FXFinder.java    |   6 +-
 .../org/apache/sis/internal/setup/Inflater.java    |   1 -
 .../java/org/apache/sis/internal/setup/Wizard.java |   1 -
 .../org/apache/sis/internal/setup/WizardPage.java  |   1 -
 .../apache/sis/internal/setup/package-info.java    |   1 -
 .../apache/sis/gui/coverage/CoverageCanvasApp.java |   1 -
 .../sis/gui/coverage/CoverageStylingApp.java       |   3 +-
 .../sis/gui/coverage/GridSliceSelectorApp.java     |   3 +-
 .../org/apache/sis/gui/coverage/GridViewApp.java   |   3 +-
 .../apache/sis/gui/referencing/CRSChooserApp.java  |   3 +-
 .../apache/sis/internal/gui/GUIUtilitiesTest.java  |   3 +-
 .../internal/gui/control/ValueColorMapperApp.java  |   3 +-
 .../sis/test/suite/ApplicationTestSuite.java       |   3 +-
 .../org/apache/sis/openoffice/AnglePattern.java    |   1 -
 .../java/org/apache/sis/openoffice/CacheKey.java   |  23 +-
 .../java/org/apache/sis/openoffice/CalcAddins.java |   1 -
 .../sis/openoffice/ReferencingFunctions.java       |   1 -
 .../org/apache/sis/openoffice/Registration.java    |   1 -
 .../org/apache/sis/openoffice/Transformer.java     |   1 -
 .../org/apache/sis/openoffice/XReferencing.java    |   1 -
 .../org/apache/sis/openoffice/package-info.java    |   1 -
 .../sis/openoffice/ReferencingFunctionsTest.java   |   3 +-
 .../org/apache/sis/openoffice/TransformerTest.java |   3 +-
 .../apache/sis/test/suite/OpenOfficeTestSuite.java |   3 +-
 .../org/apache/sis/services/OSGiActivator.java     |   1 -
 .../org/apache/sis/services/ServletListener.java   |   1 -
 .../apache/sis/cloud/aws/internal/Resources.java   |   2 -
 .../sis/cloud/aws/internal/package-info.java       |   1 -
 .../org/apache/sis/cloud/aws/s3/BucketStore.java   |   1 -
 .../apache/sis/cloud/aws/s3/CachedByteChannel.java |   1 -
 .../apache/sis/cloud/aws/s3/ClientFileSystem.java  |   1 -
 .../org/apache/sis/cloud/aws/s3/DerivedList.java   |   1 -
 .../org/apache/sis/cloud/aws/s3/FileService.java   |   5 +-
 .../java/org/apache/sis/cloud/aws/s3/KeyPath.java  |   1 -
 .../apache/sis/cloud/aws/s3/KeyPathMatcher.java    |   1 -
 .../apache/sis/cloud/aws/s3/ObjectAttributes.java  |   1 -
 .../org/apache/sis/cloud/aws/s3/PathIterator.java  |   1 -
 .../org/apache/sis/cloud/aws/s3/package-info.java  |   1 -
 .../sis/cloud/aws/s3/ClientFileSystemTest.java     |   3 +-
 .../sis/cloud/aws/s3/KeyPathMatcherTest.java       |   3 +-
 .../org/apache/sis/cloud/aws/s3/KeyPathTest.java   |   3 +-
 .../org/apache/sis/test/suite/AWSTestSuite.java    |   2 +-
 .../org/apache/sis/internal/book/Characters.java   |   1 -
 .../apache/sis/internal/book/CodeColorizer.java    |   1 -
 .../org/apache/sis/internal/doclet/Doclet.java     |   1 -
 .../org/apache/sis/internal/doclet/Include.java    |   1 -
 .../org/apache/sis/internal/doclet/Module.java     |  97 --------
 .../org/apache/sis/internal/doclet/Preformat.java  | 244 ---------------------
 .../org/apache/sis/internal/doclet/Rewriter.java   |   1 -
 .../org/apache/sis/internal/doclet/Taglet.java     |   1 -
 .../apache/sis/internal/doclet/package-info.java   |   1 -
 .../org/apache/sis/internal/maven/Assembler.java   |   1 -
 .../org/apache/sis/internal/maven/Filenames.java   |   1 -
 .../apache/sis/internal/maven/JarCollector.java    |   1 -
 .../apache/sis/internal/maven/package-info.java    |   1 -
 .../org/apache/sis/internal/unopkg/JavaMaker.java  |   1 -
 .../org/apache/sis/internal/unopkg/UnoPkg.java     |   1 -
 .../apache/sis/internal/unopkg/package-info.java   |   3 +-
 .../util/resources/IndexedResourceCompiler.java    |   1 -
 .../util/resources/ResourceCompilerException.java  |   1 -
 .../sis/util/resources/ResourceCompilerMojo.java   |   1 -
 .../util/resources/ResourceCompilerMojoTest.java   |   3 +-
 .../src/main/java/org/apache/sis/cql/CQL.java      |   1 -
 .../main/java/org/apache/sis/cql/CQLException.java |   1 -
 .../org/apache/sis/cql/FilterToCQLVisitor.java     |   1 -
 .../java/org/apache/sis/internal/cql/AntlrCQL.java |   1 -
 .../test/java/org/apache/sis/cql/CQLTestCase.java  |   3 +-
 .../test/java/org/apache/sis/cql/CQLTestSuite.java |   3 +-
 .../org/apache/sis/cql/ExpressionReadingTest.java  |   3 +-
 .../org/apache/sis/cql/ExpressionWritingTest.java  |   3 +-
 .../java/org/apache/sis/cql/FilterReadingTest.java |   3 +-
 .../java/org/apache/sis/cql/FilterWritingTest.java |   3 +-
 .../java/org/apache/sis/cql/QueryReadingTest.java  |   2 +-
 .../java/org/apache/sis/cql/QueryWritingTest.java  |   2 +-
 .../org/apache/sis/coverage/BandedCoverage.java    |   2 -
 .../java/org/apache/sis/coverage/Category.java     |   1 -
 .../java/org/apache/sis/coverage/CategoryList.java |   1 -
 .../org/apache/sis/coverage/ConvertedCategory.java |   1 -
 .../org/apache/sis/coverage/ConvertedRange.java    |   1 -
 .../coverage/IllegalSampleDimensionException.java  |   1 -
 .../coverage/MismatchedCoverageRangeException.java |   1 -
 .../org/apache/sis/coverage/RegionOfInterest.java  |   1 -
 .../org/apache/sis/coverage/SampleDimension.java   |   2 -
 .../org/apache/sis/coverage/SampleRangeFormat.java |   6 +-
 .../coverage/SubspaceNotSpecifiedException.java    |   1 -
 .../main/java/org/apache/sis/coverage/ToNaN.java   |   1 -
 .../sis/coverage/grid/BufferedGridCoverage.java    |   7 +-
 .../sis/coverage/grid/ConvertedGridCoverage.java   |   1 -
 .../coverage/grid/CoordinateOperationFinder.java   |  13 +-
 .../apache/sis/coverage/grid/DefaultEvaluator.java |   1 -
 .../sis/coverage/grid/DerivedGridCoverage.java     |   1 -
 .../apache/sis/coverage/grid/DimensionReducer.java |   1 -
 .../sis/coverage/grid/DisjointExtentException.java |   1 -
 .../apache/sis/coverage/grid/DomainLinearizer.java |   1 -
 .../apache/sis/coverage/grid/EvaluatorWrapper.java |   1 -
 .../coverage/grid/FractionalGridCoordinates.java   |   1 -
 .../apache/sis/coverage/grid/GridClippingMode.java |   1 -
 .../sis/coverage/grid/GridCoordinatesView.java     |   1 -
 .../org/apache/sis/coverage/grid/GridCoverage.java |   8 +-
 .../apache/sis/coverage/grid/GridCoverage2D.java   |   1 -
 .../sis/coverage/grid/GridCoverageBuilder.java     |  30 +--
 .../sis/coverage/grid/GridCoverageProcessor.java   |   1 -
 .../apache/sis/coverage/grid/GridDerivation.java   |  49 ++---
 .../org/apache/sis/coverage/grid/GridExtent.java   |  13 +-
 .../apache/sis/coverage/grid/GridExtentCRS.java    |   1 -
 .../org/apache/sis/coverage/grid/GridGeometry.java |  24 +-
 .../apache/sis/coverage/grid/GridOrientation.java  |  16 +-
 .../apache/sis/coverage/grid/GridRoundingMode.java |   1 -
 .../grid/IllegalGridGeometryException.java         |   1 -
 .../apache/sis/coverage/grid/ImageRenderer.java    |  26 +--
 .../grid/IncompleteGridGeometryException.java      |   5 +-
 .../apache/sis/coverage/grid/PixelTranslation.java |  26 +--
 .../sis/coverage/grid/ResampledGridCoverage.java   |   1 -
 .../apache/sis/coverage/grid/ReshapedImage.java    |   1 -
 .../apache/sis/coverage/grid/SliceGeometry.java    |   1 -
 .../sis/coverage/grid/TranslatedGridCoverage.java  |   1 -
 .../org/apache/sis/coverage/grid/package-info.java |   1 -
 .../java/org/apache/sis/coverage/package-info.java |   1 -
 .../apache/sis/feature/AbstractAssociation.java    |   1 -
 .../org/apache/sis/feature/AbstractAttribute.java  |  45 ++--
 .../org/apache/sis/feature/AbstractFeature.java    |  50 ++---
 .../apache/sis/feature/AbstractIdentifiedType.java |   1 -
 .../org/apache/sis/feature/AbstractOperation.java  |   1 -
 .../org/apache/sis/feature/AssociationView.java    |   1 -
 .../java/org/apache/sis/feature/AttributeView.java |   1 -
 .../org/apache/sis/feature/CharacteristicMap.java  |   1 -
 .../apache/sis/feature/CharacteristicTypeMap.java  |   1 -
 .../org/apache/sis/feature/CommonParentFinder.java |   1 -
 .../apache/sis/feature/DefaultAssociationRole.java |  30 ++-
 .../apache/sis/feature/DefaultAttributeType.java   |   1 -
 .../org/apache/sis/feature/DefaultFeatureType.java |   1 -
 .../java/org/apache/sis/feature/DenseFeature.java  |   1 -
 .../org/apache/sis/feature/EnvelopeOperation.java  |   1 -
 .../java/org/apache/sis/feature/FeatureFormat.java |  11 +-
 .../sis/feature/FeatureOperationException.java     |   1 -
 .../org/apache/sis/feature/FeatureOperations.java  |  16 +-
 .../main/java/org/apache/sis/feature/Features.java |   1 -
 .../main/java/org/apache/sis/feature/Field.java    |   1 -
 .../java/org/apache/sis/feature/FieldType.java     |   9 +-
 .../sis/feature/FoliationRepresentation.java       |   1 -
 .../sis/feature/InvalidFeatureException.java       |   1 -
 .../java/org/apache/sis/feature/LinkOperation.java |   1 -
 .../apache/sis/feature/MultiValuedAssociation.java |   1 -
 .../apache/sis/feature/MultiValuedAttribute.java   |   1 -
 .../org/apache/sis/feature/NamedFeatureType.java   |   1 -
 .../org/apache/sis/feature/PropertySingleton.java  |   1 -
 .../java/org/apache/sis/feature/PropertyView.java  |   1 -
 .../apache/sis/feature/SingletonAssociation.java   |   1 -
 .../org/apache/sis/feature/SingletonAttribute.java |   1 -
 .../java/org/apache/sis/feature/SparseFeature.java |   1 -
 .../apache/sis/feature/StringJoinOperation.java    |   1 -
 .../java/org/apache/sis/feature/Validator.java     |   1 -
 .../feature/builder/AssociationRoleBuilder.java    |   1 -
 .../apache/sis/feature/builder/AttributeRole.java  |   1 -
 .../sis/feature/builder/AttributeTypeBuilder.java  |  26 +--
 .../feature/builder/CharacteristicTypeBuilder.java |   1 -
 .../sis/feature/builder/FeatureTypeBuilder.java    |  38 ++--
 .../sis/feature/builder/OperationWrapper.java      |   1 -
 .../sis/feature/builder/PropertyTypeBuilder.java   |   1 -
 .../apache/sis/feature/builder/RemoveOnlyList.java |   1 -
 .../apache/sis/feature/builder/TypeBuilder.java    |   7 +-
 .../apache/sis/feature/builder/package-info.java   |  10 +-
 .../java/org/apache/sis/feature/package-info.java  |   1 -
 .../org/apache/sis/filter/ArithmeticFunction.java  |   1 -
 .../org/apache/sis/filter/AssociationValue.java    |   1 -
 .../java/org/apache/sis/filter/BinaryFunction.java |   1 -
 .../apache/sis/filter/BinaryGeometryFilter.java    |   1 -
 .../org/apache/sis/filter/BinarySpatialFilter.java |   1 -
 .../java/org/apache/sis/filter/Capabilities.java   |   1 -
 .../org/apache/sis/filter/ComparisonFilter.java    |   1 -
 .../org/apache/sis/filter/ConvertFunction.java     |   1 -
 .../apache/sis/filter/DefaultFilterFactory.java    |   1 -
 .../org/apache/sis/filter/DefaultSortProperty.java |   1 -
 .../java/org/apache/sis/filter/DistanceFilter.java |   1 -
 .../java/org/apache/sis/filter/FilterNode.java     |   1 -
 .../org/apache/sis/filter/IdentifierFilter.java    |   1 -
 .../java/org/apache/sis/filter/LeafExpression.java |   1 -
 .../java/org/apache/sis/filter/LikeFilter.java     |   1 -
 .../java/org/apache/sis/filter/LogicalFilter.java  |   1 -
 .../java/org/apache/sis/filter/Optimization.java   |   5 +-
 .../java/org/apache/sis/filter/PropertyValue.java  |   1 -
 .../java/org/apache/sis/filter/TemporalFilter.java |   1 -
 .../java/org/apache/sis/filter/UnaryFunction.java  |   1 -
 .../src/main/java/org/apache/sis/filter/XPath.java |   1 -
 .../java/org/apache/sis/filter/package-info.java   |   1 -
 .../java/org/apache/sis/image/AnnotatedImage.java  |   5 +-
 .../java/org/apache/sis/image/BandSelectImage.java |   1 -
 .../java/org/apache/sis/image/BandedIterator.java  |   1 -
 .../apache/sis/image/BandedSampleConverter.java    |   1 -
 .../java/org/apache/sis/image/ComputedImage.java   |  13 +-
 .../java/org/apache/sis/image/ComputedTiles.java   |   1 -
 .../main/java/org/apache/sis/image/DataType.java   |   1 -
 .../java/org/apache/sis/image/ErrorAction.java     |   1 -
 .../java/org/apache/sis/image/ErrorHandler.java    |   1 -
 .../java/org/apache/sis/image/ImageAdapter.java    |   1 -
 .../java/org/apache/sis/image/ImageCombiner.java   |   1 -
 .../java/org/apache/sis/image/ImageProcessor.java  |   1 -
 .../java/org/apache/sis/image/Interpolation.java   |   6 +-
 .../org/apache/sis/image/LanczosInterpolation.java |   1 -
 .../main/java/org/apache/sis/image/MaskImage.java  |   1 -
 .../java/org/apache/sis/image/MaskedImage.java     |   9 +-
 .../java/org/apache/sis/image/PixelIterator.java   |  34 ++-
 .../java/org/apache/sis/image/PlanarImage.java     |   5 +-
 .../sis/image/PositionalConsistencyImage.java      |   1 -
 .../java/org/apache/sis/image/PrefetchedImage.java |   1 -
 .../java/org/apache/sis/image/RecoloredImage.java  |   1 -
 .../java/org/apache/sis/image/ResampledImage.java  |   5 +-
 .../java/org/apache/sis/image/ResamplingGrid.java  |   1 -
 .../org/apache/sis/image/SourceAlignedImage.java   |   1 -
 .../org/apache/sis/image/StatisticsCalculator.java |   1 -
 .../main/java/org/apache/sis/image/TileCache.java  |   1 -
 .../java/org/apache/sis/image/TransferType.java    |   1 -
 .../main/java/org/apache/sis/image/Transferer.java |   1 -
 .../java/org/apache/sis/image/Visualization.java   |   1 -
 .../apache/sis/image/WritablePixelIterator.java    |   5 +-
 .../java/org/apache/sis/image/package-info.java    |   1 -
 .../org/apache/sis/index/tree/NodeIterator.java    |   1 -
 .../java/org/apache/sis/index/tree/PointTree.java  |   1 -
 .../org/apache/sis/index/tree/PointTreeNode.java   |   1 -
 .../org/apache/sis/index/tree/QuadTreeNode.java    |   1 -
 .../org/apache/sis/index/tree/package-info.java    |   1 -
 .../sis/internal/coverage/CoverageCombiner.java    |   1 -
 .../sis/internal/coverage/SampleDimensions.java    |   1 -
 .../internal/coverage/j2d/BatchComputedImage.java  |   1 -
 .../internal/coverage/j2d/ColorModelFactory.java   |   7 +-
 .../sis/internal/coverage/j2d/ColorModelType.java  |   1 -
 .../sis/internal/coverage/j2d/Colorizer.java       |   1 -
 .../sis/internal/coverage/j2d/ColorsForRange.java  |   1 -
 .../internal/coverage/j2d/DeferredProperty.java    |   1 -
 .../sis/internal/coverage/j2d/FillValues.java      |   1 -
 .../sis/internal/coverage/j2d/ImageLayout.java     |   1 -
 .../sis/internal/coverage/j2d/ImageUtilities.java  |   1 -
 .../coverage/j2d/MultiBandsIndexColorModel.java    |   1 -
 .../sis/internal/coverage/j2d/RasterFactory.java   |   1 -
 .../internal/coverage/j2d/SampleModelFactory.java  |   1 -
 .../internal/coverage/j2d/ScaledColorModel.java    |   1 -
 .../internal/coverage/j2d/ScaledColorSpace.java    |   1 -
 .../internal/coverage/j2d/TileErrorHandler.java    |   1 -
 .../sis/internal/coverage/j2d/TileOpExecutor.java  |   1 -
 .../sis/internal/coverage/j2d/TilePlaceholder.java |   9 +-
 .../sis/internal/coverage/j2d/TiledImage.java      |   1 -
 .../internal/coverage/j2d/WritableTiledImage.java  |   1 -
 .../sis/internal/coverage/j2d/WriteSupport.java    |   1 -
 .../sis/internal/coverage/j2d/package-info.java    |   1 -
 .../apache/sis/internal/coverage/package-info.java |   1 -
 .../sis/internal/feature/AbstractGeometry.java     |   1 -
 .../sis/internal/feature/AttributeConvention.java  |   1 -
 .../sis/internal/feature/FeatureExpression.java    |   1 -
 .../sis/internal/feature/FeatureUtilities.java     |   1 -
 .../apache/sis/internal/feature/Geometries.java    |   1 -
 .../sis/internal/feature/GeometryFactories.java    |   1 -
 .../apache/sis/internal/feature/GeometryType.java  |   1 -
 .../sis/internal/feature/GeometryWithCRS.java      |   1 -
 .../sis/internal/feature/GeometryWrapper.java      |   1 -
 .../apache/sis/internal/feature/InstantList.java   |   1 -
 .../sis/internal/feature/MovingFeatures.java       |   1 -
 .../org/apache/sis/internal/feature/Resources.java |   2 -
 .../internal/feature/SpatialOperationContext.java  |   1 -
 .../apache/sis/internal/feature/esri/Factory.java  |   1 -
 .../apache/sis/internal/feature/esri/Wrapper.java  |   1 -
 .../sis/internal/feature/esri/package-info.java    |   1 -
 .../feature/j2d/DecimatedPathIterator.java         |   1 -
 .../sis/internal/feature/j2d/DecimatedShape.java   |   1 -
 .../sis/internal/feature/j2d/EmptyShape.java       |   1 -
 .../apache/sis/internal/feature/j2d/Factory.java   |   1 -
 .../apache/sis/internal/feature/j2d/FlatShape.java |   1 -
 .../sis/internal/feature/j2d/MultiPolylines.java   |   1 -
 .../sis/internal/feature/j2d/PathBuilder.java      |   1 -
 .../sis/internal/feature/j2d/PointWrapper.java     |   1 -
 .../apache/sis/internal/feature/j2d/Polygon.java   |   1 -
 .../apache/sis/internal/feature/j2d/Polyline.java  |   1 -
 .../sis/internal/feature/j2d/ShapeProperties.java  |   1 -
 .../sis/internal/feature/j2d/ShapeWrapper.java     |   1 -
 .../apache/sis/internal/feature/j2d/Wrapper.java   |   1 -
 .../sis/internal/feature/j2d/package-info.java     |   1 -
 .../apache/sis/internal/feature/jts/Factory.java   |   1 -
 .../sis/internal/feature/jts/FilteringContext.java |   1 -
 .../feature/jts/GeometryCoordinateTransform.java   |   1 -
 .../internal/feature/jts/GeometryTransform.java    |   1 -
 .../org/apache/sis/internal/feature/jts/JTS.java   |   1 -
 .../feature/jts/PackedCoordinateSequence.java      |   1 -
 .../jts/PackedCoordinateSequenceFactory.java       |   1 -
 .../internal/feature/jts/PathIteratorAdapter.java  |   1 -
 .../sis/internal/feature/jts/ShapeAdapter.java     |   1 -
 .../sis/internal/feature/jts/ShapeConverter.java   |   1 -
 .../apache/sis/internal/feature/jts/Wrapper.java   |   1 -
 .../sis/internal/feature/jts/package-info.java     |   1 -
 .../apache/sis/internal/feature/package-info.java  |   1 -
 .../apache/sis/internal/filter/FunctionNames.java  |   1 -
 .../sis/internal/filter/FunctionRegister.java      |   1 -
 .../sis/internal/filter/GeometryConverter.java     |   1 -
 .../java/org/apache/sis/internal/filter/Node.java  |   1 -
 .../sis/internal/filter/SortByComparator.java      |   1 -
 .../org/apache/sis/internal/filter/Visitor.java    |   1 -
 .../apache/sis/internal/filter/package-info.java   |   1 -
 .../internal/filter/sqlmm/FunctionWithSRID.java    |   1 -
 .../internal/filter/sqlmm/GeometryConstructor.java |   1 -
 .../sis/internal/filter/sqlmm/GeometryParser.java  |   1 -
 .../sis/internal/filter/sqlmm/OneGeometry.java     |   1 -
 .../apache/sis/internal/filter/sqlmm/Registry.java |   1 -
 .../apache/sis/internal/filter/sqlmm/SQLMM.java    |   1 -
 .../sis/internal/filter/sqlmm/ST_FromBinary.java   |   1 -
 .../sis/internal/filter/sqlmm/ST_FromText.java     |   1 -
 .../apache/sis/internal/filter/sqlmm/ST_Point.java |   1 -
 .../sis/internal/filter/sqlmm/ST_Transform.java    |   1 -
 .../sis/internal/filter/sqlmm/SpatialFunction.java |   1 -
 .../sis/internal/filter/sqlmm/TwoGeometries.java   |   1 -
 .../sis/internal/filter/sqlmm/package-info.java    |   1 -
 .../internal/processing/image/CompoundFuture.java  |   1 -
 .../internal/processing/image/TiledProcess.java    |  13 +-
 .../internal/processing/image/package-info.java    |   1 -
 .../sis/internal/processing/isoline/Fragments.java |   1 -
 .../sis/internal/processing/isoline/Isolines.java  |   1 -
 .../sis/internal/processing/isoline/Joiner.java    |   6 +-
 .../internal/processing/isoline/Parallelized.java  |   1 -
 .../processing/isoline/PolylineBuffer.java         |   5 +-
 .../internal/processing/isoline/PolylineStage.java |   1 -
 .../sis/internal/processing/isoline/Result.java    |   1 -
 .../sis/internal/processing/isoline/Tracer.java    |  26 +--
 .../internal/processing/isoline/package-info.java  |   1 -
 .../org/apache/sis/coverage/CategoryListTest.java  |   3 +-
 .../java/org/apache/sis/coverage/CategoryTest.java |   3 +-
 .../apache/sis/coverage/SampleDimensionTest.java   |  18 +-
 .../apache/sis/coverage/SampleRangeFormatTest.java |   3 +-
 .../coverage/grid/BufferedGridCoverageTest.java    |   8 +-
 .../coverage/grid/ConvertedGridCoverageTest.java   |   3 +-
 .../grid/FractionalGridCoordinatesTest.java        |   3 +-
 .../sis/coverage/grid/GridCoverage2DTest.java      |  13 +-
 .../sis/coverage/grid/GridCoverageBuilderTest.java |   2 +-
 .../sis/coverage/grid/GridDerivationTest.java      |  13 +-
 .../apache/sis/coverage/grid/GridExtentTest.java   |   3 +-
 .../apache/sis/coverage/grid/GridGeometryTest.java |   3 +-
 .../sis/coverage/grid/GridOrientationTest.java     |   3 +-
 .../sis/coverage/grid/PixelTranslationTest.java    |   3 +-
 .../coverage/grid/ResampledGridCoverageTest.java   |   3 +-
 .../sis/coverage/grid/ReshapedImageTest.java       |   3 +-
 .../coverage/grid/TranslatedGridCoverageTest.java  |   3 +-
 .../apache/sis/feature/AbstractFeatureTest.java    |   3 +-
 .../apache/sis/feature/AbstractOperationTest.java  |   3 +-
 .../apache/sis/feature/CharacteristicMapTest.java  |   3 +-
 .../sis/feature/CharacteristicTypeMapTest.java     |   3 +-
 .../org/apache/sis/feature/CustomAttribute.java    |   3 +-
 .../sis/feature/DefaultAssociationRoleTest.java    |   3 +-
 .../sis/feature/DefaultAttributeTypeTest.java      |   3 +-
 .../apache/sis/feature/DefaultFeatureTypeTest.java |   3 +-
 .../org/apache/sis/feature/DenseFeatureTest.java   |   3 +-
 .../apache/sis/feature/EnvelopeOperationTest.java  |   3 +-
 .../org/apache/sis/feature/FeatureFormatTest.java  |   3 +-
 .../apache/sis/feature/FeatureOperationsTest.java  |   3 +-
 .../org/apache/sis/feature/FeatureTestCase.java    |   3 +-
 .../java/org/apache/sis/feature/FeaturesTest.java  |   3 +-
 .../org/apache/sis/feature/LinkOperationTest.java  |   3 +-
 .../sis/feature/MultiValuedAttributeTest.java      |   3 +-
 .../java/org/apache/sis/feature/NoOperation.java   |   3 +-
 .../apache/sis/feature/PropertySingletonTest.java  |   3 +-
 .../sis/feature/SingletonAssociationTest.java      |   3 +-
 .../apache/sis/feature/SingletonAttributeTest.java |   3 +-
 .../org/apache/sis/feature/SparseFeatureTest.java  |   3 +-
 .../sis/feature/StringJoinOperationTest.java       |   3 +-
 .../builder/AssociationRoleBuilderTest.java        |   3 +-
 .../feature/builder/AttributeTypeBuilderTest.java  |   3 +-
 .../builder/CharacteristicTypeBuilderTest.java     |   3 +-
 .../feature/builder/FeatureTypeBuilderTest.java    |   3 +-
 .../apache/sis/filter/ArithmeticFunctionTest.java  |   3 +-
 .../sis/filter/BinarySpatialFilterTestCase.java    |   3 +-
 .../filter/BinarySpatialFilterUsingESRI_Test.java  |   3 +-
 .../filter/BinarySpatialFilterUsingJTS_Test.java   |   3 +-
 .../BinarySpatialFilterUsingJava2D_Test.java       |   3 +-
 .../org/apache/sis/filter/CapabilitiesTest.java    |   3 +-
 .../apache/sis/filter/ComparisonFilterTest.java    |   3 +-
 .../apache/sis/filter/IdentifierFilterTest.java    |   3 +-
 .../org/apache/sis/filter/LeafExpressionTest.java  |   3 +-
 .../java/org/apache/sis/filter/LikeFilterTest.java |   3 +-
 .../org/apache/sis/filter/LogicalFilterTest.java   |   3 +-
 .../java/org/apache/sis/filter/PeriodLiteral.java  |   3 +-
 .../org/apache/sis/filter/TemporalFilterTest.java  |   3 +-
 .../test/java/org/apache/sis/filter/XPathTest.java |   3 +-
 .../org/apache/sis/image/BandSelectImageTest.java  |   3 +-
 .../org/apache/sis/image/BandedIteratorTest.java   |   2 +-
 .../sis/image/BandedSampleConverterTest.java       |   3 +-
 .../org/apache/sis/image/ComputedImageTest.java    |   3 +-
 .../java/org/apache/sis/image/DataTypeTest.java    |   3 +-
 .../org/apache/sis/image/ImageCombinerTest.java    |   3 +-
 .../org/apache/sis/image/ImageProcessorTest.java   |   3 +-
 .../java/org/apache/sis/image/ImageTestCase.java   |   3 +-
 .../org/apache/sis/image/InterpolationTest.java    |   7 +-
 .../org/apache/sis/image/LinearIteratorTest.java   |   2 +-
 .../java/org/apache/sis/image/MaskedImageTest.java |   3 +-
 .../org/apache/sis/image/PixelIteratorTest.java    |   3 +-
 .../java/org/apache/sis/image/PlanarImageTest.java |   3 +-
 .../org/apache/sis/image/ResampledImageTest.java   |   2 +-
 .../org/apache/sis/image/ResamplingGridTest.java   |   3 +-
 .../apache/sis/image/StatisticsCalculatorTest.java |   3 +-
 .../test/java/org/apache/sis/image/TestViewer.java |   5 +-
 .../java/org/apache/sis/image/TiledImageMock.java  |   3 +-
 .../apache/sis/index/tree/PointTreeNodeTest.java   |   3 +-
 .../org/apache/sis/index/tree/PointTreeTest.java   |   3 +-
 .../sis/internal/coverage/j2d/ColorizerTest.java   |   3 +-
 .../sis/internal/coverage/j2d/ImageLayoutTest.java |   3 +-
 .../internal/coverage/j2d/ImageUtilitiesTest.java  |   3 +-
 .../coverage/j2d/SampleModelFactoryTest.java       |   3 +-
 .../coverage/j2d/ScaledColorSpaceTest.java         |   3 +-
 .../internal/feature/AttributeConventionTest.java  |   3 +-
 .../sis/internal/feature/GeometriesTestCase.java   |   3 +-
 .../sis/internal/feature/GeometryTypeTest.java     |   3 +-
 .../sis/internal/feature/esri/FactoryTest.java     |   3 +-
 .../sis/internal/feature/j2d/FactoryTest.java      |   3 +-
 .../sis/internal/feature/j2d/FlatShapeTest.java    |   3 +-
 .../internal/feature/j2d/ShapePropertiesTest.java  |   3 +-
 .../sis/internal/feature/jts/FactoryTest.java      |   3 +-
 .../apache/sis/internal/feature/jts/JTSTest.java   |   3 +-
 .../sis/internal/feature/jts/ShapeAdapterTest.java |   3 +-
 .../internal/feature/jts/ShapeConverterTest.java   |   3 +-
 .../sis/internal/filter/FunctionNamesTest.java     |   3 +-
 .../internal/filter/sqlmm/RegistryTestCase.java    |   3 +-
 .../filter/sqlmm/RegistryUsingESRI_Test.java       |   3 +-
 .../filter/sqlmm/RegistryUsingJTS_Test.java        |   3 +-
 .../filter/sqlmm/RegistryUsingJava2D_Test.java     |   3 +-
 .../sis/internal/filter/sqlmm/SQLMMTest.java       |   3 +-
 .../internal/processing/isoline/IsolinesTest.java  |   3 +-
 .../internal/processing/isoline/StepsViewer.java   |   1 -
 .../java/org/apache/sis/test/FeatureAssert.java    |   3 +-
 .../apache/sis/test/feature/FeatureComparator.java |   3 +-
 .../org/apache/sis/test/feature/package-info.java  |   1 -
 .../apache/sis/test/suite/FeatureTestSuite.java    |   3 +-
 .../sis/internal/jaxb/AdapterReplacement.java      |   9 +-
 .../java/org/apache/sis/internal/jaxb/Context.java |  14 +-
 .../apache/sis/internal/jaxb/FilterByVersion.java  |   1 -
 .../sis/internal/jaxb/IdentifierMapAdapter.java    |   2 -
 .../sis/internal/jaxb/IdentifierMapEntry.java      |   1 -
 .../sis/internal/jaxb/ModifiableIdentifierMap.java |   1 -
 .../sis/internal/jaxb/NonMarshalledAuthority.java  |   5 +-
 .../sis/internal/jaxb/PrimitiveTypeProperties.java |   1 -
 .../sis/internal/jaxb/SpecializedIdentifier.java   |   1 -
 .../apache/sis/internal/jaxb/TypeRegistration.java |   5 +-
 .../sis/internal/jaxb/UseLegacyMetadata.java       |   1 -
 .../sis/internal/jaxb/cat/CodeListAdapter.java     |   7 +-
 .../apache/sis/internal/jaxb/cat/CodeListUID.java  |   5 +-
 .../apache/sis/internal/jaxb/cat/EnumAdapter.java  |   3 +-
 .../apache/sis/internal/jaxb/cat/package-info.java |   1 -
 .../sis/internal/jaxb/code/CI_DateTypeCode.java    |   1 -
 .../internal/jaxb/code/CI_OnLineFunctionCode.java  |   1 -
 .../jaxb/code/CI_PresentationFormCode.java         |   1 -
 .../apache/sis/internal/jaxb/code/CI_RoleCode.java |   1 -
 .../internal/jaxb/code/CI_TelephoneTypeCode.java   |   1 -
 .../org/apache/sis/internal/jaxb/code/DCPList.java |   1 -
 .../sis/internal/jaxb/code/DQM_ValueStructure.java |   1 -
 .../jaxb/code/DQ_EvaluationMethodTypeCode.java     |   1 -
 .../internal/jaxb/code/DS_AssociationTypeCode.java |   1 -
 .../internal/jaxb/code/DS_InitiativeTypeCode.java  |   1 -
 .../internal/jaxb/code/MD_CellGeometryCode.java    |   1 -
 .../internal/jaxb/code/MD_CharacterSetCode.java    |   1 -
 .../internal/jaxb/code/MD_ClassificationCode.java  |   1 -
 .../jaxb/code/MD_CoverageContentTypeCode.java      |   1 -
 .../sis/internal/jaxb/code/MD_DatatypeCode.java    |   1 -
 .../jaxb/code/MD_DimensionNameTypeCode.java        |   1 -
 .../jaxb/code/MD_GeometricObjectTypeCode.java      |   1 -
 .../jaxb/code/MD_ImagingConditionCode.java         |   1 -
 .../sis/internal/jaxb/code/MD_KeywordTypeCode.java |   1 -
 .../jaxb/code/MD_MaintenanceFrequencyCode.java     |   1 -
 .../internal/jaxb/code/MD_MediumFormatCode.java    |   1 -
 .../sis/internal/jaxb/code/MD_MediumNameCode.java  |   1 -
 .../sis/internal/jaxb/code/MD_ObligationCode.java  |   1 -
 .../jaxb/code/MD_PixelOrientationCode.java         |   1 -
 .../sis/internal/jaxb/code/MD_ProgressCode.java    |   1 -
 .../sis/internal/jaxb/code/MD_RestrictionCode.java |   1 -
 .../sis/internal/jaxb/code/MD_ScopeCode.java       |   1 -
 .../code/MD_SpatialRepresentationTypeCode.java     |   1 -
 .../internal/jaxb/code/MD_TopicCategoryCode.java   |   1 -
 .../internal/jaxb/code/MD_TopologyLevelCode.java   |   1 -
 .../sis/internal/jaxb/code/MI_BandDefinition.java  |   1 -
 .../sis/internal/jaxb/code/MI_ContextCode.java     |   1 -
 .../internal/jaxb/code/MI_GeometryTypeCode.java    |   1 -
 .../internal/jaxb/code/MI_ObjectiveTypeCode.java   |   1 -
 .../internal/jaxb/code/MI_OperationTypeCode.java   |   1 -
 .../jaxb/code/MI_PolarisationOrientationCode.java  |   1 -
 .../sis/internal/jaxb/code/MI_PriorityCode.java    |   1 -
 .../sis/internal/jaxb/code/MI_SequenceCode.java    |   1 -
 .../jaxb/code/MI_TransferFunctionTypeCode.java     |   1 -
 .../sis/internal/jaxb/code/MI_TriggerCode.java     |   1 -
 .../sis/internal/jaxb/code/SV_CouplingType.java    |   1 -
 .../internal/jaxb/code/SV_ParameterDirection.java  |   1 -
 .../sis/internal/jaxb/code/package-info.java       |   1 -
 .../sis/internal/jaxb/gco/CharSequenceAdapter.java |   1 -
 .../apache/sis/internal/jaxb/gco/GO_Boolean.java   |   1 -
 .../sis/internal/jaxb/gco/GO_CharacterString.java  |   1 -
 .../apache/sis/internal/jaxb/gco/GO_DateTime.java  |   1 -
 .../apache/sis/internal/jaxb/gco/GO_Decimal.java   |   1 -
 .../apache/sis/internal/jaxb/gco/GO_Distance.java  |   1 -
 .../sis/internal/jaxb/gco/GO_GenericName.java      |   5 +-
 .../apache/sis/internal/jaxb/gco/GO_Integer.java   |   1 -
 .../apache/sis/internal/jaxb/gco/GO_Integer64.java |   1 -
 .../apache/sis/internal/jaxb/gco/GO_Measure.java   |   1 -
 .../internal/jaxb/gco/GO_MultiplicityRange.java    |   1 -
 .../org/apache/sis/internal/jaxb/gco/GO_Real.java  |   1 -
 .../apache/sis/internal/jaxb/gco/GO_Record.java    |   1 -
 .../sis/internal/jaxb/gco/GO_RecordType.java       |   1 -
 .../apache/sis/internal/jaxb/gco/GO_Temporal.java  |   1 -
 .../org/apache/sis/internal/jaxb/gco/GO_URL.java   |   3 +-
 .../sis/internal/jaxb/gco/GO_UnlimitedInteger.java |   1 -
 .../jaxb/gco/InternationalStringAdapter.java       |   1 -
 .../jaxb/gco/InternationalStringConverter.java     |   1 -
 .../apache/sis/internal/jaxb/gco/Multiplicity.java |   5 +-
 .../sis/internal/jaxb/gco/MultiplicityRange.java   |   1 -
 .../apache/sis/internal/jaxb/gco/NameValue.java    |   5 +-
 .../sis/internal/jaxb/gco/ObjectReference.java     |   5 +-
 .../apache/sis/internal/jaxb/gco/PropertyType.java |  25 +--
 .../sis/internal/jaxb/gco/StringAdapter.java       |   1 -
 .../apache/sis/internal/jaxb/gco/URIAdapter.java   |   1 -
 .../apache/sis/internal/jaxb/gco/UnitAdapter.java  |   1 -
 .../sis/internal/jaxb/gco/UnlimitedInteger.java    |   1 -
 .../apache/sis/internal/jaxb/gco/package-info.java |  11 +-
 .../org/apache/sis/internal/jaxb/gcx/Anchor.java   |   1 -
 .../org/apache/sis/internal/jaxb/gcx/FileName.java |   3 +-
 .../apache/sis/internal/jaxb/gcx/MimeFileType.java |   3 +-
 .../sis/internal/jaxb/gcx/MimeFileTypeAdapter.java |   1 -
 .../apache/sis/internal/jaxb/gcx/package-info.java |   1 -
 .../sis/internal/jaxb/geometry/GM_Object.java      |   1 -
 .../sis/internal/jaxb/geometry/ObjectFactory.java  |   1 -
 .../sis/internal/jaxb/geometry/package-info.java   |   1 -
 .../sis/internal/jaxb/gmi/LE_ProcessStep.java      |   1 -
 .../apache/sis/internal/jaxb/gmi/LE_Source.java    |   1 -
 .../org/apache/sis/internal/jaxb/gmi/MI_Band.java  |   1 -
 .../internal/jaxb/gmi/MI_CoverageDescription.java  |   1 -
 .../sis/internal/jaxb/gmi/MI_Georectified.java     |   1 -
 .../sis/internal/jaxb/gmi/MI_Georeferenceable.java |   1 -
 .../sis/internal/jaxb/gmi/MI_ImageDescription.java |   1 -
 .../apache/sis/internal/jaxb/gmi/MI_Metadata.java  |   1 -
 .../apache/sis/internal/jaxb/gmi/package-info.java |   1 -
 .../sis/internal/jaxb/gml/CodeListAdapter.java     |   1 -
 .../apache/sis/internal/jaxb/gml/DateAdapter.java  |   7 +-
 .../apache/sis/internal/jaxb/gml/GMLAdapter.java   |   1 -
 .../org/apache/sis/internal/jaxb/gml/Measure.java  |  16 +-
 .../apache/sis/internal/jaxb/gml/MeasureList.java  |   1 -
 .../sis/internal/jaxb/gml/SC_VerticalCRS.java      |  27 ++-
 .../apache/sis/internal/jaxb/gml/TM_Primitive.java |   1 -
 .../apache/sis/internal/jaxb/gml/TimeInstant.java  |   1 -
 .../apache/sis/internal/jaxb/gml/TimePeriod.java   |   1 -
 .../sis/internal/jaxb/gml/TimePeriodBound.java     |   9 +-
 .../internal/jaxb/gml/UniversalTimeAdapter.java    |   1 -
 .../apache/sis/internal/jaxb/gml/package-info.java |   1 -
 .../apache/sis/internal/jaxb/gts/TM_Duration.java  |   1 -
 .../sis/internal/jaxb/gts/TM_PeriodDuration.java   |   1 -
 .../apache/sis/internal/jaxb/gts/package-info.java |   1 -
 .../org/apache/sis/internal/jaxb/lan/Country.java  |   3 +-
 .../apache/sis/internal/jaxb/lan/LanguageCode.java |   7 +-
 .../sis/internal/jaxb/lan/LocaleAdapter.java       |   6 +-
 .../sis/internal/jaxb/lan/LocaleAndCharset.java    |   6 +-
 .../jaxb/lan/LocalisedCharacterString.java         |   5 +-
 .../apache/sis/internal/jaxb/lan/OtherLocales.java |   1 -
 .../apache/sis/internal/jaxb/lan/PT_FreeText.java  |   3 +-
 .../apache/sis/internal/jaxb/lan/PT_Locale.java    |   3 +-
 .../apache/sis/internal/jaxb/lan/TextGroup.java    |  10 +-
 .../apache/sis/internal/jaxb/lan/package-info.java |   1 -
 .../sis/internal/jaxb/metadata/CI_Address.java     |   1 -
 .../sis/internal/jaxb/metadata/CI_Citation.java    |   1 -
 .../sis/internal/jaxb/metadata/CI_Contact.java     |   1 -
 .../apache/sis/internal/jaxb/metadata/CI_Date.java |   1 -
 .../internal/jaxb/metadata/CI_OnlineResource.java  |   1 -
 .../sis/internal/jaxb/metadata/CI_Party.java       |   1 -
 .../internal/jaxb/metadata/CI_Responsibility.java  |   1 -
 .../jaxb/metadata/CI_ResponsibleParty.java         |   1 -
 .../sis/internal/jaxb/metadata/CI_Series.java      |   1 -
 .../sis/internal/jaxb/metadata/CI_Telephone.java   |   1 -
 .../internal/jaxb/metadata/DQM_BasicMeasure.java   |   1 -
 .../internal/jaxb/metadata/DQM_Description.java    |   1 -
 .../sis/internal/jaxb/metadata/DQM_Measure.java    |   1 -
 .../sis/internal/jaxb/metadata/DQM_Parameter.java  |   1 -
 .../jaxb/metadata/DQM_SourceReference.java         |   1 -
 .../sis/internal/jaxb/metadata/DQ_DataQuality.java |   1 -
 .../sis/internal/jaxb/metadata/DQ_Element.java     |   1 -
 .../jaxb/metadata/DQ_EvaluationMethod.java         |   1 -
 .../jaxb/metadata/DQ_MeasureReference.java         |   1 -
 .../jaxb/metadata/DQ_PositionalAccuracy.java       |   1 -
 .../sis/internal/jaxb/metadata/DQ_Result.java      |   1 -
 .../DQ_StandaloneQualityReportInformation.java     |   1 -
 .../sis/internal/jaxb/metadata/EX_Extent.java      |   1 -
 .../jaxb/metadata/EX_GeographicExtent.java         |   1 -
 .../internal/jaxb/metadata/EX_TemporalExtent.java  |   1 -
 .../internal/jaxb/metadata/EX_VerticalExtent.java  |   1 -
 .../sis/internal/jaxb/metadata/LE_Algorithm.java   |   1 -
 .../jaxb/metadata/LE_NominalResolution.java        |   1 -
 .../jaxb/metadata/LE_ProcessStepReport.java        |   1 -
 .../sis/internal/jaxb/metadata/LE_Processing.java  |   1 -
 .../sis/internal/jaxb/metadata/LI_Lineage.java     |   1 -
 .../sis/internal/jaxb/metadata/LI_ProcessStep.java |   1 -
 .../sis/internal/jaxb/metadata/LI_Source.java      |   1 -
 .../jaxb/metadata/MD_AggregateInformation.java     |   1 -
 .../metadata/MD_ApplicationSchemaInformation.java  |   1 -
 .../jaxb/metadata/MD_AssociatedResource.java       |   1 -
 .../internal/jaxb/metadata/MD_AttributeGroup.java  |   1 -
 .../internal/jaxb/metadata/MD_BrowseGraphic.java   |   1 -
 .../sis/internal/jaxb/metadata/MD_Constraints.java |   1 -
 .../jaxb/metadata/MD_ContentInformation.java       |   1 -
 .../jaxb/metadata/MD_DataIdentification.java       |   1 -
 .../jaxb/metadata/MD_DigitalTransferOptions.java   |   1 -
 .../sis/internal/jaxb/metadata/MD_Dimension.java   |   1 -
 .../internal/jaxb/metadata/MD_Distribution.java    |   1 -
 .../sis/internal/jaxb/metadata/MD_Distributor.java |   1 -
 .../metadata/MD_ExtendedElementInformation.java    |   1 -
 .../internal/jaxb/metadata/MD_FeatureTypeInfo.java |   1 -
 .../sis/internal/jaxb/metadata/MD_Format.java      |   1 -
 .../jaxb/metadata/MD_GeometricObjects.java         |   1 -
 .../internal/jaxb/metadata/MD_Identification.java  |   1 -
 .../sis/internal/jaxb/metadata/MD_Identifier.java  |   1 -
 .../internal/jaxb/metadata/MD_KeywordClass.java    |   1 -
 .../sis/internal/jaxb/metadata/MD_Keywords.java    |   1 -
 .../jaxb/metadata/MD_MaintenanceInformation.java   |   1 -
 .../sis/internal/jaxb/metadata/MD_Medium.java      |   1 -
 .../sis/internal/jaxb/metadata/MD_Metadata.java    |   1 -
 .../metadata/MD_MetadataExtensionInformation.java  |   1 -
 .../internal/jaxb/metadata/MD_MetadataScope.java   |   1 -
 .../metadata/MD_PortrayalCatalogueReference.java   |   1 -
 .../internal/jaxb/metadata/MD_RangeDimension.java  |   1 -
 .../internal/jaxb/metadata/MD_Releasability.java   |   1 -
 .../jaxb/metadata/MD_RepresentativeFraction.java   |   1 -
 .../sis/internal/jaxb/metadata/MD_Resolution.java  |   1 -
 .../sis/internal/jaxb/metadata/MD_Scope.java       |   1 -
 .../jaxb/metadata/MD_ScopeDescription.java         |   1 -
 .../jaxb/metadata/MD_SpatialRepresentation.java    |   1 -
 .../jaxb/metadata/MD_StandardOrderProcess.java     |   1 -
 .../sis/internal/jaxb/metadata/MD_Usage.java       |   1 -
 .../jaxb/metadata/MI_AcquisitionInformation.java   |   1 -
 .../jaxb/metadata/MI_EnvironmentalRecord.java      |   1 -
 .../sis/internal/jaxb/metadata/MI_Event.java       |   1 -
 .../apache/sis/internal/jaxb/metadata/MI_GCP.java  |   1 -
 .../jaxb/metadata/MI_GeolocationInformation.java   |   1 -
 .../sis/internal/jaxb/metadata/MI_Instrument.java  |   1 -
 .../sis/internal/jaxb/metadata/MI_Objective.java   |   1 -
 .../sis/internal/jaxb/metadata/MI_Operation.java   |   1 -
 .../apache/sis/internal/jaxb/metadata/MI_Plan.java |   1 -
 .../sis/internal/jaxb/metadata/MI_Platform.java    |   1 -
 .../internal/jaxb/metadata/MI_PlatformPass.java    |   1 -
 .../jaxb/metadata/MI_RangeElementDescription.java  |   1 -
 .../internal/jaxb/metadata/MI_RequestedDate.java   |   1 -
 .../sis/internal/jaxb/metadata/MI_Requirement.java |   1 -
 .../sis/internal/jaxb/metadata/MX_DataFile.java    |   1 -
 .../internal/jaxb/metadata/RS_ReferenceSystem.java |   6 +-
 .../internal/jaxb/metadata/SV_CoupledResource.java |   1 -
 .../jaxb/metadata/SV_OperationChainMetadata.java   |   1 -
 .../jaxb/metadata/SV_OperationMetadata.java        |   1 -
 .../sis/internal/jaxb/metadata/SV_Parameter.java   |   1 -
 .../sis/internal/jaxb/metadata/package-info.java   |   5 +-
 .../internal/jaxb/metadata/replace/Parameter.java  |   1 -
 .../jaxb/metadata/replace/QualityParameter.java    |   1 -
 .../jaxb/metadata/replace/RS_Identifier.java       |   5 +-
 .../metadata/replace/ReferenceSystemMetadata.java  |   6 +-
 .../internal/jaxb/metadata/replace/SensorType.java |   1 -
 .../jaxb/metadata/replace/ServiceParameter.java    |   5 +-
 .../jaxb/metadata/replace/package-info.java        |   1 -
 .../org/apache/sis/internal/jaxb/package-info.java |   1 -
 .../apache/sis/internal/metadata/AxisNames.java    |   1 -
 .../apache/sis/internal/metadata/Dependencies.java |   1 -
 .../apache/sis/internal/metadata/ExcludedSet.java  |   1 -
 .../apache/sis/internal/metadata/Identifiers.java  |   1 -
 .../internal/metadata/ImplementationHelper.java    |   1 -
 .../org/apache/sis/internal/metadata/Merger.java   |   1 -
 .../sis/internal/metadata/MetadataTypes.java       |   1 -
 .../apache/sis/internal/metadata/NameMeaning.java  |   1 -
 .../sis/internal/metadata/NameToIdentifier.java    |   1 -
 .../sis/internal/metadata/RecordSchemaSIS.java     |   1 -
 .../sis/internal/metadata/ReferencingServices.java |   1 -
 .../apache/sis/internal/metadata/Resources.java    |   2 -
 .../sis/internal/metadata/ServicesForUtility.java  |   1 -
 .../internal/metadata/TransformationAccuracy.java  |   1 -
 .../internal/metadata/legacy/DateToTemporal.java   |   1 -
 .../metadata/legacy/LegacyPropertyAdapter.java     |   1 -
 .../sis/internal/metadata/legacy/MediumName.java   |   1 -
 .../internal/metadata/legacy/TemporalToDate.java   |   1 -
 .../sis/internal/metadata/legacy/package-info.java |   1 -
 .../apache/sis/internal/metadata/package-info.java |   1 -
 .../apache/sis/internal/metadata/sql/Dialect.java  |   1 -
 .../sis/internal/metadata/sql/Initializer.java     |   5 +-
 .../sis/internal/metadata/sql/LocalDataSource.java |   1 -
 .../sis/internal/metadata/sql/Reflection.java      |   1 -
 .../sis/internal/metadata/sql/SQLBuilder.java      |  15 +-
 .../sis/internal/metadata/sql/SQLUtilities.java    |   9 +-
 .../sis/internal/metadata/sql/ScriptRunner.java    |  17 +-
 .../apache/sis/internal/metadata/sql/Syntax.java   |   1 -
 .../sis/internal/metadata/sql/TypeMapper.java      |   1 -
 .../sis/internal/metadata/sql/package-info.java    |   9 +-
 .../sis/internal/simple/CitationConstant.java      |   1 -
 .../sis/internal/simple/SimpleAttributeType.java   |   1 -
 .../apache/sis/internal/simple/SimpleCitation.java |   1 -
 .../apache/sis/internal/simple/SimpleDuration.java |   1 -
 .../apache/sis/internal/simple/SimpleExtent.java   |   1 -
 .../apache/sis/internal/simple/SimpleFormat.java   |   1 -
 .../internal/simple/SimpleIdentifiedObject.java    |   1 -
 .../sis/internal/simple/SimpleIdentifier.java      |   1 -
 .../apache/sis/internal/simple/SimpleMetadata.java |   1 -
 .../apache/sis/internal/simple/package-info.java   |   1 -
 .../apache/sis/internal/xml/LegacyNamespaces.java  |   1 -
 .../sis/internal/xml/StreamWriterDelegate.java     |   1 -
 .../org/apache/sis/internal/xml/XmlUtilities.java  |   1 -
 .../org/apache/sis/internal/xml/package-info.java  |   1 -
 .../org/apache/sis/metadata/AbstractMetadata.java  |  29 +--
 .../java/org/apache/sis/metadata/CacheKey.java     |   1 -
 .../java/org/apache/sis/metadata/DomainRange.java  |   1 -
 .../java/org/apache/sis/metadata/HashCode.java     |   1 -
 .../java/org/apache/sis/metadata/IndexMap.java     |   1 -
 .../org/apache/sis/metadata/InformationMap.java    |   1 -
 .../sis/metadata/InvalidMetadataException.java     |   1 -
 .../org/apache/sis/metadata/KeyNamePolicy.java     |   1 -
 .../org/apache/sis/metadata/MetadataCopier.java    |   1 -
 .../org/apache/sis/metadata/MetadataFormat.java    |   1 -
 .../org/apache/sis/metadata/MetadataStandard.java  |  35 ++-
 .../org/apache/sis/metadata/MetadataVisitor.java   |   1 -
 .../sis/metadata/MetadataVisitorException.java     |   1 -
 .../apache/sis/metadata/ModifiableMetadata.java    |  14 +-
 .../main/java/org/apache/sis/metadata/NameMap.java |   1 -
 .../java/org/apache/sis/metadata/ObjectPair.java   |   1 -
 .../org/apache/sis/metadata/PropertyAccessor.java  |  15 +-
 .../apache/sis/metadata/PropertyComparator.java    |   1 -
 .../apache/sis/metadata/PropertyInformation.java   |   1 -
 .../java/org/apache/sis/metadata/PropertyMap.java  |   3 -
 .../main/java/org/apache/sis/metadata/Pruner.java  |   1 -
 .../java/org/apache/sis/metadata/SpecialCases.java |   1 -
 .../sis/metadata/StandardImplementation.java       |   1 -
 .../java/org/apache/sis/metadata/StateChanger.java |   1 -
 .../org/apache/sis/metadata/TitleProperty.java     |  15 +-
 .../java/org/apache/sis/metadata/TreeNode.java     |  15 +-
 .../org/apache/sis/metadata/TreeNodeChildren.java  |  15 +-
 .../org/apache/sis/metadata/TreeTableView.java     |   1 -
 .../main/java/org/apache/sis/metadata/TypeMap.java |   1 -
 .../org/apache/sis/metadata/TypeValuePolicy.java   |   1 -
 .../metadata/UnmodifiableMetadataException.java    |   1 -
 .../apache/sis/metadata/ValueExistencePolicy.java  |  27 +--
 .../java/org/apache/sis/metadata/ValueMap.java     |   4 -
 .../iso/DefaultApplicationSchemaInformation.java   |   1 -
 .../iso/DefaultExtendedElementInformation.java     |   1 -
 .../apache/sis/metadata/iso/DefaultIdentifier.java |   7 +-
 .../apache/sis/metadata/iso/DefaultMetadata.java   |   1 -
 .../iso/DefaultMetadataExtensionInformation.java   |   1 -
 .../sis/metadata/iso/DefaultMetadataScope.java     |   1 -
 .../iso/DefaultPortrayalCatalogueReference.java    |   1 -
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |   1 -
 .../sis/metadata/iso/MetadataScopeAdapter.java     |   1 -
 .../acquisition/DefaultAcquisitionInformation.java |   1 -
 .../acquisition/DefaultEnvironmentalRecord.java    |   1 -
 .../sis/metadata/iso/acquisition/DefaultEvent.java |   1 -
 .../iso/acquisition/DefaultInstrument.java         |   1 -
 .../metadata/iso/acquisition/DefaultObjective.java |   1 -
 .../metadata/iso/acquisition/DefaultOperation.java |   1 -
 .../sis/metadata/iso/acquisition/DefaultPlan.java  |   1 -
 .../metadata/iso/acquisition/DefaultPlatform.java  |   1 -
 .../iso/acquisition/DefaultPlatformPass.java       |   1 -
 .../iso/acquisition/DefaultRequestedDate.java      |   1 -
 .../iso/acquisition/DefaultRequirement.java        |   1 -
 .../sis/metadata/iso/acquisition/package-info.java |   1 -
 .../sis/metadata/iso/citation/AbstractParty.java   |   1 -
 .../sis/metadata/iso/citation/Citations.java       |   5 +-
 .../sis/metadata/iso/citation/DefaultAddress.java  |   1 -
 .../sis/metadata/iso/citation/DefaultCitation.java |  25 +--
 .../metadata/iso/citation/DefaultCitationDate.java |   1 -
 .../sis/metadata/iso/citation/DefaultContact.java  |   1 -
 .../metadata/iso/citation/DefaultIndividual.java   |   1 -
 .../iso/citation/DefaultOnlineResource.java        |   8 +-
 .../metadata/iso/citation/DefaultOrganisation.java |   1 -
 .../iso/citation/DefaultResponsibility.java        |   1 -
 .../iso/citation/DefaultResponsibleParty.java      |   1 -
 .../sis/metadata/iso/citation/DefaultSeries.java   |   1 -
 .../metadata/iso/citation/DefaultTelephone.java    |   1 -
 .../metadata/iso/citation/LegacyTelephones.java    |   1 -
 .../sis/metadata/iso/citation/package-info.java    |   1 -
 .../iso/constraint/DefaultConstraints.java         |   1 -
 .../iso/constraint/DefaultLegalConstraints.java    |   1 -
 .../iso/constraint/DefaultReleasability.java       |   1 -
 .../iso/constraint/DefaultSecurityConstraints.java |   1 -
 .../sis/metadata/iso/constraint/package-info.java  |   1 -
 .../iso/content/AbstractContentInformation.java    |   1 -
 .../iso/content/DefaultAttributeGroup.java         |   1 -
 .../sis/metadata/iso/content/DefaultBand.java      |   1 -
 .../iso/content/DefaultCoverageDescription.java    |   1 -
 .../DefaultFeatureCatalogueDescription.java        |   1 -
 .../iso/content/DefaultFeatureTypeInfo.java        |   1 -
 .../iso/content/DefaultImageDescription.java       |   1 -
 .../iso/content/DefaultRangeDimension.java         |   1 -
 .../content/DefaultRangeElementDescription.java    |   1 -
 .../iso/content/DefaultSampleDimension.java        |   1 -
 .../sis/metadata/iso/content/package-info.java     |   1 -
 .../metadata/iso/distribution/DefaultDataFile.java |   1 -
 .../DefaultDigitalTransferOptions.java             |   1 -
 .../iso/distribution/DefaultDistribution.java      |   1 -
 .../iso/distribution/DefaultDistributor.java       |   1 -
 .../metadata/iso/distribution/DefaultFormat.java   |   1 -
 .../metadata/iso/distribution/DefaultMedium.java   |   1 -
 .../distribution/DefaultStandardOrderProcess.java  |   1 -
 .../metadata/iso/distribution/package-info.java    |   1 -
 .../iso/extent/AbstractGeographicExtent.java       |   1 -
 .../iso/extent/DefaultBoundingPolygon.java         |   1 -
 .../sis/metadata/iso/extent/DefaultExtent.java     |   1 -
 .../iso/extent/DefaultGeographicBoundingBox.java   |   1 -
 .../iso/extent/DefaultGeographicDescription.java   |   1 -
 .../iso/extent/DefaultSpatialTemporalExtent.java   |   1 -
 .../metadata/iso/extent/DefaultTemporalExtent.java |   1 -
 .../metadata/iso/extent/DefaultVerticalExtent.java |   1 -
 .../apache/sis/metadata/iso/extent/Extents.java    |   5 +-
 .../sis/metadata/iso/extent/package-info.java      |   1 -
 .../iso/identification/AbstractIdentification.java |   1 -
 .../DefaultAggregateInformation.java               |   1 -
 .../identification/DefaultAssociatedResource.java  |   1 -
 .../iso/identification/DefaultBrowseGraphic.java   |   1 -
 .../iso/identification/DefaultCoupledResource.java |   1 -
 .../identification/DefaultDataIdentification.java  |   1 -
 .../iso/identification/DefaultKeywordClass.java    |   1 -
 .../iso/identification/DefaultKeywords.java        |   1 -
 .../DefaultOperationChainMetadata.java             |   1 -
 .../identification/DefaultOperationMetadata.java   |   1 -
 .../DefaultRepresentativeFraction.java             |   7 +-
 .../iso/identification/DefaultResolution.java      |   1 -
 .../DefaultServiceIdentification.java              |   1 -
 .../metadata/iso/identification/DefaultUsage.java  |   1 -
 .../metadata/iso/identification/OperationName.java |   1 -
 .../metadata/iso/identification/package-info.java  |   1 -
 .../sis/metadata/iso/lineage/DefaultAlgorithm.java |   1 -
 .../sis/metadata/iso/lineage/DefaultLineage.java   |   1 -
 .../iso/lineage/DefaultNominalResolution.java      |   1 -
 .../metadata/iso/lineage/DefaultProcessStep.java   |   1 -
 .../iso/lineage/DefaultProcessStepReport.java      |   1 -
 .../metadata/iso/lineage/DefaultProcessing.java    |   1 -
 .../sis/metadata/iso/lineage/DefaultSource.java    |   1 -
 .../sis/metadata/iso/lineage/package-info.java     |   1 -
 .../maintenance/DefaultMaintenanceInformation.java |   1 -
 .../sis/metadata/iso/maintenance/DefaultScope.java |   1 -
 .../iso/maintenance/DefaultScopeDescription.java   |   1 -
 .../sis/metadata/iso/maintenance/package-info.java |   1 -
 .../org/apache/sis/metadata/iso/package-info.java  |   1 -
 .../metadata/iso/quality/AbstractCompleteness.java |   1 -
 .../iso/quality/AbstractDataEvaluation.java        |   1 -
 .../sis/metadata/iso/quality/AbstractElement.java  |   1 -
 .../iso/quality/AbstractLogicalConsistency.java    |   1 -
 .../metadata/iso/quality/AbstractMetaquality.java  |   1 -
 .../iso/quality/AbstractPositionalAccuracy.java    |   1 -
 .../sis/metadata/iso/quality/AbstractResult.java   |   1 -
 .../iso/quality/AbstractTemporalAccuracy.java      |   1 -
 .../iso/quality/AbstractTemporalQuality.java       |   1 -
 .../iso/quality/AbstractThematicAccuracy.java      |   1 -
 .../DefaultAbsoluteExternalPositionalAccuracy.java |   1 -
 .../quality/DefaultAccuracyOfATimeMeasurement.java |   1 -
 .../iso/quality/DefaultAggregationDerivation.java  |   1 -
 .../metadata/iso/quality/DefaultBasicMeasure.java  |   1 -
 .../iso/quality/DefaultCompletenessCommission.java |   1 -
 .../iso/quality/DefaultCompletenessOmission.java   |   1 -
 .../iso/quality/DefaultConceptualConsistency.java  |   1 -
 .../metadata/iso/quality/DefaultConfidence.java    |   1 -
 .../iso/quality/DefaultConformanceResult.java      |   1 -
 .../iso/quality/DefaultCoverageResult.java         |   1 -
 .../metadata/iso/quality/DefaultDataQuality.java   |   1 -
 .../iso/quality/DefaultDescriptiveResult.java      |   1 -
 .../iso/quality/DefaultDomainConsistency.java      |   1 -
 .../iso/quality/DefaultEvaluationMethod.java       |   1 -
 .../DefaultEvaluationReportInformation.java        |   1 -
 .../iso/quality/DefaultFormatConsistency.java      |   1 -
 .../iso/quality/DefaultFullInspection.java         |   1 -
 .../DefaultGriddedDataPositionalAccuracy.java      |   1 -
 .../metadata/iso/quality/DefaultHomogeneity.java   |   1 -
 .../iso/quality/DefaultIndirectEvaluation.java     |   1 -
 .../iso/quality/DefaultMeasureDescription.java     |   1 -
 .../iso/quality/DefaultMeasureReference.java       |   1 -
 .../DefaultNonQuantitativeAttributeAccuracy.java   |   1 -
 ...DefaultNonQuantitativeAttributeCorrectness.java |   1 -
 .../iso/quality/DefaultQualityMeasure.java         |   1 -
 .../DefaultQuantitativeAttributeAccuracy.java      |   1 -
 .../iso/quality/DefaultQuantitativeResult.java     |   1 -
 .../DefaultRelativeInternalPositionalAccuracy.java |   1 -
 .../iso/quality/DefaultRepresentativity.java       |   1 -
 .../iso/quality/DefaultSampleBasedInspection.java  |   1 -
 .../sis/metadata/iso/quality/DefaultScope.java     |   1 -
 .../iso/quality/DefaultSourceReference.java        |   1 -
 .../iso/quality/DefaultTemporalConsistency.java    |   1 -
 .../iso/quality/DefaultTemporalValidity.java       |   1 -
 .../DefaultThematicClassificationCorrectness.java  |   1 -
 .../iso/quality/DefaultTopologicalConsistency.java |   1 -
 .../sis/metadata/iso/quality/DefaultUsability.java |   1 -
 .../sis/metadata/iso/quality/ISOMetadata.java      |   1 -
 .../sis/metadata/iso/quality/package-info.java     |   1 -
 .../spatial/AbstractGeolocationInformation.java    |   1 -
 .../iso/spatial/AbstractSpatialRepresentation.java |   1 -
 .../sis/metadata/iso/spatial/DefaultDimension.java |   1 -
 .../sis/metadata/iso/spatial/DefaultGCP.java       |   1 -
 .../metadata/iso/spatial/DefaultGCPCollection.java |   1 -
 .../iso/spatial/DefaultGeometricObjects.java       |   1 -
 .../metadata/iso/spatial/DefaultGeorectified.java  |   1 -
 .../iso/spatial/DefaultGeoreferenceable.java       |   1 -
 .../spatial/DefaultGridSpatialRepresentation.java  |   1 -
 .../DefaultVectorSpatialRepresentation.java        |   1 -
 .../sis/metadata/iso/spatial/package-info.java     |   1 -
 .../java/org/apache/sis/metadata/package-info.java |   1 -
 .../java/org/apache/sis/metadata/sql/CacheKey.java |   1 -
 .../apache/sis/metadata/sql/CachedStatement.java   |   1 -
 .../org/apache/sis/metadata/sql/Dispatcher.java    |   1 -
 .../sis/metadata/sql/IdentifierGenerator.java      |   1 -
 .../org/apache/sis/metadata/sql/Installer.java     |   1 -
 .../org/apache/sis/metadata/sql/LookupInfo.java    |   1 -
 .../apache/sis/metadata/sql/MetadataFallback.java  |   1 -
 .../org/apache/sis/metadata/sql/MetadataProxy.java |   1 -
 .../apache/sis/metadata/sql/MetadataSource.java    |  13 +-
 .../sis/metadata/sql/MetadataStoreException.java   |   1 -
 .../apache/sis/metadata/sql/MetadataWriter.java    |   5 +-
 .../apache/sis/metadata/sql/TableHierarchy.java    |   1 -
 .../org/apache/sis/metadata/sql/package-info.java  |   1 -
 .../org/apache/sis/util/iso/AbstractFactory.java   |   1 -
 .../java/org/apache/sis/util/iso/AbstractName.java |   2 -
 .../org/apache/sis/util/iso/DefaultLocalName.java  |   9 +-
 .../org/apache/sis/util/iso/DefaultMemberName.java |   1 -
 .../apache/sis/util/iso/DefaultNameFactory.java    |   1 -
 .../org/apache/sis/util/iso/DefaultNameSpace.java  |  11 +-
 .../org/apache/sis/util/iso/DefaultRecord.java     |  17 +-
 .../apache/sis/util/iso/DefaultRecordSchema.java   |   1 -
 .../org/apache/sis/util/iso/DefaultRecordType.java |  34 ++-
 .../org/apache/sis/util/iso/DefaultScopedName.java |   1 -
 .../org/apache/sis/util/iso/DefaultTypeName.java   |   1 -
 .../org/apache/sis/util/iso/GlobalNameSpace.java   |   1 -
 .../main/java/org/apache/sis/util/iso/Names.java   |   1 -
 .../org/apache/sis/util/iso/RecordDefinition.java  |   1 -
 .../java/org/apache/sis/util/iso/TypeNames.java    |   1 -
 .../main/java/org/apache/sis/util/iso/Types.java   |  30 +--
 .../java/org/apache/sis/util/iso/package-info.java |   1 -
 .../java/org/apache/sis/xml/IdentifiedObject.java  |   5 +-
 .../java/org/apache/sis/xml/IdentifierMap.java     |   1 -
 .../java/org/apache/sis/xml/IdentifierSpace.java   |   5 +-
 .../java/org/apache/sis/xml/Implementation.java    |   1 -
 .../main/java/org/apache/sis/xml/InputFactory.java |   1 -
 .../main/java/org/apache/sis/xml/LegacyCodes.java  |   1 -
 .../java/org/apache/sis/xml/MarshalContext.java    |   1 -
 .../java/org/apache/sis/xml/MarshallerPool.java    |  13 +-
 .../main/java/org/apache/sis/xml/Namespaces.java   |   1 -
 .../org/apache/sis/xml/NilInternationalString.java |   1 -
 .../main/java/org/apache/sis/xml/NilObject.java    |  13 +-
 .../java/org/apache/sis/xml/NilObjectHandler.java  |   1 -
 .../main/java/org/apache/sis/xml/NilReason.java    |   1 -
 .../java/org/apache/sis/xml/OutputFactory.java     |   1 -
 .../src/main/java/org/apache/sis/xml/Pooled.java   |   5 +-
 .../java/org/apache/sis/xml/PooledMarshaller.java  |   1 -
 .../java/org/apache/sis/xml/PooledTemplate.java    |   1 -
 .../org/apache/sis/xml/PooledUnmarshaller.java     |   1 -
 .../java/org/apache/sis/xml/ReferenceResolver.java |   1 -
 .../java/org/apache/sis/xml/TransformVersion.java  |   1 -
 .../java/org/apache/sis/xml/TransformedEvent.java  |   1 -
 .../main/java/org/apache/sis/xml/Transformer.java  |  14 +-
 .../org/apache/sis/xml/TransformingNamespaces.java |   1 -
 .../org/apache/sis/xml/TransformingReader.java     |   1 -
 .../org/apache/sis/xml/TransformingWriter.java     |   1 -
 .../java/org/apache/sis/xml/ValueConverter.java    |  27 ++-
 .../src/main/java/org/apache/sis/xml/XLink.java    |   8 +-
 .../src/main/java/org/apache/sis/xml/XML.java      |  18 +-
 .../src/main/java/org/apache/sis/xml/XPointer.java |   1 -
 .../main/java/org/apache/sis/xml/package-info.java |   9 +-
 .../internal/jaxb/IdentifierMapAdapterTest.java    |   3 +-
 .../internal/jaxb/ModifiableIdentifierMapTest.java |   3 +-
 .../internal/jaxb/cat/CodeListMarshallingTest.java |   3 +-
 .../sis/internal/jaxb/cat/EnumAdapterTest.java     |   3 +-
 .../sis/internal/jaxb/cat/EnumMarshallingTest.java |   3 +-
 .../sis/internal/jaxb/gco/MultiplicityTest.java    |   3 +-
 .../sis/internal/jaxb/gco/PropertyTypeMock.java    |   3 +-
 .../sis/internal/jaxb/gco/PropertyTypeTest.java    |   3 +-
 .../sis/internal/jaxb/gco/StringAdapterTest.java   |   3 +-
 .../apache/sis/internal/jaxb/gml/MeasureTest.java  |   9 +-
 .../sis/internal/jaxb/gml/TimePeriodTest.java      |   3 +-
 .../internal/jaxb/lan/FreeTextMarshallingTest.java |   3 +-
 .../sis/internal/jaxb/lan/LanguageCodeTest.java    |  19 +-
 .../sis/internal/jaxb/lan/OtherLocalesTest.java    |   3 +-
 .../sis/internal/jaxb/lan/PT_LocaleTest.java       |   3 +-
 .../metadata/replace/QualityParameterTest.java     |   3 +-
 .../metadata/replace/ServiceParameterTest.java     |   3 +-
 .../sis/internal/metadata/AxisNamesTest.java       |   3 +-
 .../sis/internal/metadata/IdentifiersTest.java     |   3 +-
 .../metadata/ImplementationHelperTest.java         |   3 +-
 .../apache/sis/internal/metadata/MergerTest.java   |   3 +-
 .../sis/internal/metadata/NameMeaningTest.java     |   3 +-
 .../internal/metadata/sql/SQLUtilitiesTest.java    |   3 +-
 .../internal/metadata/sql/ScriptRunnerTest.java    |   3 +-
 .../sis/internal/metadata/sql/TypeMapperTest.java  |   3 +-
 .../sis/internal/simple/SimpleIdentifierTest.java  |   3 +-
 .../sis/internal/test/DocumentComparatorTest.java  |   3 +-
 .../apache/sis/internal/xml/XmlUtilitiesTest.java  |   3 +-
 .../apache/sis/metadata/AbstractMetadataTest.java  |   8 +-
 .../java/org/apache/sis/metadata/HashCodeTest.java |   3 +-
 .../apache/sis/metadata/InformationMapTest.java    |   3 +-
 .../apache/sis/metadata/MetadataCopierTest.java    |   3 +-
 .../apache/sis/metadata/MetadataStandardTest.java  |   3 +-
 .../sis/metadata/ModifiableMetadataTest.java       |   3 +-
 .../java/org/apache/sis/metadata/NameMapTest.java  |   3 +-
 .../apache/sis/metadata/PropertyAccessorTest.java  |  43 ++--
 .../sis/metadata/PropertyConsistencyCheck.java     |   3 +-
 .../sis/metadata/PropertyInformationTest.java      |   3 +-
 .../java/org/apache/sis/metadata/PrunerTest.java   |   3 +-
 .../org/apache/sis/metadata/SpecialCasesTest.java  |   3 +-
 .../apache/sis/metadata/TreeNodeChildrenTest.java  |  28 +--
 .../java/org/apache/sis/metadata/TreeNodeTest.java |   8 +-
 .../apache/sis/metadata/TreeTableFormatTest.java   |   3 +-
 .../org/apache/sis/metadata/TreeTableViewTest.java |   3 +-
 .../java/org/apache/sis/metadata/TypeMapTest.java  |   3 +-
 .../java/org/apache/sis/metadata/ValueMapTest.java |  33 ++-
 .../org/apache/sis/metadata/iso/APIVerifier.java   |   3 +-
 .../apache/sis/metadata/iso/AllMetadataTest.java   |   3 +-
 .../sis/metadata/iso/CustomMetadataTest.java       |   3 +-
 .../sis/metadata/iso/DefaultIdentifierTest.java    |   3 +-
 .../sis/metadata/iso/DefaultMetadataTest.java      |   3 +-
 .../apache/sis/metadata/iso/MarshallingTest.java   |   1 -
 .../sis/metadata/iso/citation/CitationsTest.java   |   3 +-
 .../iso/citation/DefaultCitationDateTest.java      |   3 +-
 .../metadata/iso/citation/DefaultCitationTest.java |   3 +-
 .../metadata/iso/citation/DefaultContactTest.java  |   3 +-
 .../iso/citation/DefaultResponsibilityTest.java    |   3 +-
 .../metadata/iso/citation/HardCodedCitations.java  |  10 +-
 .../constraint/DefaultLegalConstraintsTest.java    |   3 +-
 .../sis/metadata/iso/content/DefaultBandTest.java  |   3 +-
 .../sis/metadata/iso/extent/DefaultExtentTest.java |   3 +-
 .../extent/DefaultGeographicBoundingBoxTest.java   |   3 +-
 .../sis/metadata/iso/extent/ExtentsTest.java       |   3 +-
 .../identification/DefaultBrowseGraphicTest.java   |   3 +-
 .../identification/DefaultCoupledResourceTest.java |   3 +-
 .../DefaultDataIdentificationTest.java             |   3 +-
 .../iso/identification/DefaultKeywordsTest.java    |   3 +-
 .../DefaultRepresentativeFractionTest.java         |   3 +-
 .../iso/identification/DefaultResolutionTest.java  |  11 +-
 .../DefaultServiceIdentificationTest.java          |   3 +-
 .../metadata/iso/lineage/DefaultLineageTest.java   |   3 +-
 .../iso/lineage/DefaultProcessStepTest.java        |   3 +-
 .../maintenance/DefaultScopeDescriptionTest.java   |   3 +-
 .../metadata/iso/quality/AbstractElementTest.java  |   3 +-
 .../quality/AbstractPositionalAccuracyTest.java    |   3 +-
 .../iso/quality/DefaultDomainConsistencyTest.java  |   3 +-
 .../iso/quality/DefaultEvaluationMethodTest.java   |   3 +-
 .../iso/quality/DefaultQuantitativeResultTest.java |   8 +-
 .../sis/metadata/iso/quality/ScopeCodeTest.java    |   3 +-
 .../iso/spatial/DefaultGeorectifiedTest.java       |   3 +-
 .../sis/metadata/sql/IdentifierGeneratorTest.java  |   3 +-
 .../sis/metadata/sql/MetadataFallbackVerifier.java |   3 +-
 .../sis/metadata/sql/MetadataSourceTest.java       |   3 +-
 .../sis/metadata/sql/MetadataWriterTest.java       |  15 +-
 .../sis/metadata/xml/SchemaComplianceTest.java     |   3 +-
 .../org/apache/sis/metadata/xml/TestUsingFile.java |   3 +-
 .../java/org/apache/sis/test/MetadataAssert.java   |   7 +-
 .../sis/test/mock/CoordinateSystemAxisMock.java    |   3 +-
 .../apache/sis/test/mock/FeatureAttributeMock.java |   1 -
 .../apache/sis/test/mock/IdentifiedObjectMock.java |   3 +-
 .../org/apache/sis/test/mock/MetadataMock.java     |   3 +-
 .../org/apache/sis/test/mock/VerticalCRSMock.java  |   3 +-
 .../org/apache/sis/test/mock/package-info.java     |   1 -
 .../java/org/apache/sis/test/sql/TestDatabase.java |  13 +-
 .../java/org/apache/sis/test/sql/package-info.java |   1 -
 .../apache/sis/test/suite/MetadataTestSuite.java   |   3 +-
 .../sis/test/xml/AnnotationConsistencyCheck.java   |   7 +-
 .../apache/sis/test/xml/DocumentComparator.java    |   8 +-
 .../java/org/apache/sis/test/xml/InfiniteSet.java  |   1 -
 .../org/apache/sis/test/xml/PackageVerifier.java   |   3 +-
 .../org/apache/sis/test/xml/SchemaCompliance.java  |   3 +-
 .../java/org/apache/sis/test/xml/TestCase.java     |   3 +-
 .../java/org/apache/sis/test/xml/package-info.java |   1 -
 .../apache/sis/util/iso/DefaultLocalNameTest.java  |   3 +-
 .../sis/util/iso/DefaultNameFactoryTest.java       |   3 +-
 .../sis/util/iso/DefaultRecordSchemaTest.java      |   3 +-
 .../org/apache/sis/util/iso/DefaultRecordTest.java |   3 +-
 .../apache/sis/util/iso/DefaultRecordTypeTest.java |   3 +-
 .../apache/sis/util/iso/DefaultScopedNameTest.java |   3 +-
 .../apache/sis/util/iso/NameMarshallingTest.java   |   3 +-
 .../java/org/apache/sis/util/iso/NamesTest.java    |   3 +-
 .../sis/util/iso/SerializableRecordSchema.java     |   1 -
 .../org/apache/sis/util/iso/TypeNamesTest.java     |   3 +-
 .../java/org/apache/sis/util/iso/TypesTest.java    |   3 +-
 .../sis/xml/CharSequenceSubstitutionTest.java      |   3 +-
 .../java/org/apache/sis/xml/LegacyCodesTest.java   |   3 +-
 .../org/apache/sis/xml/MarshallerPoolTest.java     |   3 +-
 .../java/org/apache/sis/xml/NamespacesTest.java    |   3 +-
 .../apache/sis/xml/NilReasonMarshallingTest.java   |   3 +-
 .../java/org/apache/sis/xml/NilReasonTest.java     |   3 +-
 .../org/apache/sis/xml/ReferenceResolverMock.java  |   7 +-
 .../org/apache/sis/xml/RenameListGenerator.java    |   7 +-
 .../java/org/apache/sis/xml/TransformerTest.java   |   3 +-
 .../apache/sis/xml/TransformingNamespacesTest.java |   3 +-
 .../org/apache/sis/xml/UUIDMarshallingTest.java    |  11 +-
 .../org/apache/sis/xml/ValueConverterTest.java     |   3 +-
 .../org/apache/sis/xml/XLinkMarshallingTest.java   |  11 +-
 .../test/java/org/apache/sis/xml/XLinkTest.java    |   3 +-
 .../test/java/org/apache/sis/xml/XPointerTest.java |   3 +-
 .../sis/internal/map/ExceptionPresentation.java    |   1 -
 .../org/apache/sis/internal/map/Presentation.java  |   1 -
 .../sis/internal/map/PropertyNameCollector.java    |   1 -
 .../sis/internal/map/ResourceSymbolizer.java       |   1 -
 .../org/apache/sis/internal/map/SEPortrayer.java   |   1 -
 .../apache/sis/internal/map/SEPresentation.java    |   1 -
 .../apache/sis/internal/map/SymbologyVisitor.java  |   1 -
 .../coverage/MultiResolutionCoverageLoader.java    |   1 -
 .../sis/internal/map/coverage/RenderingData.java   |   1 -
 .../internal/map/coverage/RenderingWorkaround.java |   1 -
 .../sis/internal/map/coverage/package-info.java    |   1 -
 .../org/apache/sis/internal/map/package-info.java  |   1 -
 .../main/java/org/apache/sis/portrayal/Canvas.java |   1 -
 .../org/apache/sis/portrayal/CanvasContext.java    |   1 -
 .../org/apache/sis/portrayal/CanvasExtent.java     |   1 -
 .../org/apache/sis/portrayal/CanvasFollower.java   |   5 +-
 .../java/org/apache/sis/portrayal/MapItem.java     |   1 -
 .../java/org/apache/sis/portrayal/MapLayer.java    |   1 -
 .../java/org/apache/sis/portrayal/MapLayers.java   |   1 -
 .../java/org/apache/sis/portrayal/Observable.java  |   1 -
 .../org/apache/sis/portrayal/PlanarCanvas.java     |   1 -
 .../org/apache/sis/portrayal/RenderException.java  |   1 -
 .../apache/sis/portrayal/TransformChangeEvent.java |   1 -
 .../org/apache/sis/portrayal/package-info.java     |   1 -
 .../MultiResolutionCoverageLoaderTest.java         |   3 +-
 .../apache/sis/test/suite/PortrayalTestSuite.java  |   3 +-
 .../apache/sis/internal/gazetteer/Resources.java   |   2 -
 .../referencing/gazetteer/AbstractLocation.java    |   1 -
 .../gazetteer/AbstractLocationType.java            |  10 +-
 .../referencing/gazetteer/FinalLocationType.java   |   1 -
 .../referencing/gazetteer/GazetteerException.java  |   1 -
 .../referencing/gazetteer/GazetteerFactory.java    |   1 -
 .../gazetteer/GeohashReferenceSystem.java          |   2 -
 .../sis/referencing/gazetteer/LocationFormat.java  |  11 +-
 .../gazetteer/MilitaryGridReferenceSystem.java     |  34 ++-
 .../gazetteer/ModifiableLocationType.java          |  45 ++--
 .../gazetteer/ReferenceVerifyException.java        |   1 -
 .../gazetteer/ReferencingByIdentifiers.java        |   6 +-
 .../sis/referencing/gazetteer/SimpleLocation.java  |   2 -
 .../sis/referencing/gazetteer/package-info.java    |   1 -
 .../gazetteer/GazetteerFactoryTest.java            |   3 +-
 .../gazetteer/GeohashReferenceSystemTest.java      |   3 +-
 .../referencing/gazetteer/LocationFormatTest.java  |   3 +-
 .../referencing/gazetteer/LocationTypeTest.java    |   3 +-
 .../sis/referencing/gazetteer/LocationViewer.java  |   1 -
 .../gazetteer/MilitaryGridReferenceSystemTest.java |   3 +-
 .../gazetteer/ReferencingByIdentifiersTest.java    |   3 +-
 .../suite/ReferencingByIdentifiersTestSuite.java   |   3 +-
 .../sis/geometry/AbstractDirectPosition.java       |   9 +-
 .../org/apache/sis/geometry/AbstractEnvelope.java  |  14 +-
 .../org/apache/sis/geometry/ArrayEnvelope.java     |   7 +-
 .../org/apache/sis/geometry/CoordinateFormat.java  |   1 -
 .../org/apache/sis/geometry/CurveExtremum.java     |   1 -
 .../org/apache/sis/geometry/DirectPosition1D.java  |  11 +-
 .../org/apache/sis/geometry/DirectPosition2D.java  |  11 +-
 .../java/org/apache/sis/geometry/Envelope2D.java   |   5 +-
 .../org/apache/sis/geometry/EnvelopeReducer.java   |   1 -
 .../java/org/apache/sis/geometry/Envelopes.java    |   1 -
 .../apache/sis/geometry/GeneralDirectPosition.java |   7 +-
 .../org/apache/sis/geometry/GeneralEnvelope.java   |  29 ++-
 .../org/apache/sis/geometry/ImmutableEnvelope.java |   7 +-
 .../java/org/apache/sis/geometry/Shapes2D.java     |   1 -
 .../java/org/apache/sis/geometry/SubEnvelope.java  |   1 -
 .../apache/sis/geometry/WraparoundAdjustment.java  |   1 -
 .../apache/sis/geometry/WraparoundInEnvelope.java  |   6 +-
 .../org/apache/sis/geometry/WraparoundMethod.java  |  21 +-
 .../java/org/apache/sis/geometry/package-info.java |   1 -
 .../internal/jaxb/referencing/CC_Conversion.java   |   1 -
 .../jaxb/referencing/CC_CoordinateOperation.java   |   1 -
 .../referencing/CC_GeneralOperationParameter.java  |   1 -
 .../jaxb/referencing/CC_GeneralParameterValue.java |   1 -
 .../jaxb/referencing/CC_OperationMethod.java       |   1 -
 .../jaxb/referencing/CC_OperationParameter.java    |   1 -
 .../referencing/CC_OperationParameterGroup.java    |   1 -
 .../internal/jaxb/referencing/CD_Ellipsoid.java    |   1 -
 .../jaxb/referencing/CD_EngineeringDatum.java      |   1 -
 .../jaxb/referencing/CD_GeodeticDatum.java         |   1 -
 .../internal/jaxb/referencing/CD_ImageDatum.java   |   1 -
 .../jaxb/referencing/CD_ParametricDatum.java       |   1 -
 .../internal/jaxb/referencing/CD_PixelInCell.java  |   1 -
 .../jaxb/referencing/CD_PrimeMeridian.java         |   1 -
 .../jaxb/referencing/CD_TemporalDatum.java         |   1 -
 .../jaxb/referencing/CD_VerticalDatum.java         |   1 -
 .../jaxb/referencing/CD_VerticalDatumType.java     |   1 -
 .../sis/internal/jaxb/referencing/CS_AffineCS.java |   1 -
 .../jaxb/referencing/CS_AxisDirection.java         |   1 -
 .../internal/jaxb/referencing/CS_CartesianCS.java  |   1 -
 .../jaxb/referencing/CS_CoordinateSystem.java      |   1 -
 .../jaxb/referencing/CS_CoordinateSystemAxis.java  |   1 -
 .../jaxb/referencing/CS_CylindricalCS.java         |   1 -
 .../jaxb/referencing/CS_EllipsoidalCS.java         |   1 -
 .../sis/internal/jaxb/referencing/CS_LinearCS.java |   1 -
 .../internal/jaxb/referencing/CS_ParametricCS.java |   1 -
 .../sis/internal/jaxb/referencing/CS_PolarCS.java  |   1 -
 .../internal/jaxb/referencing/CS_RangeMeaning.java |   1 -
 .../internal/jaxb/referencing/CS_SphericalCS.java  |   1 -
 .../sis/internal/jaxb/referencing/CS_TimeCS.java   |   1 -
 .../jaxb/referencing/CS_UserDefinedCS.java         |   1 -
 .../internal/jaxb/referencing/CS_VerticalCS.java   |   1 -
 .../apache/sis/internal/jaxb/referencing/Code.java |   1 -
 .../internal/jaxb/referencing/RS_Identifier.java   |   7 +-
 .../sis/internal/jaxb/referencing/SC_CRS.java      |   1 -
 .../jaxb/referencing/SC_DerivedCRSType.java        |   1 -
 .../internal/jaxb/referencing/SC_SingleCRS.java    |   1 -
 .../internal/jaxb/referencing/SC_VerticalCRS.java  |   1 -
 .../jaxb/referencing/SecondDefiningParameter.java  |   5 +-
 .../internal/jaxb/referencing/package-info.java    |   1 -
 .../sis/internal/referencing/AnnotatedMatrix.java  |   1 -
 .../sis/internal/referencing/AxesMapper.java       |   1 -
 .../sis/internal/referencing/AxisDirections.java   |   1 -
 .../internal/referencing/CoordinateOperations.java |   6 +-
 .../sis/internal/referencing/DatabaseListener.java |   5 +-
 .../referencing/DeferredCoordinateOperation.java   |   1 -
 .../internal/referencing/DefinitionVerifier.java   |   1 -
 .../sis/internal/referencing/DeprecatedCode.java   |   1 -
 .../sis/internal/referencing/DeprecatedName.java   |   1 -
 .../internal/referencing/DirectPositionView.java   |   1 -
 .../internal/referencing/EPSGParameterDomain.java  |   1 -
 .../referencing/EllipsoidalHeightCombiner.java     |   1 -
 .../referencing/ExtendedPrecisionMatrix.java       |   1 -
 .../sis/internal/referencing/ExtentSelector.java   |   5 +-
 .../apache/sis/internal/referencing/Formulas.java  |   5 +-
 .../referencing/GeodeticObjectBuilder.java         |  36 ++-
 .../apache/sis/internal/referencing/LazySet.java   |   1 -
 .../apache/sis/internal/referencing/Legacy.java    |   5 +-
 .../referencing/MathTransformsOrFactory.java       |   1 -
 .../sis/internal/referencing/MergedProperties.java |   1 -
 .../internal/referencing/NilReferencingObject.java |   1 -
 .../internal/referencing/PositionTransformer.java  |   5 +-
 .../referencing/PositionalAccuracyConstant.java    |   1 -
 .../apache/sis/internal/referencing/RTreeNode.java |   1 -
 .../referencing/ReferencingFactoryContainer.java   |   1 -
 .../sis/internal/referencing/ReferencingTypes.java |   1 -
 .../internal/referencing/ReferencingUtilities.java |   1 -
 .../apache/sis/internal/referencing/Resources.java |   2 -
 .../internal/referencing/ServicesForMetadata.java  |   1 -
 .../internal/referencing/SignReversalComment.java  |   1 -
 .../sis/internal/referencing/TemporalAccessor.java |   1 -
 .../internal/referencing/VerticalDatumTypes.java   |   1 -
 .../sis/internal/referencing/WKTKeywords.java      |   1 -
 .../sis/internal/referencing/WKTUtilities.java     |   1 -
 .../internal/referencing/WraparoundApplicator.java |   1 -
 .../internal/referencing/WraparoundAxesFinder.java |   1 -
 .../internal/referencing/j2d/AbstractShape.java    |   1 -
 .../sis/internal/referencing/j2d/AffineMatrix.java |   1 -
 .../referencing/j2d/AffineTransform2D.java         |   1 -
 .../sis/internal/referencing/j2d/Bezier.java       |   1 -
 .../referencing/j2d/ImmutableAffineTransform.java  |   1 -
 .../referencing/j2d/IntervalRectangle.java         |  13 +-
 .../referencing/j2d/LinearTransform2D.java         |   1 -
 .../referencing/j2d/ParameterizedAffine.java       |   1 -
 .../internal/referencing/j2d/ShapeUtilities.java   |   1 -
 .../apache/sis/internal/referencing/j2d/Tile.java  |   8 +-
 .../internal/referencing/j2d/TileOrganizer.java    |   1 -
 .../sis/internal/referencing/j2d/package-info.java |   1 -
 .../sis/internal/referencing/package-info.java     |   1 -
 .../referencing/provider/AbridgedMolodensky.java   |   1 -
 .../referencing/provider/AbstractLambert.java      |   1 -
 .../referencing/provider/AbstractMercator.java     |   1 -
 .../referencing/provider/AbstractProvider.java     |   1 -
 .../provider/AbstractStereographic.java            |   1 -
 .../sis/internal/referencing/provider/Affine.java  |   1 -
 .../referencing/provider/AlbersEqualArea.java      |   1 -
 .../referencing/provider/AxisOrderReversal.java    |   1 -
 .../referencing/provider/AxisOrderReversal3D.java  |   1 -
 .../provider/AzimuthalEquidistantSpherical.java    |   1 -
 .../referencing/provider/CassiniSoldner.java       |   1 -
 .../provider/CoordinateFrameRotation.java          |   1 -
 .../provider/CoordinateFrameRotation2D.java        |   1 -
 .../provider/CoordinateFrameRotation3D.java        |   1 -
 .../provider/DatumShiftGridCompressed.java         |   1 -
 .../referencing/provider/DatumShiftGridFile.java   |   3 -
 .../referencing/provider/DatumShiftGridGroup.java  |   1 -
 .../referencing/provider/DatumShiftGridLoader.java |   1 -
 .../referencing/provider/DatumShiftMethod.java     |   1 -
 .../internal/referencing/provider/EPSGName.java    |   1 -
 .../sis/internal/referencing/provider/ESRI.java    |   1 -
 .../referencing/provider/Equirectangular.java      |   1 -
 .../provider/FranceGeocentricInterpolation.java    |   1 -
 .../referencing/provider/GeocentricAffine.java     |   1 -
 .../GeocentricAffineBetweenGeographic.java         |   1 -
 .../provider/GeocentricToGeographic.java           |   1 -
 .../provider/GeocentricToTopocentric.java          |   1 -
 .../provider/GeocentricTranslation.java            |   1 -
 .../provider/GeocentricTranslation2D.java          |   1 -
 .../provider/GeocentricTranslation3D.java          |   1 -
 .../referencing/provider/GeodeticOperation.java    |   1 -
 .../referencing/provider/Geographic2Dto3D.java     |   1 -
 .../referencing/provider/Geographic3Dto2D.java     |   1 -
 .../provider/GeographicAndVerticalOffsets.java     |   1 -
 .../referencing/provider/GeographicOffsets.java    |   1 -
 .../referencing/provider/GeographicOffsets2D.java  |   1 -
 .../provider/GeographicRedimension.java            |   1 -
 .../provider/GeographicToGeocentric.java           |   1 -
 .../provider/GeographicToTopocentric.java          |   1 -
 .../provider/HyperbolicCassiniSoldner.java         |   1 -
 .../referencing/provider/Interpolation1D.java      |   1 -
 .../provider/LambertAzimuthalEqualArea.java        |   1 -
 .../LambertAzimuthalEqualAreaSpherical.java        |   1 -
 .../referencing/provider/LambertConformal1SP.java  |   1 -
 .../referencing/provider/LambertConformal2SP.java  |   1 -
 .../provider/LambertConformalBelgium.java          |   1 -
 .../provider/LambertConformalMichigan.java         |   1 -
 .../referencing/provider/LambertConformalWest.java |   1 -
 .../provider/LambertCylindricalEqualArea.java      |   1 -
 .../LambertCylindricalEqualAreaSpherical.java      |   1 -
 .../referencing/provider/LongitudeRotation.java    |   1 -
 .../referencing/provider/MapProjection.java        |   1 -
 .../referencing/provider/MapProjection3D.java      |   1 -
 .../internal/referencing/provider/Mercator1SP.java |   1 -
 .../internal/referencing/provider/Mercator2SP.java |   1 -
 .../provider/MercatorAuxiliarySphere.java          |   1 -
 .../referencing/provider/MercatorSpherical.java    |   1 -
 .../referencing/provider/MillerCylindrical.java    |   1 -
 .../provider/ModifiedAzimuthalEquidistant.java     |   1 -
 .../internal/referencing/provider/Mollweide.java   |   1 -
 .../internal/referencing/provider/Molodensky.java  |   1 -
 .../provider/MolodenskyInterpolation.java          |   1 -
 .../sis/internal/referencing/provider/NADCON.java  |   2 -
 .../sis/internal/referencing/provider/NTv1.java    |   1 -
 .../sis/internal/referencing/provider/NTv2.java    |   2 -
 .../referencing/provider/NorthPoleRotation.java    |   1 -
 .../referencing/provider/ObliqueMercator.java      |   1 -
 .../provider/ObliqueMercatorCenter.java            |   1 -
 .../provider/ObliqueMercatorTwoPoints.java         |   1 -
 .../provider/ObliqueMercatorTwoPointsCenter.java   |   1 -
 .../referencing/provider/ObliqueStereographic.java |   1 -
 .../referencing/provider/Orthographic.java         |   1 -
 .../referencing/provider/PolarStereographicA.java  |   1 -
 .../referencing/provider/PolarStereographicB.java  |   1 -
 .../referencing/provider/PolarStereographicC.java  |   1 -
 .../provider/PolarStereographicNorth.java          |   1 -
 .../provider/PolarStereographicSouth.java          |   1 -
 .../internal/referencing/provider/Polyconic.java   |   1 -
 .../referencing/provider/PositionVector7Param.java |   1 -
 .../provider/PositionVector7Param2D.java           |   1 -
 .../provider/PositionVector7Param3D.java           |   1 -
 .../internal/referencing/provider/Providers.java   |   1 -
 .../referencing/provider/PseudoMercator.java       |   1 -
 .../referencing/provider/PseudoPlateCarree.java    |   1 -
 .../referencing/provider/PseudoSinusoidal.java     |   1 -
 .../referencing/provider/RegionalMercator.java     |   1 -
 .../referencing/provider/SatelliteTracking.java    |   1 -
 .../internal/referencing/provider/Sinusoidal.java  |   1 -
 .../referencing/provider/SouthPoleRotation.java    |   1 -
 .../referencing/provider/TransverseMercator.java   |   2 -
 .../provider/TransverseMercatorSouth.java          |   1 -
 .../referencing/provider/VerticalOffset.java       |   1 -
 .../internal/referencing/provider/Wraparound.java  |   1 -
 .../provider/ZonedTransverseMercator.java          |   1 -
 .../referencing/provider/package-info.java         |   1 -
 .../java/org/apache/sis/io/wkt/AbstractParser.java |   1 -
 .../main/java/org/apache/sis/io/wkt/Colors.java    |   1 -
 .../java/org/apache/sis/io/wkt/Convention.java     |   1 -
 .../main/java/org/apache/sis/io/wkt/Element.java   |  33 ++-
 .../java/org/apache/sis/io/wkt/ElementKind.java    |   1 -
 .../org/apache/sis/io/wkt/FormattableObject.java   |   6 +-
 .../main/java/org/apache/sis/io/wkt/Formatter.java |  19 +-
 .../apache/sis/io/wkt/GeodeticObjectParser.java    |  85 ++++---
 .../java/org/apache/sis/io/wkt/KeywordCase.java    |   1 -
 .../java/org/apache/sis/io/wkt/KeywordStyle.java   |   1 -
 .../org/apache/sis/io/wkt/MathTransformParser.java |  17 +-
 .../main/java/org/apache/sis/io/wkt/Parser.java    |   1 -
 .../org/apache/sis/io/wkt/SingletonElement.java    |   1 -
 .../java/org/apache/sis/io/wkt/StoredTree.java     |   5 +-
 .../main/java/org/apache/sis/io/wkt/Symbols.java   |  17 +-
 .../java/org/apache/sis/io/wkt/Transliterator.java |   1 -
 .../sis/io/wkt/UnformattableObjectException.java   |   1 -
 .../sis/io/wkt/UnparsableObjectException.java      |   1 -
 .../java/org/apache/sis/io/wkt/VerticalInfo.java   |   5 +-
 .../java/org/apache/sis/io/wkt/WKTDictionary.java  |   5 +-
 .../main/java/org/apache/sis/io/wkt/WKTFormat.java |  18 +-
 .../main/java/org/apache/sis/io/wkt/Warnings.java  |   5 +-
 .../java/org/apache/sis/io/wkt/package-info.java   |   1 -
 .../sis/parameter/AbstractParameterDescriptor.java |   1 -
 .../sis/parameter/DefaultParameterDescriptor.java  |   9 +-
 .../parameter/DefaultParameterDescriptorGroup.java |   8 +-
 .../sis/parameter/DefaultParameterValue.java       |  21 +-
 .../sis/parameter/DefaultParameterValueGroup.java  |  24 +-
 .../apache/sis/parameter/FilteredParameters.java   |   1 -
 .../java/org/apache/sis/parameter/IntegerList.java |   1 -
 .../sis/parameter/MapProjectionDescriptor.java     |   1 -
 .../sis/parameter/MapProjectionParameters.java     |   1 -
 .../org/apache/sis/parameter/MatrixParameters.java |   1 -
 .../sis/parameter/MatrixParametersAlphaNum.java    |   1 -
 .../org/apache/sis/parameter/ParameterBuilder.java |  66 +++---
 .../org/apache/sis/parameter/ParameterFormat.java  |  42 ++--
 .../apache/sis/parameter/ParameterTableRow.java    |   1 -
 .../apache/sis/parameter/ParameterValueList.java   |   1 -
 .../org/apache/sis/parameter/Parameterized.java    |   1 -
 .../java/org/apache/sis/parameter/Parameters.java  |   5 +-
 .../org/apache/sis/parameter/TensorParameters.java |  35 ++-
 .../org/apache/sis/parameter/TensorValues.java     |   1 -
 .../sis/parameter/UninitializedParameter.java      |   1 -
 .../sis/parameter/UnmodifiableParameterValue.java  |   1 -
 .../parameter/UnmodifiableParameterValueGroup.java |   1 -
 .../java/org/apache/sis/parameter/Verifier.java    |   1 -
 .../org/apache/sis/parameter/package-info.java     |  10 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |  25 ++-
 .../sis/referencing/AbstractReferenceSystem.java   |   1 -
 .../apache/sis/referencing/AuthorityFactories.java |   1 -
 .../java/org/apache/sis/referencing/Builder.java   |  46 ++--
 .../main/java/org/apache/sis/referencing/CRS.java  |  40 ++--
 .../java/org/apache/sis/referencing/CommonCRS.java |  27 +--
 .../sis/referencing/EPSGFactoryFallback.java       |   1 -
 .../referencing/EllipsoidalHeightSeparator.java    |   1 -
 .../sis/referencing/GeodesicsOnEllipsoid.java      |   7 +-
 .../apache/sis/referencing/GeodeticCalculator.java |   6 +-
 .../apache/sis/referencing/GeodeticException.java  |   1 -
 .../apache/sis/referencing/IdentifiedObjects.java  |  21 +-
 .../sis/referencing/ImmutableIdentifier.java       |  11 +-
 .../org/apache/sis/referencing/NameIterator.java   |   1 -
 .../apache/sis/referencing/NamedIdentifier.java    |   1 -
 .../org/apache/sis/referencing/Properties.java     |   1 -
 .../sis/referencing/PropertiesConverter.java       |   1 -
 .../sis/referencing/StandardDefinitions.java       |   1 -
 .../java/org/apache/sis/referencing/SubTypes.java  |   1 -
 .../apache/sis/referencing/crs/AbstractCRS.java    |   7 +-
 .../sis/referencing/crs/AbstractDerivedCRS.java    |   1 -
 .../apache/sis/referencing/crs/ConversionKeys.java |   1 -
 .../sis/referencing/crs/DefaultCompoundCRS.java    |   1 -
 .../sis/referencing/crs/DefaultDerivedCRS.java     |   1 -
 .../sis/referencing/crs/DefaultEngineeringCRS.java |  21 +-
 .../sis/referencing/crs/DefaultGeocentricCRS.java  |  18 +-
 .../sis/referencing/crs/DefaultGeodeticCRS.java    |  17 +-
 .../sis/referencing/crs/DefaultGeographicCRS.java  |  18 +-
 .../sis/referencing/crs/DefaultImageCRS.java       |  15 +-
 .../sis/referencing/crs/DefaultParametricCRS.java  |   1 -
 .../sis/referencing/crs/DefaultProjectedCRS.java   |  14 +-
 .../sis/referencing/crs/DefaultTemporalCRS.java    |   1 -
 .../sis/referencing/crs/DefaultVerticalCRS.java    |   1 -
 .../sis/referencing/crs/ExplicitParameters.java    |   1 -
 .../sis/referencing/crs/SC_GeographicCRS.java      |   1 -
 .../org/apache/sis/referencing/crs/SubTypes.java   |   1 -
 .../apache/sis/referencing/crs/package-info.java   |   1 -
 .../org/apache/sis/referencing/cs/AbstractCS.java  |  12 +-
 .../apache/sis/referencing/cs/AxesConvention.java  |   1 -
 .../org/apache/sis/referencing/cs/AxisFilter.java  |  19 +-
 .../org/apache/sis/referencing/cs/AxisName.java    |   1 -
 .../java/org/apache/sis/referencing/cs/Codes.java  |   1 -
 .../sis/referencing/cs/CoordinateSystems.java      |  35 ++-
 .../apache/sis/referencing/cs/DefaultAffineCS.java |   1 -
 .../sis/referencing/cs/DefaultCartesianCS.java     |   1 -
 .../sis/referencing/cs/DefaultCompoundCS.java      |   1 -
 .../cs/DefaultCoordinateSystemAxis.java            |   1 -
 .../sis/referencing/cs/DefaultCylindricalCS.java   |   1 -
 .../sis/referencing/cs/DefaultEllipsoidalCS.java   |   1 -
 .../apache/sis/referencing/cs/DefaultLinearCS.java |   1 -
 .../sis/referencing/cs/DefaultParametricCS.java    |   1 -
 .../apache/sis/referencing/cs/DefaultPolarCS.java  |   1 -
 .../sis/referencing/cs/DefaultSphericalCS.java     |   1 -
 .../apache/sis/referencing/cs/DefaultTimeCS.java   |   1 -
 .../sis/referencing/cs/DefaultUserDefinedCS.java   |   1 -
 .../sis/referencing/cs/DefaultVerticalCS.java      |   1 -
 .../sis/referencing/cs/DirectionAlongMeridian.java |   1 -
 .../org/apache/sis/referencing/cs/Normalizer.java  |   1 -
 .../org/apache/sis/referencing/cs/SubTypes.java    |   1 -
 .../apache/sis/referencing/cs/package-info.java    |   1 -
 .../sis/referencing/datum/AbstractDatum.java       |   1 -
 .../sis/referencing/datum/BursaWolfParameters.java |   1 -
 .../sis/referencing/datum/DatumShiftGrid.java      |  26 +--
 .../sis/referencing/datum/DefaultEllipsoid.java    |   5 +-
 .../referencing/datum/DefaultEngineeringDatum.java |   1 -
 .../referencing/datum/DefaultGeodeticDatum.java    |  29 ++-
 .../sis/referencing/datum/DefaultImageDatum.java   |   1 -
 .../referencing/datum/DefaultParametricDatum.java  |   1 -
 .../referencing/datum/DefaultPrimeMeridian.java    |  13 +-
 .../referencing/datum/DefaultTemporalDatum.java    |   5 +-
 .../referencing/datum/DefaultVerticalDatum.java    |   5 +-
 .../org/apache/sis/referencing/datum/Sphere.java   |   1 -
 .../org/apache/sis/referencing/datum/SubTypes.java |   1 -
 .../sis/referencing/datum/TimeDependentBWP.java    |   1 -
 .../apache/sis/referencing/datum/package-info.java |   1 -
 .../factory/AuthorityFactoryIdentifier.java        |   1 -
 .../referencing/factory/AuthorityFactoryProxy.java |   9 +-
 .../sis/referencing/factory/CacheRecord.java       |   1 -
 .../referencing/factory/CommonAuthorityCode.java   |   1 -
 .../factory/CommonAuthorityFactory.java            |   1 -
 .../factory/ConcurrentAuthorityFactory.java        |   6 +-
 .../referencing/factory/FactoryDataException.java  |   1 -
 .../sis/referencing/factory/FilteredCodes.java     |   1 -
 .../factory/GeodeticAuthorityFactory.java          |  13 +-
 .../referencing/factory/GeodeticObjectFactory.java |  10 +-
 .../factory/IdentifiedObjectFinder.java            |   2 -
 .../referencing/factory/IdentifiedObjectSet.java   |   1 -
 .../factory/InvalidGeodeticParameterException.java |   1 -
 .../factory/LazySynchronizedIterator.java          |   1 -
 .../factory/MissingFactoryResourceException.java   |   1 -
 .../factory/MultiAuthoritiesFactory.java           |   1 -
 .../factory/NoSuchAuthorityFactoryException.java   |   1 -
 .../sis/referencing/factory/ReferenceKeeper.java   |   1 -
 .../factory/UnavailableFactoryException.java       |   1 -
 .../sis/referencing/factory/package-info.java      |   1 -
 .../referencing/factory/sql/AuthorityCodes.java    |   1 -
 .../sis/referencing/factory/sql/AxisName.java      |   1 -
 .../sis/referencing/factory/sql/BursaWolfInfo.java |   1 -
 .../factory/sql/CloseableReference.java            |   1 -
 .../factory/sql/CoordinateOperationSet.java        |   9 +-
 .../referencing/factory/sql/EPSGCodeFinder.java    |   9 +-
 .../referencing/factory/sql/EPSGDataAccess.java    |  16 +-
 .../sis/referencing/factory/sql/EPSGFactory.java   |   5 +-
 .../sis/referencing/factory/sql/EPSGInstaller.java |   5 +-
 .../factory/sql/InstallationScriptProvider.java    |  28 +--
 .../sis/referencing/factory/sql/SQLTranslator.java |   1 -
 .../sis/referencing/factory/sql/TableInfo.java     |   7 +-
 .../sis/referencing/factory/sql/package-info.java  |   1 -
 .../operation/AbstractCoordinateOperation.java     |   5 +-
 .../operation/AbstractSingleOperation.java         |   1 -
 .../apache/sis/referencing/operation/CRSPair.java  |   1 -
 .../operation/CoordinateOperationContext.java      |   1 -
 .../operation/CoordinateOperationFinder.java       |   1 -
 .../operation/CoordinateOperationRegistry.java     |   1 -
 .../operation/CoordinateOperationSorter.java       |   1 -
 .../operation/DefaultConcatenatedOperation.java    |   1 -
 .../operation/DefaultConicProjection.java          |   1 -
 .../referencing/operation/DefaultConversion.java   |   1 -
 .../DefaultCoordinateOperationFactory.java         |   7 +-
 .../operation/DefaultCylindricalProjection.java    |   1 -
 .../sis/referencing/operation/DefaultFormula.java  |   1 -
 .../operation/DefaultOperationMethod.java          |  16 +-
 .../operation/DefaultPassThroughOperation.java     |   1 -
 .../operation/DefaultPlanarProjection.java         |   1 -
 .../referencing/operation/DefaultProjection.java   |   1 -
 .../operation/DefaultTransformation.java           |   1 -
 .../operation/InverseOperationMethod.java          |   1 -
 .../operation/LooselyDefinedMethod.java            |   1 -
 .../operation/MathTransformContext.java            |   1 -
 .../operation/MismatchedDatumException.java        |   1 -
 .../referencing/operation/SubOperationInfo.java    |   9 +-
 .../apache/sis/referencing/operation/SubTypes.java |   1 -
 .../operation/builder/LinearTransformBuilder.java  |   9 +-
 .../referencing/operation/builder/Linearizer.java  |   1 -
 .../operation/builder/LocalizationGridBuilder.java |  13 +-
 .../operation/builder/ProjectedTransformTry.java   |   1 -
 .../operation/builder/ResidualGrid.java            |   2 -
 .../operation/builder/TransformBuilder.java        |   1 -
 .../operation/builder/package-info.java            |   1 -
 .../operation/matrix/AffineTransforms2D.java       |  17 +-
 .../operation/matrix/GeneralMatrix.java            |   1 -
 .../sis/referencing/operation/matrix/Matrices.java |  85 ++++---
 .../sis/referencing/operation/matrix/Matrix1.java  |   1 -
 .../sis/referencing/operation/matrix/Matrix2.java  |   1 -
 .../sis/referencing/operation/matrix/Matrix3.java  |   1 -
 .../sis/referencing/operation/matrix/Matrix4.java  |   1 -
 .../referencing/operation/matrix/MatrixSIS.java    |  10 +-
 .../matrix/MismatchedMatrixSizeException.java      |   1 -
 .../operation/matrix/NonSquareMatrix.java          |   6 +-
 .../matrix/NoninvertibleMatrixException.java       |   1 -
 .../sis/referencing/operation/matrix/Solver.java   |  17 +-
 .../operation/matrix/UnmodifiableMatrix.java       |   1 -
 .../referencing/operation/matrix/package-info.java |   1 -
 .../sis/referencing/operation/package-info.java    |   1 -
 .../operation/projection/AlbersEqualArea.java      |   2 -
 .../operation/projection/AuthalicConversion.java   |   1 -
 .../operation/projection/AuthalicMercator.java     |   1 -
 .../operation/projection/AzimuthalEquidistant.java |   1 -
 .../operation/projection/CassiniSoldner.java       |   2 -
 .../operation/projection/ConformalProjection.java  |   1 -
 .../operation/projection/CylindricalEqualArea.java |   2 -
 .../operation/projection/Initializer.java          |   1 -
 .../referencing/operation/projection/Inverter.java |   1 -
 .../projection/LambertAzimuthalEqualArea.java      |   1 -
 .../projection/LambertConicConformal.java          |  19 +-
 .../operation/projection/LongitudeWraparound.java  |   2 -
 .../referencing/operation/projection/Mercator.java |   2 -
 .../operation/projection/MeridianArcBased.java     |   1 -
 .../projection/ModifiedAzimuthalEquidistant.java   |   1 -
 .../operation/projection/Mollweide.java            |   1 -
 .../operation/projection/NormalizedProjection.java |   7 +-
 .../operation/projection/ObliqueMercator.java      |   1 -
 .../operation/projection/ObliqueStereographic.java |   2 -
 .../operation/projection/Orthographic.java         |   1 -
 .../operation/projection/PolarStereographic.java   |   2 -
 .../operation/projection/Polyconic.java            |  12 +-
 .../operation/projection/ProjectionException.java  |   1 -
 .../operation/projection/ProjectionVariant.java    |   1 -
 .../operation/projection/SatelliteTracking.java    |   1 -
 .../operation/projection/Sinusoidal.java           |   2 -
 .../operation/projection/TransverseMercator.java   |   2 -
 .../operation/projection/ZonedGridSystem.java      |   2 -
 .../operation/projection/package-info.java         |   1 -
 .../transform/AbridgedMolodenskyTransform2D.java   |   1 -
 .../transform/AbstractLinearTransform.java         |   1 -
 .../operation/transform/AbstractMathTransform.java |  10 +-
 .../transform/AbstractMathTransform1D.java         |   2 -
 .../transform/AbstractMathTransform2D.java         |   2 -
 .../operation/transform/CartesianToPolar.java      |   1 -
 .../operation/transform/CartesianToSpherical.java  |   1 -
 .../operation/transform/ConcatenatedTransform.java |   6 +-
 .../transform/ConcatenatedTransform1D.java         |   1 -
 .../transform/ConcatenatedTransform2D.java         |   1 -
 .../transform/ConcatenatedTransformDirect.java     |   1 -
 .../transform/ConcatenatedTransformDirect1D.java   |   1 -
 .../transform/ConcatenatedTransformDirect2D.java   |   1 -
 .../operation/transform/ConstantTransform1D.java   |   1 -
 .../operation/transform/ContextualParameter.java   |   1 -
 .../operation/transform/ContextualParameters.java  |   8 +-
 .../transform/CoordinateSystemTransform.java       |   1 -
 .../operation/transform/CopyTransform.java         |   1 -
 .../operation/transform/DatumShiftTransform.java   |   1 -
 .../transform/DefaultMathTransformFactory.java     |  22 +-
 .../operation/transform/DomainDefinition.java      |   5 +-
 .../transform/EllipsoidToCentricTransform.java     |  11 +-
 .../transform/ExponentialTransform1D.java          |  12 +-
 .../operation/transform/IdentityTransform.java     |   1 -
 .../operation/transform/IdentityTransform1D.java   |   1 -
 .../transform/InterpolatedGeocentricTransform.java |  10 +-
 .../InterpolatedGeocentricTransform2D.java         |   2 -
 .../transform/InterpolatedMolodenskyTransform.java |   2 -
 .../InterpolatedMolodenskyTransform2D.java         |   2 -
 .../operation/transform/InterpolatedTransform.java |   2 -
 .../transform/InterpolatedTransform2D.java         |   2 -
 .../operation/transform/IterationStrategy.java     |   5 +-
 .../operation/transform/LinearInterpolator1D.java  |   1 -
 .../operation/transform/LinearTransform.java       |   1 -
 .../operation/transform/LinearTransform1D.java     |   1 -
 .../transform/LogarithmicTransform1D.java          |   1 -
 .../operation/transform/MathTransformProvider.java |  16 +-
 .../operation/transform/MathTransforms.java        |  13 +-
 .../operation/transform/MolodenskyFormula.java     |   1 -
 .../operation/transform/MolodenskyTransform.java   |   1 -
 .../operation/transform/MolodenskyTransform2D.java |   1 -
 .../operation/transform/OperationMethodSet.java    |   1 -
 .../operation/transform/PassThroughTransform.java  |  22 +-
 .../transform/PassThroughTransform2D.java          |   1 -
 .../operation/transform/PolarToCartesian.java      |   1 -
 .../operation/transform/PoleRotation.java          |   1 -
 .../operation/transform/PowerTransform1D.java      |   1 -
 .../operation/transform/ProjectiveTransform.java   |   1 -
 .../operation/transform/ProjectiveTransform2D.java |   1 -
 .../operation/transform/ScaleTransform.java        |   1 -
 .../transform/SpecializableTransform.java          |   1 -
 .../transform/SpecializableTransform2D.java        |   1 -
 .../operation/transform/SphericalToCartesian.java  |   1 -
 .../operation/transform/TransferFunction.java      |   1 -
 .../operation/transform/TransformAdapter2D.java    |   1 -
 .../operation/transform/TransformSeparator.java    |  11 +-
 .../operation/transform/TranslationTransform.java  |   1 -
 .../operation/transform/WraparoundTransform.java   |   5 +-
 .../operation/transform/package-info.java          |   1 -
 .../org/apache/sis/referencing/package-info.java   |  35 ++-
 .../sis/geometry/AbstractDirectPositionTest.java   |   3 +-
 .../apache/sis/geometry/AbstractEnvelopeTest.java  |  18 +-
 .../org/apache/sis/geometry/ArrayEnvelopeTest.java |   3 +-
 .../apache/sis/geometry/CoordinateFormatTest.java  |   3 +-
 .../org/apache/sis/geometry/CurveExtremumTest.java |   3 +-
 .../apache/sis/geometry/DirectPosition1DTest.java  |   3 +-
 .../apache/sis/geometry/DirectPosition2DTest.java  |   3 +-
 .../org/apache/sis/geometry/Envelope2DTest.java    |   3 +-
 .../apache/sis/geometry/EnvelopeReducerTest.java   |   3 +-
 .../org/apache/sis/geometry/EnvelopesTest.java     |   3 +-
 .../sis/geometry/GeneralDirectPositionTest.java    |   3 +-
 .../apache/sis/geometry/GeneralEnvelopeTest.java   |   3 +-
 .../apache/sis/geometry/ImmutableEnvelopeTest.java |   3 +-
 .../java/org/apache/sis/geometry/Shapes2DTest.java |   3 +-
 .../org/apache/sis/geometry/SubEnvelopeTest.java   |   3 +-
 .../org/apache/sis/geometry/TransformTestCase.java |   3 +-
 .../sis/geometry/WraparoundAdjustmentTest.java     |   8 +-
 .../CC_GeneralOperationParameterTest.java          |   3 +-
 .../CC_OperationParameterGroupTest.java            |   3 +-
 .../sis/internal/jaxb/referencing/CodeTest.java    |   3 +-
 .../referencing/SecondDefiningParameterTest.java   |   3 +-
 .../sis/internal/referencing/AxesMapperTest.java   |   3 +-
 .../internal/referencing/AxisDirectionsTest.java   |   3 +-
 .../referencing/CoordinateOperationsTest.java      |   3 +-
 .../referencing/DefinitionVerifierTest.java        |   3 +-
 .../referencing/EllipsoidalHeightCombinerTest.java |   3 +-
 .../internal/referencing/ExtentSelectorTest.java   |   3 +-
 .../sis/internal/referencing/FormulasTest.java     |   3 +-
 .../referencing/GeodeticObjectBuilderTest.java     |   3 +-
 .../sis/internal/referencing/LazySetTest.java      |   3 +-
 .../PositionalAccuracyConstantTest.java            |   3 +-
 .../referencing/ReferencingUtilitiesTest.java      |   3 +-
 .../referencing/ServicesForMetadataTest.java       |   3 +-
 .../referencing/VerticalDatumTypesTest.java        |   3 +-
 .../sis/internal/referencing/WKTKeywordsTest.java  |   3 +-
 .../sis/internal/referencing/WKTUtilitiesTest.java |   3 +-
 .../referencing/WraparoundApplicatorTest.java      |   3 +-
 .../referencing/j2d/AbstractShapeTest.java         |   3 +-
 .../referencing/j2d/ShapeUtilitiesExt.java         |   1 -
 .../referencing/j2d/ShapeUtilitiesTest.java        |   3 +-
 .../referencing/j2d/ShapeUtilitiesViewer.java      |   3 +-
 .../internal/referencing/provider/AffineTest.java  |   3 +-
 .../provider/CoordinateFrameRotationTest.java      |   3 +-
 .../provider/DatumShiftGridCompressedTest.java     |   3 +-
 .../provider/DatumShiftGridFileTest.java           |   3 +-
 .../referencing/provider/DatumShiftTestCase.java   |   3 +-
 .../FranceGeocentricInterpolationTest.java         |   3 +-
 .../provider/GeocentricTranslationTest.java        |   3 +-
 .../referencing/provider/Geographic3Dto2DTest.java |   3 +-
 .../provider/GeographicOffsetsTest.java            |   3 +-
 .../provider/LongitudeRotationTest.java            |   3 +-
 .../referencing/provider/MapProjectionTest.java    |   3 +-
 .../referencing/provider/MolodenskyTest.java       |   3 +-
 .../internal/referencing/provider/NADCONTest.java  |   3 +-
 .../internal/referencing/provider/NTv2Test.java    |   3 +-
 .../provider/ParameterNameTableGenerator.java      |   1 -
 .../provider/PositionVector7ParamTest.java         |   3 +-
 .../referencing/provider/ProviderMock.java         |   3 +-
 .../referencing/provider/ProvidersTest.java        |   3 +-
 .../referencing/provider/SeismicBinGridMock.java   |   3 +-
 .../provider/TransverseMercatorTest.java           |   3 +-
 .../java/org/apache/sis/io/wkt/ColorsTest.java     |   3 +-
 .../org/apache/sis/io/wkt/ComparisonWithEPSG.java  |   3 +-
 .../java/org/apache/sis/io/wkt/ConventionTest.java |   3 +-
 .../java/org/apache/sis/io/wkt/ElementTest.java    |   3 +-
 .../java/org/apache/sis/io/wkt/FormatterTest.java  |   3 +-
 .../sis/io/wkt/GeodeticObjectParserTest.java       |   3 +-
 .../apache/sis/io/wkt/MathTransformParserTest.java |   3 +-
 .../java/org/apache/sis/io/wkt/SymbolsTest.java    |   3 +-
 .../org/apache/sis/io/wkt/TransliteratorTest.java  |   3 +-
 .../org/apache/sis/io/wkt/WKTDictionaryTest.java   |   3 +-
 .../java/org/apache/sis/io/wkt/WKTFormatTest.java  |   3 +-
 .../java/org/apache/sis/io/wkt/WKTParserTest.java  | 107 +++++----
 .../DefaultParameterDescriptorGroupTest.java       |   3 +-
 .../parameter/DefaultParameterDescriptorTest.java  |   3 +-
 .../parameter/DefaultParameterValueGroupTest.java  |   3 +-
 .../sis/parameter/DefaultParameterValueTest.java   |   5 +-
 .../sis/parameter/MapProjectionParametersTest.java |   3 +-
 .../parameter/MatrixParametersAlphaNumTest.java    |   3 +-
 .../apache/sis/parameter/MatrixParametersTest.java |   3 +-
 .../apache/sis/parameter/ParameterBuilderTest.java |   3 +-
 .../apache/sis/parameter/ParameterFormatTest.java  |   3 +-
 .../sis/parameter/ParameterMarshallingTest.java    |   3 +-
 .../sis/parameter/ParameterValueGroupWrapper.java  |   3 +-
 .../org/apache/sis/parameter/ParametersTest.java   |   3 +-
 .../apache/sis/parameter/TensorParametersTest.java |   3 +-
 .../org/apache/sis/parameter/TensorValuesTest.java |   3 +-
 .../UnmodifiableParameterValueGroupTest.java       |   3 +-
 .../parameter/UnmodifiableParameterValueTest.java  |   3 +-
 .../referencing/AbstractIdentifiedObjectTest.java  |   3 +-
 .../referencing/AbstractReferenceSystemTest.java   |   3 +-
 .../sis/referencing/AuthorityFactoriesTest.java    |   3 +-
 .../org/apache/sis/referencing/BuilderMock.java    |   3 +-
 .../org/apache/sis/referencing/BuilderTest.java    |   3 +-
 .../java/org/apache/sis/referencing/CRSTest.java   |   3 +-
 .../apache/sis/referencing/ClenshawSummation.java  |  41 ++--
 .../org/apache/sis/referencing/CommonCRSTest.java  |   3 +-
 .../sis/referencing/EPSGFactoryFallbackTest.java   |   3 +-
 .../sis/referencing/GeodesicsOnEllipsoidTest.java  |   3 +-
 .../sis/referencing/GeodeticCalculatorTest.java    |   3 +-
 .../sis/referencing/GeodeticObjectVerifier.java    |   3 +-
 .../sis/referencing/IdentifiedObjectsTest.java     |   3 +-
 .../sis/referencing/ImmutableIdentifierTest.java   |   3 +-
 .../sis/referencing/NamedIdentifierTest.java       |   3 +-
 .../sis/referencing/StandardDefinitionsTest.java   |   3 +-
 .../sis/referencing/crs/AbstractCRSTest.java       |   3 +-
 .../referencing/crs/DefaultCompoundCRSTest.java    |   3 +-
 .../sis/referencing/crs/DefaultDerivedCRSTest.java |   3 +-
 .../referencing/crs/DefaultEngineeringCRSTest.java |   3 +-
 .../referencing/crs/DefaultGeocentricCRSTest.java  |   3 +-
 .../referencing/crs/DefaultGeodeticCRSTest.java    |   3 +-
 .../referencing/crs/DefaultGeographicCRSTest.java  |   3 +-
 .../sis/referencing/crs/DefaultImageCRSTest.java   |   3 +-
 .../referencing/crs/DefaultProjectedCRSTest.java   |   3 +-
 .../referencing/crs/DefaultTemporalCRSTest.java    |   3 +-
 .../referencing/crs/DefaultVerticalCRSTest.java    |   3 +-
 .../apache/sis/referencing/crs/HardCodedCRS.java   |   3 +-
 .../sis/referencing/crs/HardCodedCRSTest.java      |   3 +-
 .../apache/sis/referencing/crs/SubTypesTest.java   |   3 +-
 .../apache/sis/referencing/cs/AbstractCSTest.java  |   3 +-
 .../org/apache/sis/referencing/cs/CodesTest.java   |   3 +-
 .../sis/referencing/cs/CoordinateSystemsTest.java  |   3 +-
 .../sis/referencing/cs/DefaultCartesianCSTest.java |   3 +-
 .../sis/referencing/cs/DefaultCompoundCSTest.java  |   3 +-
 .../cs/DefaultCoordinateSystemAxisTest.java        |   3 +-
 .../referencing/cs/DefaultCylindricalCSTest.java   |   3 +-
 .../referencing/cs/DefaultEllipsoidalCSTest.java   |   3 +-
 .../sis/referencing/cs/DefaultPolarCSTest.java     |   3 +-
 .../sis/referencing/cs/DefaultSphericalCSTest.java |   3 +-
 .../referencing/cs/DirectionAlongMeridianTest.java |   3 +-
 .../apache/sis/referencing/cs/HardCodedAxes.java   |   3 +-
 .../org/apache/sis/referencing/cs/HardCodedCS.java |   3 +-
 .../apache/sis/referencing/cs/HardCodedCSTest.java |   3 +-
 .../apache/sis/referencing/cs/NormalizerTest.java  |   3 +-
 .../referencing/datum/BursaWolfParametersTest.java |   3 +-
 .../referencing/datum/DefaultEllipsoidTest.java    |   3 +-
 .../datum/DefaultGeodeticDatumTest.java            |   3 +-
 .../datum/DefaultPrimeMeridianTest.java            |   3 +-
 .../datum/DefaultTemporalDatumTest.java            |   3 +-
 .../datum/DefaultVerticalDatumTest.java            |   3 +-
 .../sis/referencing/datum/GeodeticDatumMock.java   |   3 +-
 .../sis/referencing/datum/HardCodedDatum.java      |   3 +-
 .../sis/referencing/datum/PrimeMeridianMock.java   |   3 +-
 .../referencing/datum/TimeDependentBWPTest.java    |   3 +-
 .../referencing/factory/AuthorityFactoryMock.java  |   3 +-
 .../factory/AuthorityFactoryProxyTest.java         |   3 +-
 .../factory/CommonAuthorityFactoryTest.java        |   3 +-
 .../factory/ConcurrentAuthorityFactoryTest.java    |   5 +-
 .../factory/GeodeticObjectFactoryTest.java         |   3 +-
 .../factory/IdentifiedObjectFinderTest.java        |   5 +-
 .../factory/MultiAuthoritiesFactoryTest.java       |   3 +-
 .../sis/referencing/factory/TestFactorySource.java |  11 +-
 .../referencing/factory/sql/EPSGFactoryTest.java   |   3 +-
 .../referencing/factory/sql/EPSGInstallerTest.java |   3 +-
 .../sis/referencing/factory/sql/TableInfoTest.java |   3 +-
 .../factory/sql/epsg/DataScriptFormatter.java      |   1 -
 .../factory/sql/epsg/DataScriptFormatterTest.java  |   3 +-
 .../referencing/geoapi/AuthorityFactoryTest.java   |   2 +-
 .../geoapi/ParameterizedTransformTest.java         |   2 +-
 .../operation/CoordinateOperationFinderTest.java   |   7 +-
 .../operation/CoordinateOperationRegistryTest.java |   7 +-
 .../DefaultConcatenatedOperationTest.java          |   3 +-
 .../operation/DefaultConversionTest.java           |   3 +-
 .../DefaultCoordinateOperationFactoryTest.java     |   7 +-
 .../referencing/operation/DefaultFormulaTest.java  |   3 +-
 .../operation/DefaultOperationMethodTest.java      |   3 +-
 .../operation/DefaultPassThroughOperationTest.java |   3 +-
 .../operation/DefaultTransformationTest.java       |   3 +-
 .../operation/HardCodedConversions.java            |   7 +-
 .../operation/SingleOperationMarshallingTest.java  |   3 +-
 .../builder/LinearTransformBuilderTest.java        |   3 +-
 .../operation/builder/LinearizerTest.java          |   3 +-
 .../builder/LocalizationGridBuilderTest.java       |   3 +-
 .../operation/builder/NonLinearTransform.java      |   3 +-
 .../operation/builder/ResidualGridTest.java        |   8 +-
 .../operation/matrix/AffineTransforms2DTest.java   |   3 +-
 .../operation/matrix/GeneralMatrixTest.java        |   3 +-
 .../referencing/operation/matrix/MatricesTest.java |   3 +-
 .../referencing/operation/matrix/Matrix1Test.java  |   3 +-
 .../referencing/operation/matrix/Matrix2Test.java  |   3 +-
 .../referencing/operation/matrix/Matrix3Test.java  |   3 +-
 .../referencing/operation/matrix/Matrix4Test.java  |   3 +-
 .../operation/matrix/MatrixTestCase.java           |   3 +-
 .../operation/matrix/NonSquareMatrixTest.java      |   3 +-
 .../referencing/operation/matrix/SolverTest.java   |   3 +-
 .../operation/projection/AlbersEqualAreaTest.java  |   7 +-
 .../projection/AuthalicConversionTest.java         |   3 +-
 .../projection/AzimuthalEquidistantTest.java       |   3 +-
 .../operation/projection/Benchmark.java            |   1 -
 .../operation/projection/CassiniSoldnerTest.java   |   3 +-
 .../projection/ConformalProjectionTest.java        |  13 +-
 .../projection/CylindricalEqualAreaTest.java       |   3 +-
 .../operation/projection/EquirectangularTest.java  |   3 +-
 .../operation/projection/InitializerTest.java      |   3 +-
 .../projection/LambertAzimuthalEqualAreaTest.java  |   3 +-
 .../projection/LambertConicConformalTest.java      |   3 +-
 .../projection/MapProjectionTestCase.java          |   3 +-
 .../projection/MercatorMethodComparison.java       |   3 +-
 .../operation/projection/MercatorTest.java         |   3 +-
 .../operation/projection/MeridianArcTest.java      |   8 +-
 .../ModifiedAzimuthalEquidistantTest.java          |   3 +-
 .../operation/projection/MollweideTest.java        |   3 +-
 .../sis/referencing/operation/projection/NoOp.java |   3 +-
 .../projection/NormalizedProjectionTest.java       |   3 +-
 .../operation/projection/ObliqueMercatorTest.java  |   3 +-
 .../projection/ObliqueStereographicTest.java       |   3 +-
 .../operation/projection/OrthographicTest.java     |   3 +-
 .../projection/PolarStereographicTest.java         |   3 +-
 .../operation/projection/PolyconicTest.java        |   3 +-
 .../projection/ProjectionResultComparator.java     |   3 +-
 .../projection/SatelliteTrackingTest.java          |   3 +-
 .../operation/projection/SinusoidalTest.java       |   3 +-
 .../projection/TransverseMercatorTest.java         |   3 +-
 .../operation/projection/ZonedGridSystemTest.java  |   3 +-
 .../transform/AbridgedMolodenskyTransformTest.java |   3 +-
 .../transform/AbstractMathTransformTest.java       |   3 +-
 .../operation/transform/CartesianToPolarTest.java  |   3 +-
 .../transform/CartesianToSphericalTest.java        |   3 +-
 .../transform/ConcatenatedTransformTest.java       |   3 +-
 .../transform/ContextualParametersTest.java        |   3 +-
 .../operation/transform/CoordinateDomain.java      |   3 +-
 .../operation/transform/CoordinateDomainTest.java  |   3 +-
 .../transform/CoordinateSystemTransformTest.java   |   3 +-
 .../operation/transform/CopyTransformTest.java     |   3 +-
 .../transform/DefaultMathTransformFactoryTest.java |   3 +-
 .../operation/transform/DomainDefinitionTest.java  |   3 +-
 .../transform/EllipsoidToCentricTransformTest.java |   3 +-
 .../transform/ExponentialTransform1DTest.java      |   3 +-
 .../InterpolatedGeocentricTransformTest.java       |   3 +-
 .../InterpolatedMolodenskyTransformTest.java       |   3 +-
 .../transform/InterpolatedTransformTest.java       |   3 +-
 .../operation/transform/IterationStrategyTest.java |   3 +-
 .../transform/LinearInterpolator1DTest.java        |   3 +-
 .../operation/transform/LinearTransformTest.java   |   3 +-
 .../transform/LogarithmicTransform1DTest.java      |   3 +-
 .../transform/MathTransformFactoryBase.java        |   3 +-
 .../transform/MathTransformFactoryMock.java        |   3 +-
 .../operation/transform/MathTransformTestCase.java |   3 +-
 .../operation/transform/MathTransformWrapper.java  |   3 +-
 .../operation/transform/MathTransformsTest.java    |   3 +-
 .../transform/MolodenskyTransformTest.java         |   3 +-
 .../transform/OperationMethodSetTest.java          |   3 +-
 .../transform/PassThroughTransformTest.java        |   3 +-
 .../operation/transform/PolarToCartesianTest.java  |   3 +-
 .../operation/transform/PoleRotationTest.java      |   7 +-
 .../transform/ProjectiveTransformTest.java         |   3 +-
 .../operation/transform/PseudoTransform.java       |  14 +-
 .../transform/RandomFailureTransform.java          |   3 +-
 .../operation/transform/ScaleTransformTest.java    |   3 +-
 .../operation/transform/SinusoidalShiftGrid.java   |   3 +-
 .../transform/SpecializableTransformTest.java      |   3 +-
 .../transform/SphericalToCartesianTest.java        |   3 +-
 .../operation/transform/TransferFunctionTest.java  |   3 +-
 .../transform/TransformResultComparator.java       |   3 +-
 .../transform/TransformSeparatorTest.java          |   3 +-
 .../transform/TranslationTransformTest.java        |   3 +-
 .../transform/WraparoundTransformTest.java         |   3 +-
 .../report/CoordinateOperationMethods.java         |   3 +-
 .../report/CoordinateReferenceSystems.java         |   8 +-
 .../sis/referencing/report/HTMLGenerator.java      |   3 +-
 .../sis/referencing/report/package-info.java       |   1 -
 .../org/apache/sis/test/ReferencingAssert.java     |   3 +-
 .../sis/test/integration/ConsistencyTest.java      |   3 +-
 .../test/integration/CoordinateOperationTest.java  |   3 +-
 .../integration/CoordinateReferenceSystemTest.java |   3 +-
 .../sis/test/integration/DatumShiftTest.java       |   3 +-
 .../apache/sis/test/integration/MetadataTest.java  |   3 +-
 .../sis/test/integration/MetadataVerticalTest.java |   3 +-
 .../apache/sis/test/integration/package-info.java  |   1 -
 .../sis/test/suite/ReferencingTestSuite.java       |   3 +-
 .../org/apache/sis/test/widget/ShapeViewer.java    |   3 +-
 .../apache/sis/test/widget/SwingAssertions.java    |   3 +-
 .../org/apache/sis/test/widget/VisualCheck.java    |   3 +-
 .../org/apache/sis/test/widget/package-info.java   |   1 -
 .../sis/internal/converter/AngleConverter.java     |   1 -
 .../sis/internal/converter/ArrayConverter.java     |   1 -
 .../internal/converter/CharSequenceConverter.java  |   1 -
 .../apache/sis/internal/converter/ClassPair.java   |   1 -
 .../internal/converter/CollectionConverter.java    |   1 -
 .../org/apache/sis/internal/converter/Column.java  |   1 -
 .../sis/internal/converter/ConverterRegistry.java  |  10 +-
 .../sis/internal/converter/DateConverter.java      |   1 -
 .../sis/internal/converter/FallbackConverter.java  |   5 +-
 .../sis/internal/converter/FractionConverter.java  |   1 -
 .../sis/internal/converter/IdentityConverter.java  |   1 -
 .../sis/internal/converter/NumberConverter.java    |   1 -
 .../sis/internal/converter/ObjectToString.java     |   5 +-
 .../sis/internal/converter/PathConverter.java      |   1 -
 .../sis/internal/converter/StringConverter.java    |   1 -
 .../internal/converter/SurjectiveConverter.java    |   1 -
 .../sis/internal/converter/SystemConverter.java    |   1 -
 .../sis/internal/converter/SystemRegistry.java     |   5 +-
 .../sis/internal/converter/package-info.java       |   5 +-
 .../org/apache/sis/internal/jdk17/HexFormat.java   |   1 -
 .../java/org/apache/sis/internal/jdk17/JDK17.java  |   1 -
 .../java/org/apache/sis/internal/jdk17/Record.java |   1 -
 .../apache/sis/internal/jdk17/package-info.java    |   1 -
 .../apache/sis/internal/system/CommonExecutor.java |   1 -
 .../apache/sis/internal/system/DaemonThread.java   |  11 +-
 .../apache/sis/internal/system/DataDirectory.java  |   1 -
 .../sis/internal/system/DefaultFactories.java      |   1 -
 .../sis/internal/system/DelayedExecutor.java       |   1 -
 .../sis/internal/system/DelayedRunnable.java       |   2 -
 .../org/apache/sis/internal/system/Fallback.java   |   1 -
 .../sis/internal/system/LocalizedStaticObject.java |   1 -
 .../org/apache/sis/internal/system/Loggers.java    |   1 -
 .../org/apache/sis/internal/system/Modules.java    |   1 -
 .../sis/internal/system/OptionalDependency.java    |   5 +-
 .../internal/system/ReferenceQueueConsumer.java    |   7 +-
 .../org/apache/sis/internal/system/Semaphores.java |   1 -
 .../org/apache/sis/internal/system/Shutdown.java   |   1 -
 .../org/apache/sis/internal/system/Supervisor.java |   1 -
 .../sis/internal/system/SupervisorMBean.java       |   1 -
 .../apache/sis/internal/system/SystemListener.java |   1 -
 .../org/apache/sis/internal/system/Threads.java    |   1 -
 .../apache/sis/internal/system/package-info.java   |   1 -
 .../sis/internal/temporal/DefaultInstant.java      |   1 -
 .../sis/internal/temporal/DefaultPeriod.java       |   1 -
 .../internal/temporal/DefaultPeriodDuration.java   |   1 -
 .../internal/temporal/DefaultTemporalFactory.java  |   1 -
 .../apache/sis/internal/temporal/Primitive.java    |   1 -
 .../apache/sis/internal/temporal/package-info.java |   1 -
 .../apache/sis/internal/util/AbstractIterator.java |   1 -
 .../org/apache/sis/internal/util/AbstractMap.java  |   1 -
 .../apache/sis/internal/util/AbstractMapEntry.java |   1 -
 .../java/org/apache/sis/internal/util/Acyclic.java |   1 -
 .../sis/internal/util/AutoMessageFormat.java       |   1 -
 .../java/org/apache/sis/internal/util/Bag.java     |   1 -
 .../apache/sis/internal/util/CheckedArrayList.java |   1 -
 .../apache/sis/internal/util/CheckedHashSet.java   |   1 -
 .../java/org/apache/sis/internal/util/Cloner.java  |   1 -
 .../org/apache/sis/internal/util/CodeLists.java    |   1 -
 .../apache/sis/internal/util/CollectionsExt.java   |   1 -
 .../org/apache/sis/internal/util/Constants.java    |   1 -
 .../apache/sis/internal/util/DefinitionURI.java    |   1 -
 .../org/apache/sis/internal/util/DoubleDouble.java | 145 ++++++------
 .../org/apache/sis/internal/util/EmptyQueue.java   |   1 -
 .../apache/sis/internal/util/FinalFieldSetter.java |   3 +-
 .../sis/internal/util/ListOfUnknownSize.java       |   1 -
 .../sis/internal/util/LocalizedParseException.java |   1 -
 .../apache/sis/internal/util/MetadataServices.java |   1 -
 .../org/apache/sis/internal/util/Numerics.java     |  25 +--
 .../apache/sis/internal/util/PropertyFormat.java   |   1 -
 .../apache/sis/internal/util/SetOfUnknownSize.java |   1 -
 .../sis/internal/util/SimpleCharacterIterator.java |   1 -
 .../sis/internal/util/StandardDateFormat.java      |   1 -
 .../java/org/apache/sis/internal/util/Strings.java |   5 +-
 .../sis/internal/util/TemporalUtilities.java       |   1 -
 .../sis/internal/util/TreeFormatCustomization.java |   1 -
 .../java/org/apache/sis/internal/util/URLs.java    |   1 -
 .../sis/internal/util/UnmodifiableArrayList.java   |   9 +-
 .../java/org/apache/sis/internal/util/X364.java    |   1 -
 .../org/apache/sis/internal/util/package-info.java |   1 -
 .../java/org/apache/sis/io/AppendableWriter.java   |   1 -
 .../src/main/java/org/apache/sis/io/Appender.java  |   1 -
 .../main/java/org/apache/sis/io/ClassFormat.java   |   1 -
 .../java/org/apache/sis/io/CompoundFormat.java     |   1 -
 .../main/java/org/apache/sis/io/DefaultFormat.java |   1 -
 .../src/main/java/org/apache/sis/io/IO.java        |   1 -
 .../org/apache/sis/io/IdentifiedObjectFormat.java  |   1 -
 .../org/apache/sis/io/InvalidSeekException.java    |   1 -
 .../main/java/org/apache/sis/io/LineAppender.java  |   1 -
 .../main/java/org/apache/sis/io/TableAppender.java |  11 +-
 .../main/java/org/apache/sis/io/TabularFormat.java |   9 +-
 .../main/java/org/apache/sis/io/package-info.java  |   1 -
 .../main/java/org/apache/sis/math/ArrayVector.java |   1 -
 .../apache/sis/math/CompoundDirectPositions.java   |   1 -
 .../org/apache/sis/math/ConcatenatedVector.java    |   1 -
 .../java/org/apache/sis/math/DecimalFunctions.java |  19 +-
 .../main/java/org/apache/sis/math/Fraction.java    |   1 -
 .../java/org/apache/sis/math/FunctionProperty.java |   1 -
 .../src/main/java/org/apache/sis/math/Line.java    |   1 -
 .../org/apache/sis/math/LinearlyDerivedVector.java |   1 -
 .../java/org/apache/sis/math/MathFunctions.java    |  18 +-
 .../java/org/apache/sis/math/PackedVector.java     |   1 -
 .../src/main/java/org/apache/sis/math/Plane.java   |   1 -
 .../java/org/apache/sis/math/RepeatedVector.java   |  11 +-
 .../java/org/apache/sis/math/SequenceVector.java   |   1 -
 .../main/java/org/apache/sis/math/Statistics.java  |  27 +--
 .../java/org/apache/sis/math/StatisticsFormat.java |   9 +-
 .../src/main/java/org/apache/sis/math/Vector.java  |  29 ++-
 .../java/org/apache/sis/math/package-info.java     |   1 -
 .../org/apache/sis/measure/AbstractConverter.java  |   1 -
 .../java/org/apache/sis/measure/AbstractUnit.java  |   5 +-
 .../main/java/org/apache/sis/measure/Angle.java    |   1 -
 .../java/org/apache/sis/measure/AngleFormat.java   |   6 +-
 .../org/apache/sis/measure/AngularVelocity.java    |   1 -
 .../apache/sis/measure/ConcatenatedConverter.java  |   1 -
 .../org/apache/sis/measure/ConventionalUnit.java   |   1 -
 .../java/org/apache/sis/measure/DerivedScalar.java |   5 +-
 .../org/apache/sis/measure/ElevationAngle.java     |   1 -
 .../java/org/apache/sis/measure/FormatField.java   |   1 -
 .../sis/measure/FormattedCharacterIterator.java    |   1 -
 .../org/apache/sis/measure/IdentityConverter.java  |   5 +-
 .../main/java/org/apache/sis/measure/Latitude.java |   1 -
 .../org/apache/sis/measure/LinearConverter.java    |  21 +-
 .../java/org/apache/sis/measure/Longitude.java     |   1 -
 .../org/apache/sis/measure/MeasurementRange.java   |   1 -
 .../java/org/apache/sis/measure/NumberRange.java   |   1 -
 .../java/org/apache/sis/measure/PowerOf10.java     |   1 -
 .../main/java/org/apache/sis/measure/Prefixes.java |   1 -
 .../java/org/apache/sis/measure/Quantities.java    |   1 -
 .../org/apache/sis/measure/QuantityFormat.java     |   1 -
 .../main/java/org/apache/sis/measure/Range.java    |   1 -
 .../java/org/apache/sis/measure/RangeFormat.java   |   6 +-
 .../main/java/org/apache/sis/measure/Salinity.java |   1 -
 .../main/java/org/apache/sis/measure/Scalar.java   |   1 -
 .../java/org/apache/sis/measure/ScalarFactory.java |   1 -
 .../org/apache/sis/measure/ScalarFallback.java     |   1 -
 .../org/apache/sis/measure/ScaleRateOfChange.java  |   1 -
 .../apache/sis/measure/SexagesimalConverter.java   |   1 -
 .../java/org/apache/sis/measure/SystemUnit.java    |   5 +-
 .../java/org/apache/sis/measure/UnitDimension.java |   1 -
 .../java/org/apache/sis/measure/UnitFormat.java    |   2 -
 .../java/org/apache/sis/measure/UnitRegistry.java  |   1 -
 .../java/org/apache/sis/measure/UnitServices.java  |   3 +-
 .../main/java/org/apache/sis/measure/Units.java    |   1 -
 .../java/org/apache/sis/measure/ValueRange.java    |  13 +-
 .../java/org/apache/sis/measure/package-info.java  |   9 +-
 .../src/main/java/org/apache/sis/setup/About.java  |   5 +-
 .../java/org/apache/sis/setup/Configuration.java   |   5 +-
 .../java/org/apache/sis/setup/GeometryLibrary.java |   1 -
 .../apache/sis/setup/InstallationResources.java    |   5 +-
 .../main/java/org/apache/sis/setup/OptionKey.java  |  13 +-
 .../apache/sis/setup/OptionalInstallations.java    |   1 -
 .../java/org/apache/sis/setup/package-info.java    |   1 -
 .../sis/util/AbstractInternationalString.java      |   1 -
 .../java/org/apache/sis/util/ArgumentChecks.java   |   1 -
 .../main/java/org/apache/sis/util/ArraysExt.java   |  23 +-
 .../java/org/apache/sis/util/CharSequences.java    |  21 +-
 .../main/java/org/apache/sis/util/Characters.java  |  18 +-
 .../src/main/java/org/apache/sis/util/Classes.java |  12 +-
 .../java/org/apache/sis/util/ComparisonMode.java   |   5 +-
 .../java/org/apache/sis/util/Configuration.java    |   1 -
 .../apache/sis/util/CorruptedObjectException.java  |   1 -
 .../src/main/java/org/apache/sis/util/Debug.java   |   1 -
 .../sis/util/DefaultInternationalString.java       |   1 -
 .../main/java/org/apache/sis/util/Deprecable.java  |   1 -
 .../main/java/org/apache/sis/util/Disposable.java  |   1 -
 .../main/java/org/apache/sis/util/Emptiable.java   |   1 -
 .../main/java/org/apache/sis/util/Exceptions.java  |   1 -
 .../org/apache/sis/util/LenientComparable.java     |   5 +-
 .../src/main/java/org/apache/sis/util/Locales.java |   5 +-
 .../main/java/org/apache/sis/util/Localized.java   |   1 -
 .../org/apache/sis/util/LocalizedException.java    |   1 -
 .../org/apache/sis/util/NullArgumentException.java |   1 -
 .../src/main/java/org/apache/sis/util/Numbers.java |  19 +-
 .../java/org/apache/sis/util/ObjectConverter.java  |   5 +-
 .../java/org/apache/sis/util/ObjectConverters.java |   8 +-
 .../org/apache/sis/util/OptionalCandidate.java     |   1 -
 .../sis/util/ResourceInternationalString.java      |  16 +-
 .../apache/sis/util/SimpleInternationalString.java |   1 -
 .../src/main/java/org/apache/sis/util/Static.java  |   1 -
 .../java/org/apache/sis/util/StringBuilders.java   |   1 -
 .../sis/util/UnconvertibleObjectException.java     |   1 -
 .../org/apache/sis/util/UnknownNameException.java  |   1 -
 .../util/UnsupportedImplementationException.java   |   1 -
 .../main/java/org/apache/sis/util/Utilities.java   |   9 +-
 .../src/main/java/org/apache/sis/util/Version.java |   1 -
 .../main/java/org/apache/sis/util/Workaround.java  |   1 -
 .../sis/util/collection/BackingStoreException.java |   5 +-
 .../java/org/apache/sis/util/collection/Cache.java |  46 ++--
 .../apache/sis/util/collection/CacheEntries.java   |   1 -
 .../sis/util/collection/CheckedContainer.java      |   5 +-
 .../apache/sis/util/collection/CodeListSet.java    |   5 +-
 .../org/apache/sis/util/collection/Containers.java |   1 -
 .../sis/util/collection/DefaultTreeTable.java      |   6 +-
 .../sis/util/collection/DerivedIterator.java       |   1 -
 .../org/apache/sis/util/collection/DerivedMap.java |   1 -
 .../org/apache/sis/util/collection/DerivedSet.java |  13 +-
 .../sis/util/collection/FrequencySortedSet.java    |   1 -
 .../apache/sis/util/collection/IntegerList.java    |   1 -
 .../org/apache/sis/util/collection/RangeSet.java   |   7 +-
 .../apache/sis/util/collection/TableColumn.java    |   9 +-
 .../apache/sis/util/collection/TreeNodeList.java   |   1 -
 .../org/apache/sis/util/collection/TreeTable.java  |  31 ++-
 .../sis/util/collection/TreeTableFormat.java       |  16 +-
 .../org/apache/sis/util/collection/TreeTables.java |  20 +-
 .../org/apache/sis/util/collection/WeakEntry.java  |   1 -
 .../apache/sis/util/collection/WeakHashSet.java    |  19 +-
 .../sis/util/collection/WeakValueHashMap.java      |   6 +-
 .../apache/sis/util/collection/package-info.java   |   1 -
 .../org/apache/sis/util/logging/Initializer.java   |   1 -
 .../java/org/apache/sis/util/logging/Logging.java  |   1 -
 .../apache/sis/util/logging/MonolineFormatter.java |  15 +-
 .../apache/sis/util/logging/PerformanceLevel.java  |   1 -
 .../org/apache/sis/util/logging/package-info.java  |   1 -
 .../java/org/apache/sis/util/package-info.java     |   1 -
 .../java/org/apache/sis/util/resources/Errors.java |   2 -
 .../sis/util/resources/IndexedResourceBundle.java  |   5 +-
 .../apache/sis/util/resources/KeyConstants.java    |   1 -
 .../java/org/apache/sis/util/resources/Loader.java |   1 -
 .../org/apache/sis/util/resources/Messages.java    |   2 -
 .../resources/ResourceInternationalString.java     |   1 -
 .../org/apache/sis/util/resources/Vocabulary.java  |   2 -
 .../apache/sis/util/resources/package-info.java    |  13 +-
 .../sis/internal/converter/AngleConverterTest.java |   3 +-
 .../sis/internal/converter/ArrayConverterTest.java |   3 +-
 .../internal/converter/ConverterRegistryTest.java  |   3 +-
 .../internal/converter/FallbackConverterTest.java  |   3 +-
 .../internal/converter/NumberConverterTest.java    |   3 +-
 .../sis/internal/converter/PathConverterTest.java  |   3 +-
 .../internal/converter/StringConverterTest.java    |   3 +-
 .../sis/internal/converter/SystemRegistryTest.java |   3 +-
 .../apache/sis/internal/system/LoggersTest.java    |   3 +-
 .../system/ReferenceQueueConsumerTest.java         |   3 +-
 .../org/apache/sis/internal/test/AssertTest.java   |   3 +-
 .../sis/internal/test/TestUtilitiesTest.java       |   3 +-
 .../org/apache/sis/internal/test/package-info.java |   1 -
 .../apache/sis/internal/util/AbstractMapTest.java  |   3 +-
 .../java/org/apache/sis/internal/util/BagTest.java |   3 +-
 .../sis/internal/util/CheckedArrayListTest.java    |   3 +-
 .../sis/internal/util/CollectionsExtTest.java      |   3 +-
 .../sis/internal/util/DefinitionURITest.java       |   3 +-
 .../apache/sis/internal/util/DoubleDoubleTest.java |   3 +-
 .../sis/internal/util/ListOfUnknownSizeTest.java   |   3 +-
 .../internal/util/LocalizedParseExceptionTest.java |   3 +-
 .../org/apache/sis/internal/util/NumericsTest.java |   3 +-
 .../sis/internal/util/StandardDateFormatTest.java  |   3 +-
 .../org/apache/sis/internal/util/StringsTest.java  |   3 +-
 .../org/apache/sis/internal/util/X364Test.java     |   3 +-
 .../java/org/apache/sis/io/AppenderTestCase.java   |   5 +-
 .../java/org/apache/sis/io/EchoAppendable.java     |   1 -
 .../java/org/apache/sis/io/LeftMarginTest.java     |   3 +-
 .../java/org/apache/sis/io/LineAppenderTest.java   |   3 +-
 .../org/apache/sis/io/SingleCharAppendable.java    |   1 -
 .../java/org/apache/sis/io/TableAppenderTest.java  |   3 +-
 .../org/apache/sis/io/TabulationExpansionTest.java |   3 +-
 .../test/java/org/apache/sis/io/WordWrapTest.java  |   3 +-
 .../sis/io/WordWrapWithLineSeparatorTest.java      |   3 +-
 .../org/apache/sis/math/DecimalFunctionsTest.java  |   3 +-
 .../java/org/apache/sis/math/FractionTest.java     |   3 +-
 .../test/java/org/apache/sis/math/LineTest.java    |   3 +-
 .../apache/sis/math/LinearlyDerivedVectorTest.java |   3 +-
 .../org/apache/sis/math/MathFunctionsTest.java     |   3 +-
 .../test/java/org/apache/sis/math/PlaneTest.java   |   3 +-
 .../org/apache/sis/math/RepeatedVectorTest.java    |   3 +-
 .../org/apache/sis/math/StatisticsFormatTest.java  |   3 +-
 .../java/org/apache/sis/math/StatisticsTest.java   |   3 +-
 .../test/java/org/apache/sis/math/VectorTest.java  |   3 +-
 .../org/apache/sis/measure/AngleFormatTest.java    |   3 +-
 .../java/org/apache/sis/measure/AngleTest.java     |   3 +-
 .../apache/sis/measure/ConventionalUnitTest.java   |   3 +-
 .../java/org/apache/sis/measure/DateRangeTest.java |   3 +-
 .../measure/FormattedCharacterIteratorTest.java    |   3 +-
 .../apache/sis/measure/LinearConverterTest.java    |   3 +-
 .../apache/sis/measure/MeasurementRangeTest.java   |   3 +-
 .../org/apache/sis/measure/NumberRangeTest.java    |   3 +-
 .../java/org/apache/sis/measure/PrefixesTest.java  |   3 +-
 .../org/apache/sis/measure/QuantitiesTest.java     |   3 +-
 .../org/apache/sis/measure/RangeFormatTest.java    |   3 +-
 .../java/org/apache/sis/measure/RangeTest.java     |   3 +-
 .../java/org/apache/sis/measure/ScalarTest.java    |   3 +-
 .../sis/measure/SexagesimalConverterTest.java      |   3 +-
 .../org/apache/sis/measure/SystemUnitTest.java     |   3 +-
 .../org/apache/sis/measure/UnitDimensionTest.java  |   3 +-
 .../org/apache/sis/measure/UnitFormatTest.java     |   3 +-
 .../org/apache/sis/measure/UnitServicesTest.java   |   3 +-
 .../java/org/apache/sis/measure/UnitsTest.java     |   3 +-
 .../java/org/apache/sis/setup/OptionKeyTest.java   |   3 +-
 .../src/test/java/org/apache/sis/test/Assert.java  |   3 +-
 .../src/test/java/org/apache/sis/test/Assume.java  |   3 +-
 .../test/java/org/apache/sis/test/DependsOn.java   |   1 -
 .../java/org/apache/sis/test/DependsOnMethod.java  |   1 -
 .../org/apache/sis/test/LogRecordCollector.java    |   1 -
 .../java/org/apache/sis/test/LoggingWatcher.java   |  19 +-
 .../java/org/apache/sis/test/OptionalTestData.java |   1 -
 .../test/java/org/apache/sis/test/Performance.java |   1 -
 .../org/apache/sis/test/PlatformDependent.java     |   1 -
 .../org/apache/sis/test/ProjectDirectories.java    |   1 -
 .../test/java/org/apache/sis/test/TestCase.java    |  11 +-
 .../org/apache/sis/test/TestConfiguration.java     |   3 +-
 .../test/java/org/apache/sis/test/TestRunner.java  |   1 -
 .../test/java/org/apache/sis/test/TestStep.java    |   1 -
 .../test/java/org/apache/sis/test/TestSuite.java   |   7 +-
 .../java/org/apache/sis/test/TestUtilities.java    |  13 +-
 .../test/foreigner/SerializableTableColumn.java    |   3 +-
 .../apache/sis/test/foreigner/package-info.java    |   1 -
 .../java/org/apache/sis/test/package-info.java     |   1 -
 .../apache/sis/test/suite/UtilityTestSuite.java    |   3 +-
 .../org/apache/sis/test/suite/package-info.java    |   1 -
 .../org/apache/sis/util/ArgumentChecksTest.java    |   3 +-
 .../java/org/apache/sis/util/ArraysExtTest.java    |   3 +-
 .../org/apache/sis/util/CharSequencesTest.java     |   3 +-
 .../java/org/apache/sis/util/CharactersTest.java   |   3 +-
 .../test/java/org/apache/sis/util/ClassesTest.java |   3 +-
 .../sis/util/DefaultInternationalStringTest.java   |   3 +-
 .../java/org/apache/sis/util/ExceptionsTest.java   |   3 +-
 .../test/java/org/apache/sis/util/LocalesTest.java |   3 +-
 .../test/java/org/apache/sis/util/NumbersTest.java |   3 +-
 .../sis/util/SimpleInternationalStringTest.java    |   3 +-
 .../org/apache/sis/util/StringBuildersTest.java    |   3 +-
 .../java/org/apache/sis/util/UtilitiesTest.java    |   5 +-
 .../test/java/org/apache/sis/util/VersionTest.java |   3 +-
 .../org/apache/sis/util/collection/CacheTest.java  |   3 +-
 .../sis/util/collection/CodeListSetTest.java       |   3 +-
 .../sis/util/collection/DefaultTreeTableTest.java  |   3 +-
 .../apache/sis/util/collection/DerivedMapTest.java |   3 +-
 .../apache/sis/util/collection/DerivedSetTest.java |   3 +-
 .../util/collection/FrequencySortedSetTest.java    |   3 +-
 .../org/apache/sis/util/collection/IntObject.java  |   1 -
 .../sis/util/collection/IntegerListTest.java       |   3 +-
 .../apache/sis/util/collection/LargeCodeList.java  |   3 +-
 .../apache/sis/util/collection/RangeSetTest.java   |   3 +-
 .../sis/util/collection/TableColumnTest.java       |   3 +-
 .../sis/util/collection/TreeTableFormatTest.java   |   3 +-
 .../apache/sis/util/collection/TreeTablesTest.java |   3 +-
 .../sis/util/collection/WeakHashSetTest.java       |   3 +-
 .../sis/util/collection/WeakValueHashMapTest.java  |   3 +-
 .../sis/util/logging/MonolineFormatterTest.java    |   3 +-
 .../sis/util/logging/PerformanceLevelTest.java     |   3 +-
 .../util/resources/IndexedResourceBundleTest.java  |   2 +-
 .../org/apache/sis/util/resources/LoaderTest.java  |   2 +-
 ide-project/NetBeans/nbproject/project.properties  |   4 +-
 pom.xml                                            |   8 +-
 .../sis/internal/profile/fra/Constraints.java      |   5 +-
 .../internal/profile/fra/DataIdentification.java   |   5 +-
 .../profile/fra/DirectReferenceSystem.java         |   5 +-
 .../profile/fra/IndirectReferenceSystem.java       |   5 +-
 .../sis/internal/profile/fra/LegalConstraints.java |   5 +-
 .../sis/internal/profile/fra/ProfileTypes.java     |   1 -
 .../internal/profile/fra/SecurityConstraints.java  |   5 +-
 .../sis/internal/profile/fra/package-info.java     |   1 -
 .../apache/sis/profile/france/FrenchProfile.java   |   9 +-
 .../apache/sis/profile/france/package-info.java    |   1 -
 .../profile/fra/DataIdentificationTest.java        |   3 +-
 .../profile/fra/DirectReferenceSystemTest.java     |   3 +-
 .../sis/profile/france/FrenchProfileTest.java      |   3 +-
 .../sis/test/suite/FrenchProfileTestSuite.java     |   3 +-
 .../sis/internal/earth/netcdf/FactoryForUCAR.java  |   1 -
 .../apache/sis/internal/earth/netcdf/GCOM_C.java   |  11 +-
 .../apache/sis/internal/earth/netcdf/GCOM_W.java   |   6 +-
 .../sis/internal/earth/netcdf/package-info.java    |   1 -
 .../apache/sis/profile/japan/JapaneseProfile.java  |   1 -
 .../org/apache/sis/profile/japan/package-info.java |   1 -
 .../apache/sis/profile/japan/JapanProfileTest.java |   3 +-
 .../sis/test/suite/JapanProfileTestSuite.java      |   3 +-
 src/main/javadoc/sis.css                           |   6 +-
 .../java/org/apache/sis/storage/landsat/Band.java  |   1 -
 .../org/apache/sis/storage/landsat/BandGroup.java  |   1 -
 .../apache/sis/storage/landsat/BandGroupName.java  |   1 -
 .../org/apache/sis/storage/landsat/BandName.java   |   1 -
 .../apache/sis/storage/landsat/LandsatStore.java   |   6 +-
 .../sis/storage/landsat/LandsatStoreProvider.java  |   1 -
 .../apache/sis/storage/landsat/MetadataReader.java |  11 +-
 .../apache/sis/storage/landsat/package-info.java   |   1 -
 .../storage/landsat/LandsatStoreProviderTest.java  |   3 +-
 .../sis/storage/landsat/MetadataReaderTest.java    |   1 -
 .../sis/test/suite/EarthObservationTestSuite.java  |   3 +-
 .../apache/sis/internal/geotiff/Compression.java   |   1 -
 .../org/apache/sis/internal/geotiff/Predictor.java |   1 -
 .../org/apache/sis/internal/geotiff/Resources.java |   2 -
 .../sis/internal/geotiff/SchemaModifier.java       |   1 -
 .../apache/sis/internal/geotiff/package-info.java  |   1 -
 .../sis/internal/storage/inflater/CCITTRLE.java    |   1 -
 .../storage/inflater/CompressionChannel.java       |   1 -
 .../internal/storage/inflater/CopyFromBytes.java   |   1 -
 .../storage/inflater/HorizontalPredictor.java      |   1 -
 .../sis/internal/storage/inflater/Inflater.java    |   1 -
 .../apache/sis/internal/storage/inflater/LZW.java  |   1 -
 .../sis/internal/storage/inflater/PackBits.java    |   1 -
 .../internal/storage/inflater/PixelChannel.java    |   1 -
 .../storage/inflater/PredictorChannel.java         |   1 -
 .../apache/sis/internal/storage/inflater/ZIP.java  |   1 -
 .../internal/storage/inflater/package-info.java    |   1 -
 .../org/apache/sis/storage/geotiff/CRSBuilder.java |  11 +-
 .../sis/storage/geotiff/CompressedSubset.java      |   1 -
 .../org/apache/sis/storage/geotiff/DataCube.java   |   1 -
 .../org/apache/sis/storage/geotiff/DataSubset.java |   1 -
 .../apache/sis/storage/geotiff/DeferredEntry.java  |   1 -
 .../org/apache/sis/storage/geotiff/GeoCodes.java   |   1 -
 .../org/apache/sis/storage/geotiff/GeoKeys.java    |   1 -
 .../apache/sis/storage/geotiff/GeoKeysLoader.java  |  10 +-
 .../org/apache/sis/storage/geotiff/GeoTIFF.java    |   1 -
 .../apache/sis/storage/geotiff/GeoTiffStore.java   |   1 -
 .../sis/storage/geotiff/GeoTiffStoreProvider.java  |   1 -
 .../sis/storage/geotiff/GridGeometryBuilder.java   |  11 +-
 .../sis/storage/geotiff/ImageFileDirectory.java    |  11 +-
 .../sis/storage/geotiff/ImageMetadataBuilder.java  |   1 -
 .../apache/sis/storage/geotiff/Localization.java   |   1 -
 .../sis/storage/geotiff/MultiResolutionImage.java  |   1 -
 .../apache/sis/storage/geotiff/NativeMetadata.java |   1 -
 .../org/apache/sis/storage/geotiff/Reader.java     |   1 -
 .../sis/storage/geotiff/ReversedBitsChannel.java   |   1 -
 .../java/org/apache/sis/storage/geotiff/Tags.java  |   1 -
 .../java/org/apache/sis/storage/geotiff/Type.java  |   1 -
 .../apache/sis/storage/geotiff/XMLMetadata.java    |   5 +-
 .../apache/sis/storage/geotiff/package-info.java   |   1 -
 .../sis/internal/geotiff/CompressionTest.java      |   3 +-
 .../internal/storage/inflater/CCITTRLETest.java    |   3 +-
 .../internal/storage/inflater/InflaterTest.java    |   3 +-
 .../apache/sis/storage/geotiff/CRSBuilderTest.java |   8 +-
 .../apache/sis/storage/geotiff/GeoIdentifiers.java |   1 -
 .../apache/sis/storage/geotiff/GeoKeysTest.java    |   3 +-
 .../sis/storage/geotiff/SelfConsistencyTest.java   |   3 +-
 .../org/apache/sis/storage/geotiff/TagsTest.java   |   3 +-
 .../org/apache/sis/storage/geotiff/TypeTest.java   |   3 +-
 .../sis/storage/geotiff/XMLMetadataTest.java       |   7 +-
 .../apache/sis/test/suite/GeoTiffTestSuite.java    |   3 +-
 .../java/org/apache/sis/internal/netcdf/Axis.java  |   1 -
 .../org/apache/sis/internal/netcdf/AxisType.java   |   1 -
 .../org/apache/sis/internal/netcdf/CRSBuilder.java |   1 -
 .../org/apache/sis/internal/netcdf/CRSMerger.java  |   1 -
 .../org/apache/sis/internal/netcdf/Convention.java |   6 +-
 .../org/apache/sis/internal/netcdf/DataType.java   |   1 -
 .../org/apache/sis/internal/netcdf/Decoder.java    |   1 -
 .../org/apache/sis/internal/netcdf/Dimension.java  |   1 -
 .../sis/internal/netcdf/DiscreteSampling.java      |   1 -
 .../org/apache/sis/internal/netcdf/FeatureSet.java |   6 +-
 .../java/org/apache/sis/internal/netcdf/Grid.java  |   1 -
 .../apache/sis/internal/netcdf/GridAdjustment.java |  11 +-
 .../apache/sis/internal/netcdf/GridCacheKey.java   |   5 +-
 .../apache/sis/internal/netcdf/GridCacheValue.java |   1 -
 .../apache/sis/internal/netcdf/GridMapping.java    |   5 +-
 .../java/org/apache/sis/internal/netcdf/HYCOM.java |   6 +-
 .../org/apache/sis/internal/netcdf/Linearizer.java |   1 -
 .../apache/sis/internal/netcdf/NamedElement.java   |   1 -
 .../java/org/apache/sis/internal/netcdf/Node.java  |   1 -
 .../org/apache/sis/internal/netcdf/Raster.java     |   1 -
 .../apache/sis/internal/netcdf/RasterResource.java |   5 +-
 .../org/apache/sis/internal/netcdf/Resources.java  |   2 -
 .../org/apache/sis/internal/netcdf/Variable.java   |   6 +-
 .../apache/sis/internal/netcdf/VariableRole.java   |   1 -
 .../sis/internal/netcdf/impl/ChannelDecoder.java   |   7 +-
 .../sis/internal/netcdf/impl/DimensionInfo.java    |   1 -
 .../apache/sis/internal/netcdf/impl/GridInfo.java  |   1 -
 .../sis/internal/netcdf/impl/VariableInfo.java     |   1 -
 .../sis/internal/netcdf/impl/package-info.java     |   1 -
 .../apache/sis/internal/netcdf/package-info.java   |   1 -
 .../sis/internal/netcdf/ucar/DecoderWrapper.java   |   1 -
 .../sis/internal/netcdf/ucar/DimensionWrapper.java |   1 -
 .../sis/internal/netcdf/ucar/FeaturesWrapper.java  |   1 -
 .../sis/internal/netcdf/ucar/GridWrapper.java      |   1 -
 .../sis/internal/netcdf/ucar/GroupWrapper.java     |   1 -
 .../sis/internal/netcdf/ucar/LogAdapter.java       |   1 -
 .../org/apache/sis/internal/netcdf/ucar/Utils.java |   1 -
 .../sis/internal/netcdf/ucar/VariableWrapper.java  |   1 -
 .../sis/internal/netcdf/ucar/package-info.java     |   1 -
 .../apache/sis/storage/netcdf/AttributeNames.java  |   4 -
 .../apache/sis/storage/netcdf/MetadataReader.java  |   1 -
 .../org/apache/sis/storage/netcdf/NetcdfStore.java |   1 -
 .../sis/storage/netcdf/NetcdfStoreProvider.java    |   1 -
 .../apache/sis/storage/netcdf/package-info.java    |   1 -
 .../org/apache/sis/internal/netcdf/AxisTest.java   |   3 +-
 .../apache/sis/internal/netcdf/DataTypeTest.java   |   3 +-
 .../apache/sis/internal/netcdf/DecoderTest.java    |   3 +-
 .../apache/sis/internal/netcdf/FeatureSetTest.java |   3 +-
 .../org/apache/sis/internal/netcdf/GridTest.java   |   3 +-
 .../org/apache/sis/internal/netcdf/TestCase.java   |   3 +-
 .../apache/sis/internal/netcdf/VariableTest.java   |   3 +-
 .../internal/netcdf/impl/ChannelDecoderTest.java   |   3 +-
 .../sis/internal/netcdf/impl/FeatureSetTest.java   |   3 +-
 .../sis/internal/netcdf/impl/GridInfoTest.java     |   3 +-
 .../sis/internal/netcdf/impl/VariableInfoTest.java |   3 +-
 .../sis/storage/netcdf/MetadataReaderTest.java     |   3 +-
 .../storage/netcdf/NetcdfStoreProviderTest.java    |   3 +-
 .../apache/sis/storage/netcdf/NetcdfStoreTest.java |   3 +-
 .../sis/storage/netcdf/SelfConsistencyTest.java    |   3 +-
 .../org/apache/sis/test/suite/NetcdfTestSuite.java |   3 +-
 ...nvalidRecordNumberForDirectAccessException.java |   1 -
 .../SQLNoDirectAccessAvailableException.java       |   1 -
 .../shapefile/SQLShapefileNotFoundException.java   |   1 -
 .../internal/shapefile/ShapefileByteReader.java    |   1 -
 .../internal/shapefile/ShapefileDescriptor.java    |   1 -
 .../shapefile/jdbc/AbstractDbase3ByteReader.java   |   1 -
 .../sis/internal/shapefile/jdbc/AbstractJDBC.java  |   1 -
 .../internal/shapefile/jdbc/CommonByteReader.java  |   1 -
 .../sis/internal/shapefile/jdbc/DBFDriver.java     |   1 -
 .../shapefile/jdbc/DBase3FieldDescriptor.java      |   1 -
 .../sis/internal/shapefile/jdbc/DBaseDataType.java |   1 -
 .../internal/shapefile/jdbc/MappedByteReader.java  |   1 -
 .../jdbc/SQLDbaseFileNotFoundException.java        |   1 -
 .../jdbc/SQLInvalidDbaseFileFormatException.java   |   1 -
 .../jdbc/connection/AbstractConnection.java        |   1 -
 .../shapefile/jdbc/connection/DBFConnection.java   |   1 -
 .../sis/internal/shapefile/jdbc/package-info.java  |   1 -
 .../jdbc/resultset/AbstractResultSet.java          |   1 -
 .../jdbc/resultset/BuiltInMemoryResultSet.java     |   1 -
 .../jdbc/statement/AbstractStatement.java          |   1 -
 .../shapefile/jdbc/statement/DBFStatement.java     |   1 -
 .../sis/internal/shapefile/package-info.java       |   1 -
 .../storage/shapefile/DataStoreQueryException.java |   1 -
 .../shapefile/DataStoreQueryResultException.java   |   1 -
 .../shapefile/DbaseFileNotFoundException.java      |   1 -
 .../sis/storage/shapefile/InputFeatureStream.java  |   1 -
 .../shapefile/InvalidDbaseFileFormatException.java |   1 -
 .../shapefile/InvalidShapefileFormatException.java |   1 -
 .../apache/sis/storage/shapefile/ShapeFile.java    |   1 -
 .../sis/storage/shapefile/ShapeTypeEnum.java       |   1 -
 .../shapefile/ShapefileNotFoundException.java      |   1 -
 .../apache/sis/storage/shapefile/cpg/CpgFiles.java |   1 -
 .../apache/sis/storage/shapefile/package-info.java |   1 -
 .../internal/shapefile/jdbc/DBFConnectionTest.java |   1 -
 .../internal/shapefile/jdbc/DBFResultSetTest.java  |   1 -
 .../internal/shapefile/jdbc/DBFStatementTest.java  |   1 -
 .../sis/storage/shapefile/ShapeFileTest.java       |   3 +-
 .../apache/sis/test/suite/ShapefileTestSuite.java  |   2 +-
 .../apache/sis/internal/sql/feature/Analyzer.java  |   1 -
 .../sis/internal/sql/feature/BinaryEncoding.java   |   1 -
 .../apache/sis/internal/sql/feature/Column.java    |   1 -
 .../apache/sis/internal/sql/feature/Database.java  |   1 -
 .../sis/internal/sql/feature/FeatureAdapter.java   |   1 -
 .../sis/internal/sql/feature/FeatureAnalyzer.java  |   5 +-
 .../sis/internal/sql/feature/FeatureIterator.java  |   1 -
 .../sis/internal/sql/feature/FeatureStream.java    |   1 -
 .../sis/internal/sql/feature/GeometryGetter.java   |   1 -
 .../sis/internal/sql/feature/InfoStatements.java   |   1 -
 .../sis/internal/sql/feature/PrimaryKey.java       |   1 -
 .../sis/internal/sql/feature/QueryAnalyzer.java    |   1 -
 .../apache/sis/internal/sql/feature/Relation.java  |   1 -
 .../apache/sis/internal/sql/feature/Resources.java |   2 -
 .../sis/internal/sql/feature/SchemaModifier.java   |   1 -
 .../sis/internal/sql/feature/SelectionClause.java  |   1 -
 .../sql/feature/SelectionClauseWriter.java         |   1 -
 .../org/apache/sis/internal/sql/feature/Table.java |   1 -
 .../sis/internal/sql/feature/TableAnalyzer.java    |   1 -
 .../sis/internal/sql/feature/TableReference.java   |   1 -
 .../sis/internal/sql/feature/ValueGetter.java      |   1 -
 .../sis/internal/sql/feature/package-info.java     |   1 -
 .../org/apache/sis/internal/sql/postgis/Band.java  |   1 -
 .../internal/sql/postgis/ExtendedClauseWriter.java |   1 -
 .../sis/internal/sql/postgis/ExtendedInfo.java     |   1 -
 .../sis/internal/sql/postgis/ExtentEstimator.java  |   1 -
 .../sis/internal/sql/postgis/ObjectGetter.java     |   1 -
 .../apache/sis/internal/sql/postgis/Postgres.java  |   1 -
 .../sis/internal/sql/postgis/RasterFormat.java     |   1 -
 .../sis/internal/sql/postgis/RasterGetter.java     |   1 -
 .../sis/internal/sql/postgis/RasterReader.java     |   1 -
 .../sis/internal/sql/postgis/RasterWriter.java     |   1 -
 .../sis/internal/sql/postgis/package-info.java     |   1 -
 .../sis/internal/stream/BaseStreamWrapper.java     |   1 -
 .../apache/sis/internal/stream/DeferredStream.java |   5 +-
 .../sis/internal/stream/DoubleStreamWrapper.java   |   1 -
 .../sis/internal/stream/PaginedDoubleStream.java   |   1 -
 .../apache/sis/internal/stream/PaginedStream.java  |   1 -
 .../apache/sis/internal/stream/StreamWrapper.java  |   1 -
 .../apache/sis/internal/stream/package-info.java   |   1 -
 .../apache/sis/storage/sql/ResourceDefinition.java |   1 -
 .../java/org/apache/sis/storage/sql/SQLStore.java  |   1 -
 .../apache/sis/storage/sql/SQLStoreProvider.java   |   1 -
 .../org/apache/sis/storage/sql/package-info.java   |   1 -
 .../internal/sql/feature/GeometryGetterTest.java   |   3 +-
 .../sis/internal/sql/feature/ResultSetMock.java    |   1 -
 .../sql/feature/SelectionClauseWriterTest.java     |   3 +-
 .../apache/sis/internal/sql/postgis/BandTest.java  |   3 +-
 .../sis/internal/sql/postgis/PostgresTest.java     |   3 +-
 .../sis/internal/sql/postgis/RasterReaderTest.java |   3 +-
 .../sis/internal/sql/postgis/RasterWriterTest.java |   3 +-
 .../sis/internal/sql/postgis/TestRaster.java       |   1 -
 .../org/apache/sis/storage/sql/SQLStoreTest.java   |   3 +-
 .../org/apache/sis/test/suite/SQLTestSuite.java    |   2 +-
 .../apache/sis/internal/storage/Capability.java    |   1 -
 .../org/apache/sis/internal/storage/CodeType.java  |   1 -
 .../internal/storage/DocumentedStoreProvider.java  |   1 -
 .../internal/storage/FeatureCatalogBuilder.java    |   5 +-
 .../sis/internal/storage/GridResourceWrapper.java  |   1 -
 .../sis/internal/storage/MemoryFeatureSet.java     |   1 -
 .../sis/internal/storage/MemoryGridResource.java   |   1 -
 .../sis/internal/storage/MetadataBuilder.java      |  10 +-
 .../apache/sis/internal/storage/PRJDataStore.java  |   2 -
 .../apache/sis/internal/storage/RangeArgument.java |   5 +-
 .../sis/internal/storage/ResourceLineage.java      |   1 -
 .../sis/internal/storage/ResourceOnFileSystem.java |   1 -
 .../sis/internal/storage/ResourceTransaction.java  |   1 -
 .../org/apache/sis/internal/storage/Resources.java |   2 -
 .../apache/sis/internal/storage/StoreMetadata.java |   1 -
 .../apache/sis/internal/storage/StoreResource.java |   1 -
 .../sis/internal/storage/StoreTypeDetector.java    |   1 -
 .../sis/internal/storage/StoreUtilities.java       |   5 +-
 .../sis/internal/storage/TiledDeferredImage.java   |   1 -
 .../sis/internal/storage/TiledGridCoverage.java    |   5 +-
 .../sis/internal/storage/TiledGridResource.java    |   1 -
 .../internal/storage/TransactionalResource.java    |   1 -
 .../apache/sis/internal/storage/URIDataStore.java  |   2 -
 .../internal/storage/WritableResourceSupport.java  |   1 -
 .../sis/internal/storage/csv/FeatureIterator.java  |  10 +-
 .../sis/internal/storage/csv/FixedSizeList.java    |   1 -
 .../apache/sis/internal/storage/csv/Foliation.java |   1 -
 .../sis/internal/storage/csv/GeometryParser.java   |   1 -
 .../internal/storage/csv/MovingFeatureBuilder.java |   1 -
 .../storage/csv/MovingFeatureIterator.java         |   5 +-
 .../org/apache/sis/internal/storage/csv/Store.java |  19 +-
 .../sis/internal/storage/csv/StoreProvider.java    |   1 -
 .../sis/internal/storage/csv/TimeEncoding.java     |   1 -
 .../sis/internal/storage/csv/package-info.java     |   9 +-
 .../sis/internal/storage/esri/AsciiGridStore.java  |   1 -
 .../storage/esri/AsciiGridStoreProvider.java       |   1 -
 .../sis/internal/storage/esri/CharactersView.java  |   1 -
 .../sis/internal/storage/esri/RasterStore.java     |   1 -
 .../sis/internal/storage/esri/RawRasterLayout.java |   1 -
 .../sis/internal/storage/esri/RawRasterReader.java |   1 -
 .../sis/internal/storage/esri/RawRasterStore.java  |   1 -
 .../storage/esri/RawRasterStoreProvider.java       |   1 -
 .../sis/internal/storage/esri/WritableStore.java   |   1 -
 .../sis/internal/storage/esri/package-info.java    |   1 -
 .../apache/sis/internal/storage/folder/Store.java  |   1 -
 .../sis/internal/storage/folder/StoreProvider.java |   1 -
 .../storage/folder/UnstructuredAggregate.java      |   1 -
 .../sis/internal/storage/folder/WritableStore.java |   1 -
 .../sis/internal/storage/folder/package-info.java  |   1 -
 .../sis/internal/storage/image/FormatFilter.java   |   1 -
 .../sis/internal/storage/image/FormatFinder.java   |   1 -
 .../internal/storage/image/MultiImageStore.java    |   1 -
 .../internal/storage/image/SingleImageStore.java   |   1 -
 .../internal/storage/image/WarningListener.java    |   1 -
 .../internal/storage/image/WorldFileResource.java  |   1 -
 .../sis/internal/storage/image/WorldFileStore.java |   1 -
 .../storage/image/WorldFileStoreProvider.java      |   1 -
 .../internal/storage/image/WritableResource.java   |   1 -
 .../sis/internal/storage/image/WritableStore.java  |   1 -
 .../sis/internal/storage/image/package-info.java   |   1 -
 .../apache/sis/internal/storage/io/ByteWriter.java |   1 -
 .../sis/internal/storage/io/ChannelData.java       |   7 +-
 .../sis/internal/storage/io/ChannelDataInput.java  |  17 +-
 .../sis/internal/storage/io/ChannelDataOutput.java |  29 ++-
 .../sis/internal/storage/io/ChannelFactory.java    |   1 -
 .../storage/io/ChannelImageInputStream.java        |  17 +-
 .../storage/io/ChannelImageOutputStream.java       |   1 -
 .../sis/internal/storage/io/DataTransfer.java      |   1 -
 .../internal/storage/io/FileCacheByteChannel.java  |   5 +-
 .../sis/internal/storage/io/HttpByteChannel.java   |   1 -
 .../internal/storage/io/HyperRectangleReader.java  |   1 -
 .../sis/internal/storage/io/IOUtilities.java       |   1 -
 .../internal/storage/io/InputStreamAdapter.java    |   1 -
 .../sis/internal/storage/io/InternalOptionKey.java |   1 -
 .../apache/sis/internal/storage/io/Markable.java   |   1 -
 .../internal/storage/io/MemoryDataTransfer.java    |   1 -
 .../sis/internal/storage/io/NullChannel.java       |   1 -
 .../internal/storage/io/OutputStreamAdapter.java   |   1 -
 .../org/apache/sis/internal/storage/io/Region.java |   1 -
 .../internal/storage/io/RewindableLineReader.java  |   1 -
 .../sis/internal/storage/io/package-info.java      |   1 -
 .../apache/sis/internal/storage/package-info.java  |   1 -
 .../sis/internal/storage/wkt/FirstKeywordPeek.java |   1 -
 .../org/apache/sis/internal/storage/wkt/Store.java |   1 -
 .../sis/internal/storage/wkt/StoreFormat.java      |   1 -
 .../sis/internal/storage/wkt/StoreProvider.java    |   1 -
 .../sis/internal/storage/wkt/package-info.java     |   1 -
 .../sis/internal/storage/xml/AbstractProvider.java |   1 -
 .../internal/storage/xml/GeographicEnvelope.java   |   1 -
 .../sis/internal/storage/xml/MimeTypeDetector.java |   1 -
 .../org/apache/sis/internal/storage/xml/Store.java |   1 -
 .../sis/internal/storage/xml/StoreProvider.java    |   1 -
 .../sis/internal/storage/xml/package-info.java     |   1 -
 .../org/apache/sis/storage/AbstractFeatureSet.java |   1 -
 .../sis/storage/AbstractGridCoverageResource.java  |   1 -
 .../org/apache/sis/storage/AbstractResource.java   |   1 -
 .../java/org/apache/sis/storage/Aggregate.java     |   1 -
 .../apache/sis/storage/CanNotProbeException.java   |   1 -
 .../sis/storage/ConcurrentReadException.java       |   1 -
 .../sis/storage/ConcurrentWriteException.java      |   1 -
 .../java/org/apache/sis/storage/CoverageQuery.java |   1 -
 .../org/apache/sis/storage/CoverageSubset.java     |   1 -
 .../java/org/apache/sis/storage/DataOptionKey.java |   1 -
 .../main/java/org/apache/sis/storage/DataSet.java  |   1 -
 .../java/org/apache/sis/storage/DataStore.java     |   5 +-
 .../sis/storage/DataStoreClosedException.java      |   1 -
 .../sis/storage/DataStoreContentException.java     |   1 -
 .../org/apache/sis/storage/DataStoreException.java |   1 -
 .../org/apache/sis/storage/DataStoreProvider.java  |  13 +-
 .../sis/storage/DataStoreReferencingException.java |   1 -
 .../org/apache/sis/storage/DataStoreRegistry.java  |   1 -
 .../java/org/apache/sis/storage/DataStores.java    |   1 -
 .../java/org/apache/sis/storage/FeatureNaming.java |  12 +-
 .../java/org/apache/sis/storage/FeatureQuery.java  |   1 -
 .../java/org/apache/sis/storage/FeatureSet.java    |  10 +-
 .../java/org/apache/sis/storage/FeatureSubset.java |   1 -
 .../sis/storage/ForwardOnlyStorageException.java   |   1 -
 .../apache/sis/storage/GridCoverageResource.java   |   1 -
 .../sis/storage/IllegalFeatureTypeException.java   |   1 -
 .../apache/sis/storage/IllegalNameException.java   |   1 -
 .../sis/storage/IllegalOpenParameterException.java |   1 -
 .../sis/storage/IncompatibleResourceException.java |   1 -
 .../sis/storage/InternalDataStoreException.java    |   1 -
 .../apache/sis/storage/NoSuchDataException.java    |   1 -
 .../org/apache/sis/storage/ProbeInputStream.java   |   1 -
 .../org/apache/sis/storage/ProbeProviderPair.java  |   1 -
 .../java/org/apache/sis/storage/ProbeReader.java   |   1 -
 .../java/org/apache/sis/storage/ProbeResult.java   |   3 +-
 .../main/java/org/apache/sis/storage/Query.java    |   1 -
 .../apache/sis/storage/RasterLoadingStrategy.java  |   1 -
 .../sis/storage/ReadOnlyStorageException.java      |   1 -
 .../main/java/org/apache/sis/storage/Resource.java |   1 -
 .../storage/ResourceAlreadyExistsException.java    |   1 -
 .../org/apache/sis/storage/StorageConnector.java   |   1 -
 .../sis/storage/UnsupportedEncodingException.java  |   1 -
 .../sis/storage/UnsupportedQueryException.java     |   1 -
 .../sis/storage/UnsupportedStorageException.java   |   1 -
 .../org/apache/sis/storage/WritableAggregate.java  |   1 -
 .../org/apache/sis/storage/WritableFeatureSet.java |   1 -
 .../sis/storage/WritableGridCoverageResource.java  |   3 -
 .../storage/aggregate/AggregatedFeatureSet.java    |   1 -
 .../sis/storage/aggregate/AggregatedResource.java  |   1 -
 .../storage/aggregate/ConcatenatedFeatureSet.java  |   1 -
 .../aggregate/ConcatenatedGridCoverage.java        |   1 -
 .../aggregate/ConcatenatedGridResource.java        |   1 -
 .../sis/storage/aggregate/CoverageAggregator.java  |   6 +-
 .../sis/storage/aggregate/DimensionSelector.java   |   1 -
 .../apache/sis/storage/aggregate/GridSlice.java    |   1 -
 .../sis/storage/aggregate/GridSliceLocator.java    |   1 -
 .../org/apache/sis/storage/aggregate/Group.java    |   1 -
 .../sis/storage/aggregate/GroupAggregate.java      |   1 -
 .../apache/sis/storage/aggregate/GroupByCRS.java   |   1 -
 .../sis/storage/aggregate/GroupBySample.java       |   1 -
 .../sis/storage/aggregate/GroupByTransform.java    |   1 -
 .../sis/storage/aggregate/JoinFeatureSet.java      |   1 -
 .../sis/storage/aggregate/MergeStrategy.java       |   1 -
 .../apache/sis/storage/aggregate/package-info.java |   1 -
 .../sis/storage/event/CascadedStoreEvent.java      |   1 -
 .../org/apache/sis/storage/event/CloseEvent.java   |   1 -
 .../org/apache/sis/storage/event/StoreEvent.java   |   1 -
 .../apache/sis/storage/event/StoreListener.java    |   1 -
 .../apache/sis/storage/event/StoreListeners.java   |   5 +-
 .../org/apache/sis/storage/event/WarningEvent.java |   1 -
 .../org/apache/sis/storage/event/package-info.java |   1 -
 .../java/org/apache/sis/storage/package-info.java  |   1 -
 .../java/org/apache/sis/storage/tiling/Tile.java   |   1 -
 .../org/apache/sis/storage/tiling/TileMatrix.java  |   1 -
 .../apache/sis/storage/tiling/TileMatrixSet.java   |   1 -
 .../org/apache/sis/storage/tiling/TileStatus.java  |   1 -
 .../apache/sis/storage/tiling/TiledResource.java   |   1 -
 .../sis/storage/tiling/WritableTileMatrix.java     |   1 -
 .../sis/storage/tiling/WritableTileMatrixSet.java  |   1 -
 .../sis/storage/tiling/WritableTiledResource.java  |   1 -
 .../apache/sis/storage/tiling/package-info.java    |   1 -
 .../apache/sis/internal/storage/CodeTypeTest.java  |   3 +-
 .../internal/storage/MemoryGridResourceTest.java   |   3 +-
 .../sis/internal/storage/MetadataBuilderTest.java  |   8 +-
 .../sis/internal/storage/RangeArgumentTest.java    |   3 +-
 .../sis/internal/storage/StoreUtilitiesTest.java   |   3 +-
 .../internal/storage/csv/StoreProviderTest.java    |   3 +-
 .../apache/sis/internal/storage/csv/StoreTest.java |   7 +-
 .../internal/storage/esri/AsciiGridStoreTest.java  |   3 +-
 .../internal/storage/esri/BILConsistencyTest.java  |   3 +-
 .../internal/storage/esri/BIPConsistencyTest.java  |   3 +-
 .../internal/storage/esri/BSQConsistencyTest.java  |   3 +-
 .../internal/storage/esri/WritableStoreTest.java   |   3 +-
 .../sis/internal/storage/folder/StoreTest.java     |   3 +-
 .../storage/image/SelfConsistencyTest.java         |   3 +-
 .../internal/storage/image/WorldFileStoreTest.java |   3 +-
 .../sis/internal/storage/io/ByteArrayChannel.java  |   3 +-
 .../internal/storage/io/ChannelDataInputTest.java  |   3 +-
 .../internal/storage/io/ChannelDataOutputTest.java |   3 +-
 .../internal/storage/io/ChannelDataTestCase.java   |   3 +-
 .../storage/io/ChannelImageInputStreamTest.java    |   3 +-
 .../storage/io/ChannelImageOutputStreamTest.java   |   3 +-
 .../internal/storage/io/ComputedInputStream.java   |   3 +-
 .../sis/internal/storage/io/DripByteChannel.java   |   3 +-
 .../storage/io/FileCacheByteChannelTest.java       |   3 +-
 .../storage/io/HyperRectangleReaderTest.java       |   3 +-
 .../sis/internal/storage/io/IOUtilitiesTest.java   |   3 +-
 .../storage/io/ImageInputStreamComparator.java     |   1 -
 .../storage/io/MemoryCacheImageOutputStream.java   |   3 +-
 .../storage/io/RewindableLineReaderTest.java       |   3 +-
 .../internal/storage/wkt/StoreProviderTest.java    |   3 +-
 .../apache/sis/internal/storage/wkt/StoreTest.java |   3 +-
 .../internal/storage/xml/MimeTypeDetectorTest.java |   3 +-
 .../internal/storage/xml/StoreProviderTest.java    |   3 +-
 .../apache/sis/internal/storage/xml/StoreTest.java |   3 +-
 .../org/apache/sis/storage/CoverageQueryTest.java  |   2 +-
 .../java/org/apache/sis/storage/DataStoreMock.java |   3 +-
 .../apache/sis/storage/DataStoreProviderTest.java  |   3 +-
 .../org/apache/sis/storage/DataStoresTest.java     |   3 +-
 .../org/apache/sis/storage/FeatureNamingTest.java  |   3 +-
 .../org/apache/sis/storage/FeatureQueryTest.java   |   3 +-
 .../org/apache/sis/storage/GridResourceMock.java   |   2 +-
 .../org/apache/sis/storage/ProbeResultTest.java    |   3 +-
 .../apache/sis/storage/StorageConnectorTest.java   |   3 +-
 .../aggregate/ConcatenatedFeatureSetTest.java      |   3 +-
 .../storage/aggregate/CoverageAggregatorTest.java  |   3 +-
 .../sis/storage/aggregate/JoinFeatureSetTest.java  |   3 +-
 .../sis/storage/event/StoreListenersTest.java      |   3 +-
 .../sis/test/storage/CoverageReadConsistency.java  |   3 +-
 .../apache/sis/test/storage/SubsampledImage.java   |   1 -
 .../org/apache/sis/test/storage/package-info.java  |   1 -
 .../apache/sis/test/suite/StorageTestSuite.java    |   3 +-
 .../sis/internal/storage/gpx/Attributes.java       |   1 -
 .../apache/sis/internal/storage/gpx/Bounds.java    |   1 -
 .../apache/sis/internal/storage/gpx/Copyright.java |   1 -
 .../org/apache/sis/internal/storage/gpx/Email.java |   1 -
 .../storage/gpx/GroupAsPolylineOperation.java      |   1 -
 .../org/apache/sis/internal/storage/gpx/Link.java  |   9 +-
 .../apache/sis/internal/storage/gpx/Metadata.java  |   5 +-
 .../apache/sis/internal/storage/gpx/Person.java    |   1 -
 .../apache/sis/internal/storage/gpx/Reader.java    |   5 +-
 .../org/apache/sis/internal/storage/gpx/Store.java |   1 -
 .../sis/internal/storage/gpx/StoreProvider.java    |   1 -
 .../org/apache/sis/internal/storage/gpx/Tags.java  |   1 -
 .../org/apache/sis/internal/storage/gpx/Types.java |   1 -
 .../apache/sis/internal/storage/gpx/Updater.java   |   1 -
 .../sis/internal/storage/gpx/WritableStore.java    |   1 -
 .../apache/sis/internal/storage/gpx/Writer.java    |   1 -
 .../sis/internal/storage/gpx/package-info.java     |   5 +-
 .../storage/xml/stream/FormattedWriter.java        |   1 -
 .../sis/internal/storage/xml/stream/InputType.java |   1 -
 .../storage/xml/stream/NamespaceEraser.java        |   1 -
 .../internal/storage/xml/stream/OutputType.java    |   1 -
 .../storage/xml/stream/RewriteOnUpdate.java        |   1 -
 .../internal/storage/xml/stream/StaxDataStore.java |   1 -
 .../storage/xml/stream/StaxDataStoreProvider.java  |   1 -
 .../internal/storage/xml/stream/StaxStreamIO.java  |   1 -
 .../storage/xml/stream/StaxStreamReader.java       |  11 +-
 .../storage/xml/stream/StaxStreamWriter.java       |  17 +-
 .../internal/storage/xml/stream/package-info.java  |   1 -
 .../main/java/org/apache/sis/storage/gps/Fix.java  |   1 -
 .../org/apache/sis/storage/gps/package-info.java   |   1 -
 .../sis/internal/storage/gpx/MetadataTest.java     |   3 +-
 .../sis/internal/storage/gpx/ReaderTest.java       |   3 +-
 .../apache/sis/internal/storage/gpx/TypesTest.java |   3 +-
 .../sis/internal/storage/gpx/UpdaterTest.java      |   3 +-
 .../sis/internal/storage/gpx/WriterTest.java       |   3 +-
 .../org/apache/sis/test/suite/GPXTestSuite.java    |   2 +-
 2867 files changed, 2961 insertions(+), 6471 deletions(-)
 delete mode 100644 core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
 delete mode 100644 core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java


[sis] 02/06: First round of remplacement of `@preformat` tag by `@snippet`. Apply on Java, SQL, XML, WKT and shell snippets.

Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 94c8141b4e13f8ffe40ed5be0da49ec88aafc410
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Dec 28 14:35:37 2022 +0100

    First round of remplacement of `@preformat` tag by `@snippet`.
    Apply on Java, SQL, XML, WKT and shell snippets.
    
    https://issues.apache.org/jira/browse/SIS-565
---
 .../org/apache/sis/console/MimeTypeCommand.java    |   4 +-
 .../java/org/apache/sis/console/package-info.java  |   8 +-
 .../apache/sis/gui/coverage/CoverageCanvas.java    |   4 +-
 .../java/org/apache/sis/gui/map/MapCanvas.java     |   6 +-
 .../java/org/apache/sis/gui/map/MapCanvasAWT.java  |   4 +-
 .../apache/sis/internal/gui/DataStoreOpener.java   |   6 +-
 .../apache/sis/internal/gui/io/FileAccessItem.java |   2 +-
 .../java/org/apache/sis/openoffice/CacheKey.java   |  22 ++--
 .../apache/sis/internal/unopkg/package-info.java   |   2 +-
 .../sis/coverage/grid/BufferedGridCoverage.java    |   6 +-
 .../coverage/grid/CoordinateOperationFinder.java   |  12 +-
 .../org/apache/sis/coverage/grid/GridCoverage.java |   6 +-
 .../sis/coverage/grid/GridCoverageBuilder.java     |  29 +++--
 .../apache/sis/coverage/grid/GridDerivation.java   |  48 ++++---
 .../org/apache/sis/coverage/grid/GridExtent.java   |  12 +-
 .../org/apache/sis/coverage/grid/GridGeometry.java |  23 ++--
 .../apache/sis/coverage/grid/ImageRenderer.java    |  25 ++--
 .../grid/IncompleteGridGeometryException.java      |   4 +-
 .../apache/sis/coverage/grid/PixelTranslation.java |  25 ++--
 .../org/apache/sis/feature/AbstractAttribute.java  |  30 ++---
 .../org/apache/sis/feature/AbstractFeature.java    |  40 +++---
 .../apache/sis/feature/DefaultAssociationRole.java |  29 ++---
 .../org/apache/sis/feature/FeatureOperations.java  |  15 +--
 .../sis/feature/builder/AttributeTypeBuilder.java  |  25 ++--
 .../sis/feature/builder/FeatureTypeBuilder.java    |  28 ++--
 .../apache/sis/feature/builder/TypeBuilder.java    |   6 +-
 .../apache/sis/feature/builder/package-info.java   |   4 +-
 .../java/org/apache/sis/filter/Optimization.java   |   4 +-
 .../java/org/apache/sis/image/AnnotatedImage.java  |   4 +-
 .../java/org/apache/sis/image/ComputedImage.java   |  12 +-
 .../java/org/apache/sis/image/MaskedImage.java     |   8 +-
 .../java/org/apache/sis/image/PixelIterator.java   |  32 +++--
 .../java/org/apache/sis/image/PlanarImage.java     |   4 +-
 .../java/org/apache/sis/image/ResampledImage.java  |   4 +-
 .../apache/sis/image/WritablePixelIterator.java    |   4 +-
 .../internal/coverage/j2d/ColorModelFactory.java   |   6 +-
 .../internal/processing/image/TiledProcess.java    |  12 +-
 .../processing/isoline/PolylineBuffer.java         |   4 +-
 .../sis/internal/jaxb/AdapterReplacement.java      |   8 +-
 .../java/org/apache/sis/internal/jaxb/Context.java |  13 +-
 .../sis/internal/jaxb/NonMarshalledAuthority.java  |   4 +-
 .../sis/internal/jaxb/cat/CodeListAdapter.java     |   6 +-
 .../apache/sis/internal/jaxb/cat/CodeListUID.java  |   4 +-
 .../apache/sis/internal/jaxb/cat/EnumAdapter.java  |   2 +-
 .../sis/internal/jaxb/gco/GO_GenericName.java      |   4 +-
 .../org/apache/sis/internal/jaxb/gco/GO_URL.java   |   2 +-
 .../apache/sis/internal/jaxb/gco/Multiplicity.java |   4 +-
 .../apache/sis/internal/jaxb/gco/NameValue.java    |   4 +-
 .../sis/internal/jaxb/gco/ObjectReference.java     |   4 +-
 .../apache/sis/internal/jaxb/gco/PropertyType.java |  24 ++--
 .../apache/sis/internal/jaxb/gco/package-info.java |   4 +-
 .../org/apache/sis/internal/jaxb/gcx/FileName.java |   2 +-
 .../apache/sis/internal/jaxb/gcx/MimeFileType.java |   2 +-
 .../apache/sis/internal/jaxb/gml/DateAdapter.java  |   6 +-
 .../org/apache/sis/internal/jaxb/gml/Measure.java  |   4 +-
 .../sis/internal/jaxb/gml/SC_VerticalCRS.java      |  26 ++--
 .../sis/internal/jaxb/gml/TimePeriodBound.java     |   8 +-
 .../org/apache/sis/internal/jaxb/lan/Country.java  |   2 +-
 .../apache/sis/internal/jaxb/lan/LanguageCode.java |   6 +-
 .../sis/internal/jaxb/lan/LocaleAdapter.java       |   4 +-
 .../apache/sis/internal/jaxb/lan/PT_FreeText.java  |   2 +-
 .../apache/sis/internal/jaxb/lan/PT_Locale.java    |   2 +-
 .../apache/sis/internal/jaxb/lan/TextGroup.java    |   4 +-
 .../sis/internal/jaxb/metadata/package-info.java   |   4 +-
 .../jaxb/metadata/replace/RS_Identifier.java       |   4 +-
 .../jaxb/metadata/replace/ServiceParameter.java    |   4 +-
 .../sis/internal/metadata/sql/SQLBuilder.java      |  14 +-
 .../sis/internal/metadata/sql/SQLUtilities.java    |   8 +-
 .../sis/internal/metadata/sql/ScriptRunner.java    |  16 +--
 .../sis/internal/metadata/sql/package-info.java    |   4 +-
 .../org/apache/sis/metadata/AbstractMetadata.java  |  28 ++--
 .../org/apache/sis/metadata/MetadataStandard.java  |  34 +++--
 .../apache/sis/metadata/ModifiableMetadata.java    |  12 +-
 .../org/apache/sis/metadata/PropertyAccessor.java  |  10 +-
 .../java/org/apache/sis/metadata/TreeNode.java     |   4 +-
 .../org/apache/sis/metadata/TreeNodeChildren.java  |   4 +-
 .../apache/sis/metadata/ValueExistencePolicy.java  |   4 +-
 .../apache/sis/metadata/iso/DefaultIdentifier.java |   6 +-
 .../sis/metadata/iso/citation/Citations.java       |   4 +-
 .../sis/metadata/iso/citation/DefaultCitation.java |  24 ++--
 .../iso/citation/DefaultOnlineResource.java        |   7 +-
 .../apache/sis/metadata/iso/extent/Extents.java    |   4 +-
 .../DefaultRepresentativeFraction.java             |   6 +-
 .../apache/sis/metadata/sql/MetadataSource.java    |  12 +-
 .../apache/sis/metadata/sql/MetadataWriter.java    |   4 +-
 .../org/apache/sis/util/iso/DefaultLocalName.java  |   8 +-
 .../org/apache/sis/util/iso/DefaultNameSpace.java  |  10 +-
 .../org/apache/sis/util/iso/DefaultRecord.java     |  16 +--
 .../org/apache/sis/util/iso/DefaultRecordType.java |  33 +++--
 .../main/java/org/apache/sis/util/iso/Types.java   |  27 ++--
 .../java/org/apache/sis/xml/IdentifiedObject.java  |   4 +-
 .../java/org/apache/sis/xml/IdentifierSpace.java   |   4 +-
 .../java/org/apache/sis/xml/MarshallerPool.java    |  12 +-
 .../main/java/org/apache/sis/xml/NilObject.java    |  12 +-
 .../src/main/java/org/apache/sis/xml/Pooled.java   |   4 +-
 .../main/java/org/apache/sis/xml/Transformer.java  |   8 +-
 .../java/org/apache/sis/xml/ValueConverter.java    |  26 ++--
 .../src/main/java/org/apache/sis/xml/XML.java      |  17 ++-
 .../main/java/org/apache/sis/xml/package-info.java |   8 +-
 .../apache/sis/internal/jaxb/gml/MeasureTest.java  |   6 +-
 .../sis/internal/jaxb/lan/LanguageCodeTest.java    |  16 +--
 .../iso/identification/DefaultResolutionTest.java  |   8 +-
 .../sis/test/xml/AnnotationConsistencyCheck.java   |   4 +-
 .../org/apache/sis/xml/ReferenceResolverMock.java  |   4 +-
 .../org/apache/sis/xml/RenameListGenerator.java    |   2 +-
 .../org/apache/sis/xml/UUIDMarshallingTest.java    |   8 +-
 .../org/apache/sis/xml/XLinkMarshallingTest.java   |   8 +-
 .../org/apache/sis/portrayal/CanvasFollower.java   |   4 +-
 .../gazetteer/AbstractLocationType.java            |   4 +-
 .../gazetteer/MilitaryGridReferenceSystem.java     |  20 +--
 .../gazetteer/ModifiableLocationType.java          |  37 +++---
 .../gazetteer/ReferencingByIdentifiers.java        |   4 +-
 .../sis/geometry/AbstractDirectPosition.java       |   8 +-
 .../org/apache/sis/geometry/AbstractEnvelope.java  |  12 +-
 .../org/apache/sis/geometry/ArrayEnvelope.java     |   6 +-
 .../org/apache/sis/geometry/DirectPosition1D.java  |  10 +-
 .../org/apache/sis/geometry/DirectPosition2D.java  |  10 +-
 .../java/org/apache/sis/geometry/Envelope2D.java   |   4 +-
 .../apache/sis/geometry/GeneralDirectPosition.java |   6 +-
 .../org/apache/sis/geometry/GeneralEnvelope.java   |  18 +--
 .../org/apache/sis/geometry/ImmutableEnvelope.java |   6 +-
 .../org/apache/sis/geometry/WraparoundMethod.java  |  20 +--
 .../internal/jaxb/referencing/RS_Identifier.java   |   6 +-
 .../jaxb/referencing/SecondDefiningParameter.java  |   4 +-
 .../sis/internal/referencing/ExtentSelector.java   |   4 +-
 .../apache/sis/internal/referencing/Formulas.java  |   4 +-
 .../referencing/GeodeticObjectBuilder.java         |  35 +++--
 .../apache/sis/internal/referencing/Legacy.java    |   4 +-
 .../internal/referencing/PositionTransformer.java  |   4 +-
 .../referencing/j2d/IntervalRectangle.java         |  12 +-
 .../apache/sis/internal/referencing/j2d/Tile.java  |   7 +-
 .../main/java/org/apache/sis/io/wkt/Element.java   |  28 ++--
 .../main/java/org/apache/sis/io/wkt/Formatter.java |  14 +-
 .../apache/sis/io/wkt/GeodeticObjectParser.java    |  84 ++++++------
 .../java/org/apache/sis/io/wkt/StoredTree.java     |   4 +-
 .../main/java/org/apache/sis/io/wkt/Symbols.java   |  16 +--
 .../java/org/apache/sis/io/wkt/VerticalInfo.java   |   4 +-
 .../java/org/apache/sis/io/wkt/WKTDictionary.java  |   4 +-
 .../main/java/org/apache/sis/io/wkt/WKTFormat.java |  17 ++-
 .../main/java/org/apache/sis/io/wkt/Warnings.java  |   4 +-
 .../sis/parameter/DefaultParameterDescriptor.java  |   8 +-
 .../parameter/DefaultParameterDescriptorGroup.java |   7 +-
 .../sis/parameter/DefaultParameterValue.java       |  20 +--
 .../sis/parameter/DefaultParameterValueGroup.java  |  23 ++--
 .../org/apache/sis/parameter/ParameterBuilder.java |  65 +++++-----
 .../java/org/apache/sis/parameter/Parameters.java  |   4 +-
 .../org/apache/sis/parameter/TensorParameters.java |  22 ++--
 .../org/apache/sis/parameter/package-info.java     |   9 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |  19 +--
 .../java/org/apache/sis/referencing/Builder.java   |  45 ++++---
 .../main/java/org/apache/sis/referencing/CRS.java  |  35 ++---
 .../java/org/apache/sis/referencing/CommonCRS.java |  23 ++--
 .../apache/sis/referencing/IdentifiedObjects.java  |  20 +--
 .../sis/referencing/ImmutableIdentifier.java       |  10 +-
 .../apache/sis/referencing/crs/AbstractCRS.java    |   6 +-
 .../sis/referencing/crs/DefaultEngineeringCRS.java |  20 +--
 .../sis/referencing/crs/DefaultGeocentricCRS.java  |  17 +--
 .../sis/referencing/crs/DefaultGeodeticCRS.java    |  16 +--
 .../sis/referencing/crs/DefaultGeographicCRS.java  |  17 +--
 .../sis/referencing/crs/DefaultImageCRS.java       |  14 +-
 .../sis/referencing/crs/DefaultProjectedCRS.java   |  13 +-
 .../org/apache/sis/referencing/cs/AbstractCS.java  |  11 +-
 .../org/apache/sis/referencing/cs/AxisFilter.java  |  18 ++-
 .../sis/referencing/cs/CoordinateSystems.java      |  26 ++--
 .../sis/referencing/datum/DatumShiftGrid.java      |  10 +-
 .../sis/referencing/datum/DefaultEllipsoid.java    |   4 +-
 .../referencing/datum/DefaultGeodeticDatum.java    |  28 ++--
 .../referencing/datum/DefaultPrimeMeridian.java    |  12 +-
 .../referencing/datum/DefaultTemporalDatum.java    |   4 +-
 .../referencing/datum/DefaultVerticalDatum.java    |   4 +-
 .../referencing/factory/AuthorityFactoryProxy.java |   8 +-
 .../factory/ConcurrentAuthorityFactory.java        |   4 +-
 .../referencing/factory/GeodeticObjectFactory.java |   9 +-
 .../factory/sql/CoordinateOperationSet.java        |   8 +-
 .../referencing/factory/sql/EPSGCodeFinder.java    |   8 +-
 .../referencing/factory/sql/EPSGDataAccess.java    |  10 +-
 .../sis/referencing/factory/sql/EPSGFactory.java   |   4 +-
 .../sis/referencing/factory/sql/EPSGInstaller.java |   4 +-
 .../factory/sql/InstallationScriptProvider.java    |  22 ++--
 .../sis/referencing/factory/sql/TableInfo.java     |   6 +-
 .../operation/AbstractCoordinateOperation.java     |   4 +-
 .../DefaultCoordinateOperationFactory.java         |   6 +-
 .../operation/DefaultOperationMethod.java          |  15 ++-
 .../operation/builder/LinearTransformBuilder.java  |   8 +-
 .../operation/builder/LocalizationGridBuilder.java |   7 +-
 .../operation/matrix/AffineTransforms2D.java       |  16 +--
 .../sis/referencing/operation/matrix/Matrices.java |  36 +++---
 .../referencing/operation/matrix/MatrixSIS.java    |   4 +-
 .../sis/referencing/operation/matrix/Solver.java   |  16 +--
 .../projection/LambertConicConformal.java          |   9 +-
 .../operation/projection/NormalizedProjection.java |   4 +-
 .../operation/transform/AbstractMathTransform.java |   8 +-
 .../operation/transform/ContextualParameters.java  |   6 +-
 .../transform/DefaultMathTransformFactory.java     |  16 +--
 .../operation/transform/DomainDefinition.java      |   4 +-
 .../transform/EllipsoidToCentricTransform.java     |   8 +-
 .../transform/ExponentialTransform1D.java          |  11 +-
 .../transform/InterpolatedGeocentricTransform.java |   8 +-
 .../operation/transform/IterationStrategy.java     |   4 +-
 .../operation/transform/MathTransformProvider.java |  15 +--
 .../operation/transform/MathTransforms.java        |  12 +-
 .../operation/transform/PassThroughTransform.java  |  21 +--
 .../operation/transform/TransformSeparator.java    |  10 +-
 .../operation/transform/WraparoundTransform.java   |   4 +-
 .../org/apache/sis/referencing/package-info.java   |  34 ++---
 .../java/org/apache/sis/io/wkt/WKTParserTest.java  | 104 +++++++--------
 .../sis/referencing/factory/TestFactorySource.java |   8 +-
 .../operation/CoordinateOperationFinderTest.java   |   4 +-
 .../operation/CoordinateOperationRegistryTest.java |   4 +-
 .../DefaultCoordinateOperationFactoryTest.java     |   4 +-
 .../operation/HardCodedConversions.java            |   4 +-
 .../operation/projection/AlbersEqualAreaTest.java  |   4 +-
 .../operation/transform/PoleRotationTest.java      |   4 +-
 .../sis/internal/converter/ConverterRegistry.java  |   4 +-
 .../sis/internal/converter/FallbackConverter.java  |   4 +-
 .../sis/internal/converter/ObjectToString.java     |   4 +-
 .../sis/internal/converter/SystemRegistry.java     |   4 +-
 .../apache/sis/internal/system/DaemonThread.java   |  10 +-
 .../sis/internal/system/OptionalDependency.java    |   4 +-
 .../internal/system/ReferenceQueueConsumer.java    |   6 +-
 .../org/apache/sis/internal/util/DoubleDouble.java | 144 ++++++++++-----------
 .../apache/sis/internal/util/FinalFieldSetter.java |   2 +-
 .../org/apache/sis/internal/util/Numerics.java     |  24 ++--
 .../java/org/apache/sis/internal/util/Strings.java |   4 +-
 .../sis/internal/util/UnmodifiableArrayList.java   |   8 +-
 .../main/java/org/apache/sis/io/TableAppender.java |   4 +-
 .../main/java/org/apache/sis/io/TabularFormat.java |   8 +-
 .../java/org/apache/sis/math/DecimalFunctions.java |  18 ++-
 .../java/org/apache/sis/math/MathFunctions.java    |  12 +-
 .../main/java/org/apache/sis/math/Statistics.java  |  20 +--
 .../src/main/java/org/apache/sis/math/Vector.java  |   4 +-
 .../java/org/apache/sis/measure/AbstractUnit.java  |   4 +-
 .../java/org/apache/sis/measure/AngleFormat.java   |   4 +-
 .../java/org/apache/sis/measure/DerivedScalar.java |   4 +-
 .../org/apache/sis/measure/IdentityConverter.java  |   4 +-
 .../java/org/apache/sis/measure/RangeFormat.java   |   4 +-
 .../java/org/apache/sis/measure/SystemUnit.java    |   4 +-
 .../java/org/apache/sis/measure/ValueRange.java    |  12 +-
 .../java/org/apache/sis/measure/package-info.java  |   8 +-
 .../src/main/java/org/apache/sis/setup/About.java  |   4 +-
 .../java/org/apache/sis/setup/Configuration.java   |   4 +-
 .../main/java/org/apache/sis/setup/OptionKey.java  |  12 +-
 .../main/java/org/apache/sis/util/ArraysExt.java   |  22 ++--
 .../java/org/apache/sis/util/CharSequences.java    |  20 +--
 .../src/main/java/org/apache/sis/util/Classes.java |  11 +-
 .../java/org/apache/sis/util/ComparisonMode.java   |   4 +-
 .../org/apache/sis/util/LenientComparable.java     |   4 +-
 .../src/main/java/org/apache/sis/util/Locales.java |   4 +-
 .../src/main/java/org/apache/sis/util/Numbers.java |  18 ++-
 .../java/org/apache/sis/util/ObjectConverter.java  |   4 +-
 .../java/org/apache/sis/util/ObjectConverters.java |   7 +-
 .../sis/util/ResourceInternationalString.java      |  15 +--
 .../main/java/org/apache/sis/util/Utilities.java   |   8 +-
 .../sis/util/collection/BackingStoreException.java |   4 +-
 .../java/org/apache/sis/util/collection/Cache.java |  44 +++----
 .../sis/util/collection/CheckedContainer.java      |   4 +-
 .../apache/sis/util/collection/CodeListSet.java    |   4 +-
 .../sis/util/collection/DefaultTreeTable.java      |   4 +-
 .../org/apache/sis/util/collection/DerivedSet.java |  12 +-
 .../org/apache/sis/util/collection/RangeSet.java   |   4 +-
 .../apache/sis/util/collection/TableColumn.java    |   8 +-
 .../org/apache/sis/util/collection/TreeTable.java  |  20 +--
 .../org/apache/sis/util/collection/TreeTables.java |   4 +-
 .../apache/sis/util/collection/WeakHashSet.java    |  18 +--
 .../sis/util/collection/WeakValueHashMap.java      |   4 +-
 .../sis/util/resources/IndexedResourceBundle.java  |   4 +-
 .../apache/sis/util/resources/package-info.java    |  12 +-
 .../java/org/apache/sis/io/AppenderTestCase.java   |   4 +-
 .../java/org/apache/sis/test/LoggingWatcher.java   |  16 +--
 .../test/java/org/apache/sis/test/TestCase.java    |   8 +-
 .../test/java/org/apache/sis/test/TestSuite.java   |   4 +-
 .../sis/internal/profile/fra/Constraints.java      |   4 +-
 .../internal/profile/fra/DataIdentification.java   |   4 +-
 .../profile/fra/DirectReferenceSystem.java         |   4 +-
 .../profile/fra/IndirectReferenceSystem.java       |   4 +-
 .../sis/internal/profile/fra/LegalConstraints.java |   4 +-
 .../internal/profile/fra/SecurityConstraints.java  |   4 +-
 .../apache/sis/profile/france/FrenchProfile.java   |   8 +-
 .../apache/sis/storage/geotiff/GeoKeysLoader.java  |   2 +-
 .../sis/storage/geotiff/ImageFileDirectory.java    |  10 +-
 .../apache/sis/storage/geotiff/XMLMetadata.java    |   4 +-
 .../sis/storage/geotiff/XMLMetadataTest.java       |   4 +-
 .../apache/sis/internal/netcdf/GridCacheKey.java   |   4 +-
 .../apache/sis/internal/netcdf/GridMapping.java    |   4 +-
 .../apache/sis/internal/netcdf/RasterResource.java |   4 +-
 .../sis/internal/netcdf/impl/ChannelDecoder.java   |   6 +-
 .../sis/internal/sql/feature/FeatureAnalyzer.java  |   4 +-
 .../apache/sis/internal/stream/DeferredStream.java |   4 +-
 .../internal/storage/FeatureCatalogBuilder.java    |   4 +-
 .../sis/internal/storage/MetadataBuilder.java      |   4 +-
 .../apache/sis/internal/storage/RangeArgument.java |   4 +-
 .../sis/internal/storage/StoreUtilities.java       |   4 +-
 .../sis/internal/storage/TiledGridCoverage.java    |   4 +-
 .../sis/internal/storage/io/ChannelData.java       |   6 +-
 .../sis/internal/storage/io/ChannelDataInput.java  |  16 +--
 .../sis/internal/storage/io/ChannelDataOutput.java |  28 ++--
 .../storage/io/ChannelImageInputStream.java        |  16 +--
 .../internal/storage/io/FileCacheByteChannel.java  |   4 +-
 .../java/org/apache/sis/storage/DataStore.java     |   4 +-
 .../org/apache/sis/storage/DataStoreProvider.java  |   8 +-
 .../java/org/apache/sis/storage/FeatureNaming.java |  11 +-
 .../java/org/apache/sis/storage/FeatureSet.java    |   9 +-
 .../java/org/apache/sis/storage/ProbeResult.java   |   2 +-
 .../apache/sis/storage/event/StoreListeners.java   |   4 +-
 .../org/apache/sis/internal/storage/gpx/Link.java  |   8 +-
 .../apache/sis/internal/storage/gpx/Metadata.java  |   4 +-
 .../apache/sis/internal/storage/gpx/Reader.java    |   4 +-
 .../sis/internal/storage/gpx/package-info.java     |   4 +-
 .../storage/xml/stream/StaxStreamReader.java       |  10 +-
 .../storage/xml/stream/StaxStreamWriter.java       |  16 +--
 310 files changed, 1735 insertions(+), 1751 deletions(-)

diff --git a/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java b/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java
index 34719712b1..2f8d9e17ad 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java
@@ -33,9 +33,9 @@ import org.apache.sis.util.CharSequences;
  * This sub-command reproduces the functionality of the following Unix command,
  * except that {@code MimeTypeCommand} uses the SIS detection mechanism instead of the OS one.
  *
- * {@preformat shell
+ * {@snippet lang="shell" :
  *   file --mime-type <files>
- * }
+ *   }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/package-info.java b/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
index e2a70eaf41..3831b544f0 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
@@ -24,21 +24,21 @@
  * has been {@linkplain org.apache.sis.internal.system.Supervisor#ENABLED compiled with MBeans enabled}
  * and that the remote Java Virtual Machine has been started with the following options:
  *
- * {@preformat shell
+ * {@snippet lang="shell" :
  *   java -Dcom.sun.management.jmxremote.port=1099 \
  *        -Dcom.sun.management.jmxremote.authenticate=false \
  *        -Dcom.sun.management.jmxremote.ssl=false \
  *        -Dcom.sun.management.jmxremote.local.only=true \
  *        <other options>
- * }
+ *   }
  *
  * If the port number is different than {@value java.rmi.registry.Registry#REGISTRY_PORT}, then it must be specified
  * to the {@code sis} subcommand after the host name. For example if the port number has been set to 9999, then the
  * {@code about} sub-command shall be invoked as below:
  *
- * {@preformat shell
+ * {@snippet lang="shell" :
  *   java org.apache.sis.console.Command about localhost:1099
- * }
+ *   }
  *
  * The {@code com.sun.management.jmxremote.local.only} property is recommended if the remote JVM is another
  * JVM instance running on the local machine. Otherwise this property can be omitted for debugging purpose.
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageCanvas.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageCanvas.java
index c441ced897..5ea173549a 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageCanvas.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageCanvas.java
@@ -1160,9 +1160,9 @@ public class CoverageCanvas extends MapCanvasAWT {
      * Other methods should generally not invoke this method directly,
      * and use the following code instead:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     runAfterRendering(this::clear);
-     * }
+     *     }
      *
      * @see #runAfterRendering(Runnable)
      */
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
index f881dde4b8..0ff9fc2f5b 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
@@ -998,7 +998,7 @@ public abstract class MapCanvas extends PlanarCanvas {
      * Returns the {@linkplain #getInterimTransform(boolean) interim transform} if at least one listener
      * is registered, or {@code null} otherwise. This method should be used with the following pattern:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     AffineTransform2D interim = getInterimTransformForListeners();
      *     transform.something(…);
      *     if (interim != null) {
@@ -1573,9 +1573,9 @@ public abstract class MapCanvas extends PlanarCanvas {
      * Other methods should generally not invoke this method directly,
      * and use the following code instead:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     runAfterRendering(this::clear);
-     * }
+     *     }
      *
      * @see #reset()
      * @see #runAfterRendering(Runnable)
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvasAWT.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvasAWT.java
index 267efa7ce9..c92961efa1 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvasAWT.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvasAWT.java
@@ -664,9 +664,9 @@ public abstract class MapCanvasAWT extends MapCanvas {
      * Other methods should generally not invoke this method directly,
      * and use the following code instead:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     runAfterRendering(this::clear);
-     * }
+     *     }
      *
      * @see #runAfterRendering(Runnable)
      */
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataStoreOpener.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataStoreOpener.java
index ee57ad6dc2..46057448fe 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataStoreOpener.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataStoreOpener.java
@@ -58,9 +58,9 @@ import org.apache.sis.gui.DataViewer;
  * caller should invoke {@link #setOnSucceeded(EventHandler)} for defining such action.
  * Example:
  *
- * {@preformat java
- *     public void loadResource(final Object source) {
- *         final DataStoreOpener opener = new DataStoreOpener(source);
+ * {@snippet lang="java" :
+ *     public void loadResource(Object source) {
+ *         var opener = new DataStoreOpener(source);
  *         opener.setOnSucceeded((event) -> addResource((DataStore) event.getSource().getValue()));
  *         opener.setOnFailed(ExceptionReporter::show);
  *         BackgroundThreads.execute(opener);
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessItem.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessItem.java
index 133b17b8b6..aa5d433ec1 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessItem.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessItem.java
@@ -272,7 +272,7 @@ final class FileAccessItem implements Runnable, EventHandler<ActionEvent> {
     /**
      * Recomputes all rectangles from current {@link #columnWidth} and {@link #accessRanges}.
      *
-     * <h4>Implementation note:</h4>
+     * <h4>Implementation note</h4>
      * This method is inefficient as it iterates over all ranges instead of only the ranges that changed.
      * It should be okay in the common case where file accesses happens often on consecutive blocks,
      * in which case ranges get merged together and the total number of elements in {@link #accessRanges}
diff --git a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
index caea7e638f..c2419a82fc 100644
--- a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
+++ b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
@@ -85,17 +85,19 @@ final class CacheKey<T> {
      * Notifies the cache that a value will be computed for this key.
      * This method must be followed by a {@code try} … {@code finally} block as below:
      *
-     * {@preformat java
-     *     T value = key.peek();
-     *     if (value == null) {
-     *         final Cache.Handler<T> handler = key.lock();
-     *         try {
-     *             value = handler.peek();
-     *             if (value == null) {
-     *                 value = createMyObject(key);
+     * {@snippet lang="java" :
+     *     private void compute() {
+     *         T value = key.peek();
+     *         if (value == null) {
+     *             final Cache.Handler<T> handler = key.lock();
+     *             try {
+     *                 value = handler.peek();
+     *                 if (value == null) {
+     *                     value = createMyObject(key);
+     *                 }
+     *             } finally {
+     *                 handler.putAndUnlock(value);
      *             }
-     *         } finally {
-     *             handler.putAndUnlock(value);
      *         }
      *     }
      * }
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java
index 01e9e4e32c..7b05df051d 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java
@@ -38,7 +38,7 @@
  * </ul>
  *
  * <h2>Maven project file</h2>
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <dependencies>
  *     <!-- Put all your project dependencies here, including transitive dependencies. -->
  *   </dependencies>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java
index 07a0549ee3..a158517cf1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java
@@ -103,8 +103,8 @@ public class BufferedGridCoverage extends GridCoverage {
      * <h4>Usage</h4>
      * Implementation of {@link #render(GridExtent)} method can be like below:
      *
-     * {@preformat java
-     *     &#64;Override
+     * {@snippet lang="java" :
+     *     @Override
      *     public RenderedImage render(GridExtent sliceExtent) throws CannotEvaluateException {
      *         if (sliceExtent == null) {
      *             sliceExtent = gridGeometry.getExtent();
@@ -118,7 +118,7 @@ public class BufferedGridCoverage extends GridCoverage {
      *                 return renderer.createImage();
      *             });
      *         } catch (IllegalGridGeometryException | MismatchedDimensionException e) {
-    *              throw e;
+     *             throw e;
      *         } catch (IllegalArgumentException | ArithmeticException | RasterFormatException e) {
      *             throw new CannotEvaluateException(e.getMessage(), e);
      *         }
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/CoordinateOperationFinder.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
index e1deb3f3a0..e26c2c6a91 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
@@ -147,12 +147,12 @@ final class CoordinateOperationFinder implements Supplier<double[]> {
      * This is the concatenation of {@link #source} "grid to CRS" with {@link #forwardChangeOfCRS},
      * possibly with wraparound handling and cached for reuse by {@link #inverse()}:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     forwardChangeOfCRS = changeOfCRS.getMathTransform();
      *     // + wraparound handling if applicable.
      *     gridToCRS = source.getGridToCRS(anchor);
      *     gridToCRS = MathTransforms.concatenate(gridToCRS, forwardChangeOfCRS);
-     * }
+     *     }
      *
      * @see #gridToCRS()
      */
@@ -163,12 +163,12 @@ final class CoordinateOperationFinder implements Supplier<double[]> {
      * This is the concatenation of {@link #inverseChangeOfCRS} with inverse of {@link #source} "grid to CRS",
      * possibly with wraparound handling:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     inverseChangeOfCRS = forwardChangeOfCRS.inverse();
      *     // + wraparound handling if applicable.
      *     crsToGrid = gridToCRS.inverse();
      *     crsToGrid = MathTransforms.concatenate(inverseChangeOfCRS, crsToGrid);
-     * }
+     *     }
      *
      * @see #inverse()
      * @see #applyWraparound(MathTransform)
@@ -209,14 +209,14 @@ final class CoordinateOperationFinder implements Supplier<double[]> {
      * Whether to disable completely all wraparounds checks.
      * If {@code true}, then calculation done in this class should be equivalent to following code:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     forwardChangeOfCRS = changeOfCRS.getMathTransform();
      *     inverseChangeOfCRS = forwardChangeOfCRS.inverse();
      *     gridToCRS          = source.getGridToCRS(anchor);
      *     crsToGrid          = gridToCRS.inverse();
      *     gridToCRS          = MathTransforms.concatenate(gridToCRS, forwardChangeOfCRS);
      *     crsToGrid          = MathTransforms.concatenate(inverseChangeOfCRS, crsToGrid);
-     * }
+     *     }
      *
      * <b>Tip:</b> searching usage of this field should help to identify code doing wraparound handling.
      *
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
index 5496915d40..8b704c0b03 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
@@ -491,9 +491,9 @@ public abstract class GridCoverage extends BandedCoverage {
      * Current implementation is equivalent to the following, where {@code <default flags>}
      * is the same set of flags than {@link GridGeometry#toString()}.
      *
-     * {@preformat java
-     *   return toTree(Locale.getDefault(), <default flags>).toString();
-     * }
+     * {@snippet lang="java" :
+     *     return toTree(Locale.getDefault(), <default flags>).toString();
+     *     }
      *
      * @return a string representation of this grid coverage for debugging purpose.
      */
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
index 1e6e80f0e3..32f8872d19 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
@@ -60,25 +60,26 @@ import org.apache.sis.util.resources.Errors;
  * Those methods are overloaded with many variants accepting different kind of arguments. For example, values can
  * be specified as a {@link RenderedImage}, a {@link Raster} or some other types.
  *
- * <div class="note"><b>Example:</b>
- * the easiest way to create a {@link GridCoverage} from a matrix of values is to set the values in a
+ * <h2>Example</h2>
+ * The easiest way to create a {@link GridCoverage} from a matrix of values is to set the values in a
  * {@link WritableRaster} and to specify the domain as an {@link Envelope}:
  *
- * {@preformat java
- *     WritableRaster data = Raster.createBandedRaster​(DataBuffer.TYPE_USHORT, width, height, numBands, null);
- *     for (int y=0; y<height; y++) {
- *         for (int x=0; x<width; x++) {
- *             int value = ...;                     // Compute a value here.
- *             data.setSample(x, y, 0, value);      // Set value in the first band.
+ * {@snippet lang="java" :
+ *     public GridCoverage createCoverage() {
+ *         WritableRaster data = Raster.createBandedRaster​(DataBuffer.TYPE_USHORT, width, height, numBands, null);
+ *         for (int y=0; y<height; y++) {
+ *             for (int x=0; x<width; x++) {
+ *                 int value = ...;                     // Compute a value here.
+ *                 data.setSample(x, y, 0, value);      // Set value in the first band.
+ *             }
  *         }
- *     }
- *     GridCoverageBuilder builder = new GridCoverageBuilder();
- *     builder.setValues(data).flixAxis(1);
+ *         var builder = new GridCoverageBuilder();
+ *         builder.setValues(data).flixAxis(1);
  *
- *     Envelope domain = ...;                       // Specify here the "real world" coordinates.
- *     GridCoverage coverage = builder.setDomain(domain).build();
+ *         Envelope domain = ...;                       // Specify here the "real world" coordinates.
+ *         return builder.setDomain(domain).build();
+ *     }
  * }
- * </div>
  *
  * <h2>Limitations</h2>
  * Current implementation creates only two-dimensional coverages.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
index 5d3050746a..0d7b0c9141 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
@@ -411,27 +411,9 @@ public class GridDerivation {
      * (coordinate operations are applied as needed if the Coordinate Reference Systems are not the same).
      * The new grid geometry resolution will be integer multiples of the {@link #base} grid geometry resolution.
      *
-     * <div class="note"><b>Usage:</b>
-     * This method can be helpful for implementation of
-     * {@link org.apache.sis.storage.GridCoverageResource#read(GridGeometry, int...)}.
-     * Example:
-     *
-     * {@preformat java
-     *     class MyDataStorage extends GridCoverageResource {
-     *         &#64;Override
-     *         public GridCoverage read(GridGeometry domain, int... range) throws DataStoreException {
-     *             GridDerivation change = getGridGeometry().derive().subgrid(domain);
-     *             GridExtent toRead = change.buildExtent();
-     *             int[] subsampling = change.getSubsampling());
-     *             // Do reading here.
-     *         }
-     *     }
-     * }
-     * </div>
-     *
-     * If {@code gridExtent} contains only an envelope, then this method delegates to {@link #subgrid(Envelope, double...)}.
+     * <p>If {@code gridExtent} contains only an envelope, then this method delegates to {@link #subgrid(Envelope, double...)}.
      * Otherwise if {@code gridExtent} contains only an extent, then this method delegates to {@link #subgrid(GridExtent, int...)}.
-     * Otherwise the following information are mandatory:
+     * Otherwise the following information are mandatory:</p>
      * <ul>
      *   <li>{@linkplain GridGeometry#getExtent() Extent} in {@code areaOfInterest}.</li>
      *   <li>{@linkplain GridGeometry#getGridToCRS(PixelInCell) Grid to CRS} conversion in {@code areaOfInterest}.</li>
@@ -450,7 +432,24 @@ public class GridDerivation {
      * bilinear interpolations in an image, (s)he will need 1 more pixel on each image border.
      * If the caller wants to apply bi-cubic interpolations, (s)he will need 2 more pixels on each image border.
      *
-     * <p>Notes:</p>
+     * <h4>Usage</h4>
+     * This method can be helpful for implementation of
+     * {@link org.apache.sis.storage.GridCoverageResource#read(GridGeometry, int...)}.
+     * Example:
+     *
+     * {@snippet lang="java" :
+     *     class MyDataStorage extends GridCoverageResource {
+     *         @Override
+     *         public GridCoverage read(GridGeometry domain, int... range) throws DataStoreException {
+     *             GridDerivation change = getGridGeometry().derive().subgrid(domain);
+     *             GridExtent toRead = change.buildExtent();
+     *             int[] subsampling = change.getSubsampling());
+     *             // Do reading here.
+     *         }
+     *     }
+     *     }
+     *
+     * <h4>Notes</h4>
      * <ul>
      *   <li>This method can be invoked only once.</li>
      *   <li>This method cannot be used together with another {@code subgrid(…)} method.</li>
@@ -1055,15 +1054,14 @@ public class GridDerivation {
      * grid coordinates, 1 maps to {@linkplain GridExtent#getHigh(int) high grid coordinates} and 0.5 maps to the median position.
      * The slicing is applied on all dimensions except the specified dimensions to keep.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * given a <var>n</var>-dimensional cube, the following call creates a slice of the two first dimensions
      * (numbered 0 and 1, typically the dimensions of <var>x</var> and <var>y</var> axes)
      * located at the center (ratio 0.5) of all other dimensions (typically <var>z</var> and/or <var>t</var> axes):
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     gridGeometry.derive().sliceByRatio(0.5, 0, 1).build();
-     * }
-     * </div>
+     *     }
      *
      * @param  sliceRatio        the ratio to apply on all grid dimensions except the ones to keep.
      * @param  dimensionsToKeep  the grid dimension to keep unchanged.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
index ad7c4d1fe3..3e998d220f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
@@ -884,31 +884,31 @@ public class GridExtent implements GridEnvelope, LenientComparable, Serializable
      * This method can be used for getting the grid extent of a <var>s</var>-dimensional slice
      * in a <var>n</var>-dimensional cube where <var>s</var> ≤ <var>n</var>.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * suppose that we want to get a two-dimensional slice <var>(y,z)</var> in a four-dimensional data cube <var>(x,y,z,t)</var>.
      * The first step is to specify the <var>x</var> and <var>t</var> coordinates of the slice.
      * In this example we set <var>x</var> to 5 and <var>t</var> to 8.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     GridGeometry grid = ...;             // Geometry of the (x,y,z,t) grid.
      *     GridGeometry slice4D = grid.slice(new GeneralDirectPosition(5, NaN, NaN, 8));
-     * }
+     *     }
      *
      * Above code created a slice at the requested position, but that slice still have 4 dimensions.
      * It is a "slice" because the <var>x</var> and <var>t</var> dimensions of {@code slice4D} have only one cell.
      * If a two-dimensional slice is desired, then above operations can be completed as below.
      * In this example, the result of {@code getSubspaceDimensions(2)} call will be {1,2}.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     int[]  subDimensions = slice4D.getExtent().getSubspaceDimensions(2);
      *     GridGeometry slice2D = slice4D.reduce(subDimensions);
-     * }
+     *     }
      *
      * Note that in this particular example, it would have been more efficient to execute {@code grid.reduce(1,2)} directly.
      * This {@code getSubspaceDimensions(int)} method is more useful for inferring a {@code slice2D} from a {@code slice4D}
      * which has been created elsewhere, or when we do not really want the {@code slice2D} but only its dimension indices.
-     * </div>
      *
+     * <h4>Number of dimensions</h4>
      * This method returns exactly <var>s</var> indices. If there is more than <var>s</var> dimensions having a
      * {@linkplain #getSize(int) size} greater than 1, then a {@link SubspaceNotSpecifiedException} is thrown.
      * If there is less than <var>s</var> dimensions having a size greater than 1, then the returned list of
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
index f6a3c507de..8a3bee66b2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
@@ -817,11 +817,11 @@ public class GridGeometry implements LenientComparable, Serializable {
      * The conversion is often an affine transform, but not necessarily.
      * Conversions from cell indices to geospatial coordinates can be performed for example as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     MathTransform  gridToCRS     = gridGeometry.getGridToCRS(PixelInCell.CELL_CENTER);
      *     DirectPosition indicesOfCell = new GeneralDirectPosition(2, 3, 4):
      *     DirectPosition aPixelCenter  = gridToCRS.transform(indicesOfCell, null);
-     * }
+     *     }
      *
      * Callers must specify whether they want the "real world" coordinates of cell center or cell corner.
      * The cell corner is the one for which all grid indices have the smallest values (closest to negative infinity).
@@ -1358,21 +1358,20 @@ public class GridGeometry implements LenientComparable, Serializable {
      * {@code GridDerivation} does not change the state of this {@code GridGeometry} but instead creates
      * new instances as needed. Examples of modifications include clipping to a sub-area or applying a sub-sampling.
      *
-     * <div class="note"><b>Example:</b>
-     * for clipping this grid geometry to a sub-area, one can use:
+     * <p>Each {@code GridDerivation} instance can be used only once and should be used in a single thread.
+     * {@code GridDerivation} preserves the number of dimensions. For example, {@linkplain GridDerivation#slice slicing}
+     * sets the {@linkplain GridExtent#getSize(int) grid size} to 1 in all dimensions specified by a <cite>slice point</cite>,
+     * but does not remove those dimensions from the grid geometry. For dimensionality reduction, see {@link #selectDimensions(int[])}.</p>
+     *
+     * <h4>Example</h4>
+     * For clipping this grid geometry to a sub-area, one can use:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     GridGeometry gg = ...;
      *     Envelope areaOfInterest = ...;
      *     gg = gg.derive().rounding(GridRoundingMode.ENCLOSING)
      *                     .subgrid(areaOfInterest).build();
-     * }
-     * </div>
-     *
-     * Each {@code GridDerivation} instance can be used only once and should be used in a single thread.
-     * {@code GridDerivation} preserves the number of dimensions. For example, {@linkplain GridDerivation#slice slicing}
-     * sets the {@linkplain GridExtent#getSize(int) grid size} to 1 in all dimensions specified by a <cite>slice point</cite>,
-     * but does not remove those dimensions from the grid geometry. For dimensionality reduction, see {@link #selectDimensions(int[])}.
+     *     }
      *
      * @return an object for deriving a grid geometry from {@code this}.
      */
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
index 337facc853..949b3e4d80 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
@@ -77,10 +77,10 @@ import static org.apache.sis.image.PlanarImage.GRID_GEOMETRY_KEY;
  * computes automatically the offsets from that position to the position of the first value included
  * in the {@code sliceExtent} given to the constructor.</p>
  *
- * <div class="note"><b>Usage example:</b>
- * {@preformat java
+ * <h2>Usage example</h2>
+ * {@snippet lang="java" :
  *     class MyResource extends GridCoverage {
- *         &#64;Override
+ *         @Override
  *         public RenderedImage render(GridExtent sliceExtent) {
  *             ImageRenderer renderer = new ImageRenderer(this, sliceExtent);
  *             try {
@@ -91,8 +91,7 @@ import static org.apache.sis.image.PlanarImage.GRID_GEOMETRY_KEY;
  *             }
  *         }
  *     }
- * }
- * </div>
+ *     }
  *
  * <h2>Limitations</h2>
  * Current implementation constructs only images made of a single tile.
@@ -612,14 +611,13 @@ public class ImageRenderer {
      * This method should be invoked when the data given to {@code setData(…)} contains only one {@link Vector}, {@link Buffer} or
      * {@link DataBuffer} bank, and the bands in that unique bank are interleaved.
      *
-     * <div class="note"><b>Example:</b>
-     * for an image having three bands named Red (R), Green (G) and Blue (B), if the sample values are stored in a single bank in a
+     * <h4>Example</h4>
+     * For an image having three bands named Red (R), Green (G) and Blue (B), if the sample values are stored in a single bank in a
      * R₀,G₀,B₀, R₁,G₁,B₁, R₂,G₂,B₂, R₃,G₃,B₃, <i>etc.</i> fashion, then this method should be invoked as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     setInterleavedPixelOffsets(3, new int[] {0, 1, 2});
-     * }
-     * </div>
+     *     }
      *
      * @param  pixelStride  the number of data elements between each pixel in the data vector or buffer.
      * @param  bandOffsets  offsets to add to sample index in each band. This is typically {0, 1, 2, …}.
@@ -664,11 +662,10 @@ public class ImageRenderer {
      * This is useful for data with a clear 0 (white) in the middle of the range,
      * with a minimal value equals to the negative of the maximal value.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     setCategoryColors((category) -> category.isQuantitative() ? new Color[] {
-     *         Color.BLUE, Color.CYAN, Color.WHITE, Color.YELLOW, Color.RED
-     *     } : null);
-     * }
+     *             Color.BLUE, Color.CYAN, Color.WHITE, Color.YELLOW, Color.RED} : null);
+     *     }
      *
      * @param colors  the colors to use for each category. The {@code colors} argument cannot be null,
      *                but {@code colors.apply(Category)} can return null.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
index b7b856035f..061f51dc4d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
@@ -26,13 +26,13 @@ package org.apache.sis.coverage.grid;
  * For example if a process is going to need both the grid extent and the "grid to CRS" transform,
  * than it can verify if those two conditions are met in a single method call:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     if (gg.isDefined(GridGeometry.EXTENT | GridGeometry.GRID_TO_CRS) {
  *         GridExtent    extent    = gg.getGridExtent();
  *         MathTransform gridToCRS = gg.getGridToCRS(PixelInCell.CELL_CENTER);
  *         // Do the process.
  *     }
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
index d24b3d7c4c..35b3865d40 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
@@ -43,26 +43,27 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
  * This class provides also a few {@code translate(…)} convenience methods,
  * which apply the translation on a given {@link MathTransform} instance.
  *
- * <div class="note"><b>Example:</b>
- * if the following code snippet, {@code gridToCRS} is an {@link java.awt.geom.AffineTransform} from
+ * <h2>Example</h2>
+ * In the following code snippet, {@code gridToCRS} is an {@link java.awt.geom.AffineTransform} from
  * <cite>grid cell</cite> coordinates (typically pixel coordinates) to some arbitrary CRS coordinates.
  * In this example, the transform maps pixels {@linkplain PixelOrientation#CENTER center},
  * while the {@linkplain PixelOrientation#UPPER_LEFT upper left} corner is desired.
  * This code will switch the affine transform from the <cite>pixel center</cite> to
  * <cite>upper left corner</cite> convention:
  *
- * {@preformat java
- *   final AffineTransform  gridToCRS = ...;
- *   final PixelOrientation current   = PixelOrientation.CENTER;
- *   final PixelOrientation desired   = PixelOrientation.UPPER_LEFT;
+ * {@snippet lang="java" :
+ *     public AffineTransform getGridToPixelCorner() {
+ *         AffineTransform  gridToCRS = ...;
+ *         PixelOrientation current   = PixelOrientation.CENTER;
+ *         PixelOrientation desired   = PixelOrientation.UPPER_LEFT;
  *
- *   // Switch the transform from 'current' to 'desired' convention.
- *   final PixelTranslation source = getPixelTranslation(current);
- *   final PixelTranslation target = getPixelTranslation(desired);
- *   gridToCRS.translate(target.dx - source.dx,
- *                       target.dy - source.dy);
+ *         // Switch the transform from 'current' to 'desired' convention.
+ *         PixelTranslation source = getPixelTranslation(current);
+ *         PixelTranslation target = getPixelTranslation(desired);
+ *         return gridToCRS.translate(target.dx - source.dx,
+ *                                    target.dy - source.dy);
+ *     }
  * }
- * </div>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
index 45742cebb2..d0c635949b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
@@ -293,11 +293,11 @@ public abstract class AbstractAttribute<V> extends Field<V> implements Attribute
      * <p>If an attribute is known to be a measurement with a characteristic named "accuracy"
      * of type {@link Float}, then the accuracy value could be read as below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Float getAccuracy(Attribute<?> measurement) {
      *         Attribute<?> accuracy = measurement.characteristics().get("accuracy");
      *         if (accuracy != null) {
-     *             return (Float) accuracy.getValue(); // Value may be null.
+     *             return (Float) accuracy.getValue();          // Value may be null.
      *         } else {
      *             return (Float) measurement.getType().characteristics().get("accuracy").getDefaultValue();
      *             // A more sophisticated implementation would probably cache the default value somewhere.
@@ -312,30 +312,30 @@ public abstract class AbstractAttribute<V> extends Field<V> implements Attribute
      *     If an older characteristic existed for that name, it will be replaced.
      *     Example:
      *
-     *     {@preformat java
-     *       Attribute<?> accuracy = ...;                               // To be created by the caller.
-     *       characteristics.put("accuracy", accuracy);
-     *     }</li>
+     *     {@snippet lang="java" :
+     *         Attribute<?> accuracy = ...;                               // To be created by the caller.
+     *         characteristics.put("accuracy", accuracy);
+     *         }</li>
      *
      *   <li>Adding the new characteristic to the {@linkplain Map#values() values} collection.
      *     The name is inferred automatically from the characteristic type.
      *     If an older characteristic existed for the same name, an {@link IllegalStateException} will be thrown.
      *     Example:
      *
-     *     {@preformat java
-     *       Attribute<?> accuracy = ...;                               // To be created by the caller.
-     *       characteristics.values().add(accuracy);
-     *     }</li>
+     *     {@snippet lang="java" :
+     *         Attribute<?> accuracy = ...;                               // To be created by the caller.
+     *         characteristics.values().add(accuracy);
+     *         }</li>
      *
      *   <li>Adding the characteristic name to the {@linkplain Map#keySet() key set}.
      *     If no characteristic existed for that name, a default one will be created.
      *     Example:
      *
-     *     {@preformat java
-     *       characteristics.keySet().add("accuracy");                  // Ensure that an entry will exist for that name.
-     *       Attribute<?> accuracy = characteristics.get("accuracy");
-     *       Features.cast(accuracy, Float.class).setValue(...);        // Set new accuracy value here as a float.
-     *     }</li>
+     *     {@snippet lang="java" :
+     *         characteristics.keySet().add("accuracy");                  // Ensure that an entry will exist for that name.
+     *         Attribute<?> accuracy = characteristics.get("accuracy");
+     *         Features.cast(accuracy, Float.class).setValue(...);        // Set new accuracy value here as a float.
+     *         }</li>
      * </ol>
      *
      * @return other attribute types that describes this attribute type, or an empty map if none.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
index a839937e39..d6400cecc2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
@@ -179,9 +179,9 @@ public abstract class AbstractFeature implements Feature, Serializable {
      *       In other words, the following condition shall hold:</li>
      * </ul>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     assert property.getType() == getType().getProperty(property.getName());
-     * }
+     *     }
      *
      * This method is useful for storing non-default {@code Attribute} or {@code FeatureAssociation} implementations
      * in this feature. When default implementations are sufficient, the {@link #setPropertyValue(String, Object)}
@@ -331,10 +331,10 @@ public abstract class AbstractFeature implements Feature, Serializable {
      * casts (e.g. {@code Collection<String>} cannot be checked at runtime.
      * If a type-safe modifiable collection is desired, the following approach can be used instead:
      *
-     * {@preformat java
-     *   Attribute<String> attribute = Features.cast((Attribute<?>) feature.getProperty(name), String.class);
-     *   Collection<String> values = attribute.getValues();    // This collection is guaranteed to be "live".
-     * }
+     * {@snippet lang="java" :
+     *     Attribute<String> attribute = Features.cast((Attribute<?>) feature.getProperty(name), String.class);
+     *     Collection<String> values = attribute.getValues();    // This collection is guaranteed to be "live".
+     *     }
      *
      * @param  name  the property name.
      * @return value of the specified property, or the
@@ -370,13 +370,13 @@ public abstract class AbstractFeature implements Feature, Serializable {
      * Returns the value for the property of the given name if that property exists, or a fallback value otherwise.
      * This method is equivalent to the following code, but potentially more efficient when the property does not exist:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     try {
      *         return getPropertyValue(name);
      *     } catch (PropertyNotFoundException ignore) {
      *         return missingPropertyFallback
      *     }
-     * }
+     *     }
      *
      * Note that if a property of the given name exists but has no value, then this method returns the
      * {@linkplain DefaultAttributeType#getDefaultValue() default value} (which may be {@code null}).
@@ -400,15 +400,17 @@ public abstract class AbstractFeature implements Feature, Serializable {
      * (for example a {@linkplain FeatureOperations#link link} to another property value).
      * Invoking this method is equivalent to performing the following steps:
      *
-     * {@preformat java
-     *     Operation operation = (Operation) type.getProperty(name);
-     *     Property result = operation.apply(this, null);
-     *     if (result instanceof Attribute<?>) {
-     *         return ...;                                      // the attribute value.
-     *     } else if (result instanceof FeatureAssociation) {
-     *         return ...;                                      // the associated feature.
-     *     } else {
-     *         return null;
+     * {@snippet lang="java" :
+     *     public Object getPropertyValue(String name) {
+     *         Operation operation = (Operation) type.getProperty(name);
+     *         Property result = operation.apply(this, null);
+     *         if (result instanceof Attribute<?>) {
+     *             return ...;                                      // the attribute value.
+     *         } else if (result instanceof FeatureAssociation) {
+     *             return ...;                                      // the associated feature.
+     *         } else {
+     *             return null;
+     *         }
      *     }
      * }
      *
@@ -825,13 +827,13 @@ public abstract class AbstractFeature implements Feature, Serializable {
      * for the given feature and returns {@code true} if there is no recursion.
      * This method must be invoked in a {@code try ... finally} block as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     if (comparisonStart()) try {
      *         // Compare or compute hash code.
      *     } finally {
      *         comparisonEnd();
      *     }
-     * }
+     *     }
      *
      * @return {@code true} if hash code or equality comparison can proceed, or
      *         {@code false} if a recursivity is detected.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
index 7b3589b78f..4dea55b7af 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
@@ -146,26 +146,25 @@ public class DefaultAssociationRole extends FieldType implements FeatureAssociat
      * This constructor can be used when creating a cyclic graph of {@link DefaultFeatureType} instances.
      * In such cases, at least one association needs to be created while its {@code FeatureType} is not yet available.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * The following establishes a bidirectional association between feature types <var>A</var> and <var>B</var>:
      *
-     * {@preformat java
-     *   String    namespace = "My model";
-     *   GenericName nameOfA = Names.createTypeName(namespace, ":", "Feature type A");
-     *   GenericName nameOfB = Names.createTypeName(namespace, ":", "Feature type B");
-     *   FeatureType typeA = new DefaultFeatureType(nameOfA, false, null,
-     *       new DefaultAssociationRole(Names.createLocalName("Association to B"), nameOfB),
-     *       // More properties if desired.
-     *   );
-     *   FeatureType typeB = new DefaultFeatureType(nameOfB, false, null,
-     *       new DefaultAssociationRole(Names.createLocalName("Association to A"), featureA),
-     *       // More properties if desired.
-     *   );
-     * }
+     * {@snippet lang="java" :
+     *     String    namespace = "My model";
+     *     GenericName nameOfA = Names.createTypeName(namespace, ":", "Feature type A");
+     *     GenericName nameOfB = Names.createTypeName(namespace, ":", "Feature type B");
+     *     FeatureType typeA = new DefaultFeatureType(nameOfA, false, null,
+     *         new DefaultAssociationRole(Names.createLocalName("Association to B"), nameOfB),
+     *         // More properties if desired.
+     *     );
+     *     FeatureType typeB = new DefaultFeatureType(nameOfB, false, null,
+     *         new DefaultAssociationRole(Names.createLocalName("Association to A"), featureA),
+     *         // More properties if desired.
+     *     );
+     *     }
      *
      * After the above code completed, the {@linkplain #getValueType() value type} of <cite>"association to B"</cite>
      * has been automatically set to the {@code typeB} instance.
-     * </div>
      *
      * Callers shall make sure that the feature types graph will not contain more than one feature of the given name.
      * If more than one {@code FeatureType} instance of the given name is found at resolution time, the selected one
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
index 113dcfd216..2e3f2bacfc 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
@@ -126,7 +126,7 @@ public final class FeatureOperations extends Static {
     /**
      * Creates an operation which is only an alias for another property.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * features often have a property that can be used as identifier or primary key.
      * But the name of that property may vary between features of different types.
      * For example, features of type <b>Country</b> may have identifiers named “ISO country code”
@@ -136,13 +136,12 @@ public final class FeatureOperations extends Static {
      * which links to whatever property is used as an identifier in an arbitrary feature.
      * So the definition of the <b>Car</b> feature could contain the following code:
      *
-     * {@preformat java
-     *   AttributeType licensePlateNumber = ...;            // Attribute creation omitted for brevity
-     *   FeatureType car = new DefaultFeatureType(...,      // Arguments omitted for brevity
-     *           licensePlateNumber, model, owner,
-     *           FeatureOperations.link(Map.of(NAME_KEY, "identifier"), licensePlateNumber);
-     * }
-     * </div>
+     * {@snippet lang="java" :
+     *     AttributeType licensePlateNumber = ...;            // Attribute creation omitted for brevity
+     *     FeatureType car = new DefaultFeatureType(...,      // Arguments omitted for brevity
+     *             licensePlateNumber, model, owner,
+     *             FeatureOperations.link(Map.of(NAME_KEY, "identifier"), licensePlateNumber);
+     *     }
      *
      * Since this method does not create new property (it only redirects to an existing property),
      * this method ignores all {@code "result.*"} entries in the given {@code identification} map.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
index 76aad8dd3a..719fd212b4 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
@@ -493,10 +493,10 @@ public final class AttributeTypeBuilder<V> extends PropertyTypeBuilder {
      * Adds another attribute type that describes this attribute type.
      * See <cite>"Attribute characterization"</cite> in {@link DefaultAttributeType} Javadoc for more information.
      *
-     * <p>Usage example:</p>
-     * {@preformat java
+     * <h4>Usage example</h4>
+     * {@snippet lang="java" :
      *     attribute.addCharacteristic(Unit.class).setName("Unit of measurement").setDefaultValue(Units.CELSIUS);
-     * }
+     *     }
      *
      * The default characteristic name is the name of the given type, but callers should invoke one
      * of the {@code CharacteristicTypeBuilder.setName(…)} methods on the returned instance with a better name.
@@ -727,24 +727,23 @@ public final class AttributeTypeBuilder<V> extends PropertyTypeBuilder {
      * If a type has already been built and this builder state has not changed since the type creation,
      * then the previously created {@code AttributeType} instance is returned.
      *
-     * <div class="note"><b>Example:</b>
-     * the following lines of code add a "name" attribute to a "City" feature, then get the corresponding
+     * <h4>Example</h4>
+     * The following lines of code add a "name" attribute to a "City" feature, then get the corresponding
      * {@code AttributeType<String>} instance. If no setter method is invoked on the builder of the "name"
      * attribute after those lines, then the {@code name} variable below will reference the same instance
      * than the "name" attribute in the {@code city} type.
      *
-     * {@preformat java
-     *   FeatureTypeBuilder builder = new FeatureTypeBuilder().setName("City");
-     *   AttributeType<String> name = builder.addAttribute(String.class).setName("name").build();
-     *   FeatureType city = builder.build();
-     *
-     *   assert city.getProperty("name") == name : "AttributeType instance should be the same.";
-     * }
+     * {@snippet lang="java" :
+     *     FeatureTypeBuilder builder = new FeatureTypeBuilder().setName("City");
+     *     AttributeType<String> name = builder.addAttribute(String.class).setName("name").build();
+     *     FeatureType city = builder.build();
+
+     *     assert city.getProperty("name") == name : "AttributeType instance should be the same.";
+     *     }
      *
      * Note that {@code city.getProperty("name")} returns {@code AttributeType<?>},
      * i.e. the {@linkplain #getValueClass() value class} is lost at compile-time.
      * By comparison, this {@code build()} method has a more accurate return type.
-     * </div>
      *
      * @return the attribute type.
      */
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
index 98b969b62e..c00ff567c9 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
@@ -74,15 +74,15 @@ import org.opengis.feature.Operation;
  *
  * The following example creates a city named "Utopia" by default:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     FeatureTypeBuilder builder;
- *
+
  *     // Create a feature type for a city, which contains a name and a population.
  *     builder = new FeatureTypeBuilder() .setName("City");
  *     builder.addAttribute(String.class) .setName("name").setDefaultValue("Utopia");
  *     builder.addAttribute(Integer.class).setName("population");
  *     FeatureType city = builder.build();
- * }
+ *     }
  *
  * A call to {@code System.out.println(city)} prints the following table:
  *
@@ -452,13 +452,13 @@ public class FeatureTypeBuilder extends TypeBuilder {
      * {@link #setName(CharSequence...)} methods; the result of all previous calls stay unmodified.
      * Example:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     FeatureTypeBuilder builder = new FeatureTypeBuilder().setNameSpace("MyNameSpace").setName("City");
      *     FeatureType city = builder.build();
-     *
+
      *     System.out.println(city.getName());                              // Prints "City"
      *     System.out.println(city.getName().toFullyQualifiedName());       // Prints "MyNameSpace:City"
-     * }
+     *     }
      *
      * There is different conventions about the use of name spaces. ISO 19109 suggests that the namespace of all
      * {@code AttributeType} names is the name of the enclosing {@code FeatureType}, but this is not mandatory.
@@ -663,10 +663,10 @@ public class FeatureTypeBuilder extends TypeBuilder {
      * The default attribute name is the name of the given type, but callers should invoke one
      * of the {@code AttributeTypeBuilder.setName(…)} methods on the returned instance with a better name.
      *
-     * <p>Usage example:</p>
-     * {@preformat java
+     * <h4>Usage example</h4>
+     * {@snippet lang="java" :
      *     builder.addAttribute(String.class).setName("City").setDefaultValue("Metropolis");
-     * }
+     *     }
      *
      * The value class cannot be {@code Feature.class} since features shall be handled
      * as {@linkplain #addAssociation(FeatureType) associations} instead of attributes.
@@ -730,11 +730,11 @@ public class FeatureTypeBuilder extends TypeBuilder {
      * The Coordinate Reference System (CRS) uses (<var>longitude</var>, <var>latitude</var>) axes on the WGS 84 datum.
      * Finally that new attribute is declared the feature <em>default</em> geometry:
      *
-     * {@preformat java
-     *   builder.addAttribute(GeometryType.POINT).setName("MyPoint")
-     *          .setCRS(CommonCRS.WGS84.normalizedGeographic())
-     *          .addRole(AttributeRole.DEFAULT_GEOMETRY);
-     * }
+     * {@snippet lang="java" :
+     *     builder.addAttribute(GeometryType.POINT).setName("MyPoint")
+     *            .setCRS(CommonCRS.WGS84.normalizedGeographic())
+     *            .addRole(AttributeRole.DEFAULT_GEOMETRY);
+     *     }
      *
      * If the library in use is JTS or ESRI instead of Java2D,
      * then the {@code Point} class of those libraries will be used instead of {@code Point2D}.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
index ae51b5abbf..d9fc9405f6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
@@ -64,13 +64,13 @@ import org.opengis.feature.PropertyNotFoundException;
  * qualified name} is requested.
  * Example:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     FeatureTypeBuilder builder = new FeatureTypeBuilder().setNameSpace("MyNameSpace").setName("City");
  *     FeatureType city = builder.build();
- *
+
  *     System.out.println(city.getName());                              // Prints "City"
  *     System.out.println(city.getName().toFullyQualifiedName());       // Prints "MyNameSpace:City"
- * }
+ *     }
  *
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java
index d3e46b7ac5..4762fc9e49 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java
@@ -24,7 +24,7 @@
  * The following example creates a feature type for a capital, as a special kind of city,
  * named "Utopia" by default:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     FeatureTypeBuilder builder;
  *
  *     // Create a feature type for a city, which contains a name and a population.
@@ -37,7 +37,7 @@
  *     builder = new FeatureTypeBuilder().setName("Capital").setSuperTypes(city);
  *     builder.addAttribute(String.class).setName("parliament");
  *     FeatureType capital = builder.build();
- * }
+ *     }
  *
  * A call to {@code System.out.println(capital)} prints the following table:
  *
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/Optimization.java b/core/sis-feature/src/main/java/org/apache/sis/filter/Optimization.java
index ffc8e17298..06a5938a4c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/Optimization.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/Optimization.java
@@ -55,10 +55,10 @@ import org.opengis.feature.FeatureType;
  * This class is <strong>not</strong> thread-safe.
  * A new instance shall be created for each thread applying optimizations. Example:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Filter<R> filter = ...;
  *     filter = new Optimization().apply(filter);
- * }
+ *     }
  *
  * <h2>How optimizations are applied</h2>
  * Optimizations are specific to each expression and filter type.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/AnnotatedImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/AnnotatedImage.java
index 99e12cdaa0..3b80130fd4 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/AnnotatedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/AnnotatedImage.java
@@ -478,7 +478,7 @@ abstract class AnnotatedImage extends ImageAdapter {
      * approach is two define 3 private methods in the subclass as below (where <var>P</var> is the type of the
      * property to compute):
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     private P createAccumulator() {
      *         // Create an object holding the information to be computed by a single thread.
      *         // This is invoked for each worker thread before the worker starts its execution.
@@ -494,7 +494,7 @@ abstract class AnnotatedImage extends ImageAdapter {
      *         // The accumulator may already contain data, which need to be augmented (not overwritten).
      *     }
      *
-     *     &#64;Override
+     *     @Override
      *     protected Collector<Raster,P,P> collector() {
      *         return Collector.of(this::createAccumulator, MyClass::compute, MyClass::combine);
      *     }
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java
index baa8a35f32..4c9d5a0643 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java
@@ -531,8 +531,8 @@ public abstract class ComputedImage extends PlanarImage implements Disposable {
      * The returned tile will be automatically cached.
      *
      * <p>A typical implementation is as below:</p>
-     * {@preformat java
-     *     &#64;Override
+     * {@snippet lang="java" :
+     *     @Override
      *     protected Raster computeTile(int tileX, int tileY, WritableRaster tile) {
      *         if (tile == null) {
      *             tile = createTile(tileX, tileY);
@@ -665,24 +665,24 @@ public abstract class ComputedImage extends PlanarImage implements Disposable {
      * This method is provided for subclasses that implement the {@link WritableRenderedImage} interface.
      * This method can be used as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     class MyImage extends ComputedImage implements WritableRenderedImage {
      *         // Constructor omitted for brevity.
      *
-     *         &#64;Override
+     *         @Override
      *         public WritableRaster getWritableTile(int tileX, int tileY) {
      *             WritableRaster raster = ...;             // Get the writable tile here.
      *             markTileWritable(tileX, tileY, true);
      *             return raster;
      *         }
      *
-     *         &#64;Override
+     *         @Override
      *         public void releaseWritableTile(int tileX, int tileY) {
      *             markTileWritable(tileX, tileY, false);
      *             // Release the raster here.
      *         }
      *     }
-     * }
+     *     }
      *
      * @param  tileX    the <var>x</var> index of the tile to acquire or release.
      * @param  tileY    the <var>y</var> index of the tile to acquire or release.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/MaskedImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/MaskedImage.java
index 0b25ef0022..d11a2aa251 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/MaskedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/MaskedImage.java
@@ -75,13 +75,13 @@ final class MaskedImage extends SourceAlignedImage {
      * The clip after rasterization. Each element contains 8 pixel values.
      * Index of pixel value at coordinate (x,y) can be obtained as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     int xm      = x - maskBounds.x;
      *     int xy      = y - maskBounds.y;
      *     int element = mask[ym*scanlineStride + xm/Byte.SIZE];
      *     int shift   = (Byte.SIZE-1) - (xm & (Byte.SIZE-1));
      *     int pixel   = (element >>> shift) & 1;
-     * }
+     *     }
      *
      * @see #getMask()
      */
@@ -170,13 +170,13 @@ final class MaskedImage extends SourceAlignedImage {
      * After conversion to {@link LongBuffer}, index of pixel value at
      * coordinate (x,y) can be obtained as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     int xm      = x - maskBounds.x;
      *     int xy      = y - maskBounds.y;
      *     int element = mask[ym*scanlineStride + xm/Long.SIZE];
      *     int shift   = (Long.SIZE-1) - (xm & (Long.SIZE-1));
      *     int pixel   = (element >>> shift) & 1;
-     * }
+     *     }
      *
      * <h4>Pre-conditions</h4>
      * The {@link #getMaskTiles()} method must have been invoked at least once before this method.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java b/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
index 702ec9acd0..5f3b84ad5d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
@@ -59,16 +59,15 @@ import static org.apache.sis.internal.util.Numerics.ceilDiv;
  * left to right). Iteration can be performed on a complete image or only a sub-region of it. Some optimized iterator
  * implementations exist for a few commonly used {@linkplain java.awt.image.SampleModel sample models}.
  *
- * <div class="note"><b>Example:</b>
- * {@preformat java
+ * <h2>Example</h2>
+ * {@snippet lang="java" :
  *     PixelIterator it = PixelIterator.create(image);
  *     double[] samples = null;
  *     while (it.next()) {
  *         samples = it.getPixel(samples);      // Get values in all bands.
  *         // Perform computation here...
  *     }
- * }
- * </div>
+ *     }
  *
  * <h2>Default implementation</h2>
  * This base class uses the {@link Raster} API for traversing the pixels in each tile.
@@ -293,11 +292,12 @@ public class PixelIterator {
      * with unspecified iteration order. Users can invoke setter methods for specifying
      * desired behavior for the iterators to create.
      *
-     * <div class="note"><b>Example:</b>
-     * {@preformat java
-     *     PixelIterator iterator = new PixelIterator.Builder().setRegionOfInterest(new Rectangle(10, 10, 5, 5).create(image);
-     * }
-     * </div>
+     * <h2>Example</h2>
+     * {@snippet lang="java" :
+     *     PixelIterator iterator = new PixelIterator.Builder()
+     *             .setRegionOfInterest(new Rectangle(10, 10, 5, 5)
+     *             .create(image);
+     *     }
      */
     public static class Builder {
         /**
@@ -715,15 +715,14 @@ public class PixelIterator {
      * the iterator state is as if the {@link #next()} method has been invoked just before to reach the
      * specified position.
      *
-     * <div class="note"><b>Usage example:</b>
-     * {@preformat java
+     * <h4>Usage example</h4>
+     * {@snippet lang="java" :
      *     iterator.moveTo(x, y);
      *     do {
      *         int sample = iterator.getSample(band);
      *         // Use sample value here...
      *     } while (iterator.next());
-     * }
-     * </div>
+     *     }
      *
      * @param  px  the column index of the pixel to make current.
      * @param  py  the row index of the pixel to make current.
@@ -1116,12 +1115,12 @@ public class PixelIterator {
      * those write operations may change the content of windows at {@linkplain #next() next positions}
      * unless the iteration order of this iterator is {@link SequenceType#LINEAR}.</p>
      *
-     * <div class="note"><b>Usage example:</b>
+     * <h4>Usage example</h4>
      * following code creates an iterator over the full area of given image, then a window of 5×5 pixels.
      * The window is moved over all the image area in iteration order. Inside the window, data are copied
      * in {@linkplain SequenceType#LINEAR linear order} regardless the iteration order.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     PixelIterator it = create(image, null, new Dimension(5, 5), null);     // Windows size will be 5×5 pixels.
      *     PixelIterator<FloatBuffer> window = it.createWindow(TransferType.FLOAT);
      *     FloatBuffer values = window.values;
@@ -1132,8 +1131,7 @@ public class PixelIterator {
      *             // use the sample value here.
      *         }
      *     }
-     * }
-     * </div>
+     *     }
      *
      * @param  <T>   the type of the data buffer to use for transferring data.
      * @param  type  the desired type of values ({@code int}, {@code float} or {@code double}).
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/PlanarImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/PlanarImage.java
index cca4151bfb..88d16a4a9c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/PlanarImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/PlanarImage.java
@@ -87,7 +87,7 @@ import static java.lang.Math.multiplyFull;
  * {@link WritableRenderedImage#releaseWritableTile releaseWritableTile(…)} methods should be invoked in
  * {@code try ... finally} blocks like below:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     WritableRenderedImage image = ...;
  *     WritableRaster tile = image.getWritableTile(tileX, tileY);
  *     try {
@@ -95,7 +95,7 @@ import static java.lang.Math.multiplyFull;
  *     } finally {
  *         image.releaseWritableTile(tileX, tileY);
  *     }
- * }
+ *     }
  *
  * This is recommended because implementations may count the number of acquisitions and releases for deciding
  * when to notify the {@link java.awt.image.TileObserver}s. Some implementations may also acquire and release
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ResampledImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/ResampledImage.java
index 5dd6999a83..f7fe04e8ed 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ResampledImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ResampledImage.java
@@ -316,9 +316,9 @@ public class ResampledImage extends ComputedImage {
      * The return value should be 0 according above contract, but this method returns 0.5 instead.
      * This addition of a 0.5 offset allows the following substitution:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Math.round(x) ≈ (long) Math.floor(x + 0.5)
-     * }
+     *     }
      *
      * {@link Math#round(double)} is the desired behavior for nearest-neighbor interpolation, but the buffer given
      * to {@link Interpolation#interpolate(DoubleBuffer, int, double, double, double[], int)} is filled with values
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java b/core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java
index 4e7f0ff729..4c954536ed 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java
@@ -35,7 +35,7 @@ import org.apache.sis.internal.feature.Resources;
  * <p>Contrarily to {@code PixelIterator}, {@code WritablePixelIterator} needs to be closed after
  * iteration in order to release tiles. Example:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     try (WritablePixelIterator it = WritablePixelIterator.create(image)) {
  *         double[] samples = null;
  *         while (it.next()) {
@@ -44,7 +44,7 @@ import org.apache.sis.internal.feature.Resources;
  *             it.setPixels(sample);                // Replace values in all bands.
  *         }
  *     }
- * }
+ *     }
  *
  * <h2>Casting a {@code PixelIterator}</h2>
  * To check if a {@code PixelIterator} can be used for writing pixels, a {@code … instanceof WritablePixelIterator}
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
index fd6f9dfa21..5d7671c344 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
@@ -655,9 +655,9 @@ public final class ColorModelFactory {
      * Returns a bit count for an {@link IndexColorModel} mapping {@code mapSize} colors.
      * It is guaranteed that the following relation is hold:
      *
-     * {@preformat java
-     *     (1 << getBitCount(mapSize)) >= mapSize
-     * }
+     * {@snippet lang="java" :
+     *     assert (1 << getBitCount(mapSize)) >= mapSize;
+     *     }
      *
      * @param  mapSize  the number of colors in the map.
      * @return the number of bits to use.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/TiledProcess.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/TiledProcess.java
index 326c7ea4a6..80c5b076cb 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/TiledProcess.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/TiledProcess.java
@@ -112,11 +112,11 @@ public abstract class TiledProcess<R> {
      * which will be overwritten by this method.
      *
      * <p>Usage example:</p>
-     * {@preformat java
+     * {@snippet lang="java" :
      *     TiledProcess process = new TiledProcess<MyResultType>(image, 0, 0,
      *             new PixelIterator.Builder().setIteratorOrder(SequenceType.LINEAR))
      *     {
-     *         &#64;Override
+     *         @Override
      *         protected Task createSubTask() {
      *             return new SubTask();
      *         }
@@ -124,13 +124,13 @@ public abstract class TiledProcess<R> {
      *         private final class SubTask extends Task {
      *             private MyResultType result;
      *
-     *             &#64;Override protected void execute() {result = ...}    // Do calculation in background thread.
-     *             &#64;Override protected void merge(Task neighbor) {...}  // Merge this.result with neighbor.result().
-     *             &#64;Override protected MyResultType result() {return result;}
+     *             @Override protected void execute() {result = ...}    // Do calculation in background thread.
+     *             @Override protected void merge(Task neighbor) {...}  // Merge this.result with neighbor.result().
+     *             @Override protected MyResultType result() {return result;}
      *         }
      *     };
      *     process.execute();
-     * }
+     *     }
      *
      * @param  data             the image on which to iterate over the pixels.
      * @param  overlapX         the number of overlapping pixels between tiles on the <var>x</var> axis.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineBuffer.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineBuffer.java
index dd06a647d8..0c468a016e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineBuffer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineBuffer.java
@@ -106,9 +106,9 @@ final class PolylineBuffer {
      * <p>This method is typically invoked in the following pattern (but this is not mandatory).
      * An important aspect is that {@code this} and {@code other} should be on perpendicular axes:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     interpolateOnBottomSide(polylinesOnTop[x].attach(polylineOnLeft));
-     * }
+     *     }
      *
      * @return {@code this} for method calls chaining.
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
index 70da9bf553..7a803659bd 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
@@ -50,9 +50,9 @@ public interface AdapterReplacement {
      * Invoked when a new adapter is created by {@link org.apache.sis.xml.MarshallerPool}.
      * Typical implementations will be as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     marshaller.setAdapter(MyParent.class, this);
-     * }
+     *     }
      *
      * @param  marshaller The marshaller to be configured.
      * @throws JAXBException if the given marshaller cannot be configured.
@@ -63,9 +63,9 @@ public interface AdapterReplacement {
      * Invoked when a new adapter is created by {@link org.apache.sis.xml.MarshallerPool}.
      * Typical implementations will be as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     unmarshaller.setAdapter(MyParent.class, this);
-     * }
+     *     }
      *
      * @param  unmarshaller The unmarshaller to be configured.
      * @throws JAXBException if the given unmarshaller cannot be configured.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
index 034d1bb592..ffce49e72f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
@@ -204,14 +204,14 @@ public final class Context extends MarshalContext {
      * Invoked when a marshalling or unmarshalling process is about to begin.
      * Must be followed by a call to {@link #finish()} in a {@code finally} block.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Context context = new Context(…);
      *     try {
      *         ...
      *     } finally {
      *         context.finish();
      *     }
-     * }
+     *     }
      *
      * @param  bitMasks         a combination of {@link #MARSHALLING}, {@code SUBSTITUTE_*} or other bit masks.
      * @param  locale           the locale, or {@code null} if unspecified.
@@ -332,7 +332,7 @@ public final class Context extends MarshalContext {
      * when marshalling object that need to marshal their children in a different
      * locale, like below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     private void beforeMarshal(Marshaller marshaller) {
      *         Context.push(language);
      *     }
@@ -439,12 +439,12 @@ public final class Context extends MarshalContext {
      * or {@code null} if this information is not provided. The {@code <gml:*PropertyType>} element can contains
      * information not found in {@code <gml:*Type>} objects like XLink or UUID.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * before unmarshalling the {@code <gml:OperationParameter>} (upper case {@code O}) element below,
      * {@code wrapper} will be set to the temporary object representing {@code <gml:operationParameter>}.
      * That adapter provides important information for the SIS {@code <gml:OperationParameter>} constructor.
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:ParameterValue>
      *     <gml:valueFile>http://www.opengis.org</gml:valueFile>
      *     <gml:operationParameter>
@@ -453,8 +453,9 @@ public final class Context extends MarshalContext {
      *       </gml:OperationParameter>
      *     </gml:operationParameter>
      *   </gml:ParameterValue>
-     * }</div>
+     *   }
      *
+     * <h4>Design note</h4>
      * For performance reasons, this {@code wrapper} information is not provided by default.
      * See {@link #setWrapper(Context, PropertyType)} for more information.
      *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
index 617d63de5a..7a65d3dee4 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
@@ -53,11 +53,11 @@ import org.apache.sis.xml.IdentifierSpace;
  * In the current SIS library, there is different places where identifiers are filtered on the
  * basis of this class, as below:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     if (identifier.getAuthority() instanceof NonMarshalledAuthority<?>) {
  *         // Omit that identifier.
  *     }
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
index 334fea70b3..ccb56b90cc 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
@@ -28,7 +28,7 @@ import org.apache.sis.internal.jaxb.FilterByVersion;
  * This object wraps a {@link CodeListUID}, which contain {@link CodeListUID#codeList codeList}
  * and {@link CodeListUID#codeListValue codeListValue} attributes. The result looks like below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <dateType>
  *     <CI_DateTypeCode codeList="../Codelist/ML_gmxCodelists.xml#CI_DateTypeCode" codeListValue="revision" codeSpace="fra">
  *       révision
@@ -76,9 +76,9 @@ public abstract class CodeListAdapter<ValueType extends CodeListAdapter<ValueTyp
      * Wraps the given value.
      * Most implementations will be like below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return new ValueType(value);
-     * }
+     *     }
      *
      * However, is some cases, the {@code value} argument may be inspected.
      * For example, {@link org.apache.sis.internal.jaxb.code.MD_RestrictionCode}
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
index 6a2ca57d21..c4a05ac983 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
@@ -46,11 +46,11 @@ import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPAC
  * require {@code "https"} protocol, but the URLs in this class use {@code "http"} for historical reasons).
  * Example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gmi:MI_SensorTypeCode
  *       codeList="http://standards.iso.org/…snip…/codelists.xml#CI_SensorTypeCode"
  *       codeListValue="RADIOMETER">Radiometer</gmi:MI_SensorTypeCode>
- * }
+ *   }
  *
  * <p>Constants in this class are organized in three groups:</p>
  * <ul>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
index 5a4a4af558..4f6614e1f1 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
@@ -27,7 +27,7 @@ import org.opengis.util.ControlledVocabulary;
  * An adapter for {@link Enum}, in order to implement the ISO 19115-3 standard.
  * Example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <srv:direction>
  *     <srv:SV_ParameterDirection>in</srv:SV_ParameterDirection>
  *   </srv:direction>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java
index 072caaf562..de55bacba1 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java
@@ -100,7 +100,7 @@ public class GO_GenericName extends XmlAdapter<GO_GenericName, GenericName> {
      * is a {@link TypeName} or a {@link MemberName}, in order to use {@link #getName()} instead.
      * Example:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:alias>
      *     <gco:LocalName codeSpace=\"A code space\">A name in a scope</gco:LocalName>
      *   </gml:alias>
@@ -135,7 +135,7 @@ public class GO_GenericName extends XmlAdapter<GO_GenericName, GenericName> {
      * is a {@link LocalName} or {@link ScopedName}, in order to use {@link #getValue()} instead.
      * Example:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:alias>
      *     <gco:TypeName>
      *       <gco:aName>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_URL.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_URL.java
index 2db49f7824..d0f580f6a6 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_URL.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_URL.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlValue;
  * This type was used by legacy XML format inside {@code <gmd:CI_OnlineResource>}, but has
  * been replaced by {@code <gcx:FileName>} in newer ISO 19115-3:2016 standard. Example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gmd:linkage>
  *      <gmd:URL>https://tools.ietf.org/html/rfc1149</gmd:URL>
  *   </gmd:linkage>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/Multiplicity.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/Multiplicity.java
index df80e51c7e..930ac871ff 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/Multiplicity.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/Multiplicity.java
@@ -30,7 +30,7 @@ import org.apache.sis.measure.NumberRange;
  * The possible cardinality of a relation. Represented by a set of simple multiplicity ranges.
  * Example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gco:Multiplicity>
  *     <gco:range>
  *       <gco:MultiplicityRange>
@@ -43,7 +43,7 @@ import org.apache.sis.measure.NumberRange;
  *       </gco:MultiplicityRange>
  *     </gco:range>
  *   </gco:Multiplicity>
- * }
+ *   }
  *
  * @author  Guilhem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java
index 9528bc2837..eb48b55536 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java
@@ -31,7 +31,7 @@ import org.apache.sis.xml.Namespaces;
  * A generalized type to be used for a term, keyword or name.
  * The following schema fragment specifies the expected content contained within this class.
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <complexType name="CodeType">
  *     <simpleContent>
  *       <extension base="<http://www.w3.org/2001/XMLSchema>string">
@@ -39,7 +39,7 @@ import org.apache.sis.xml.Namespaces;
  *       </extension>
  *     </simpleContent>
  *   </complexType>
- * }
+ *   }
  *
  * {@code NameValue}s are used for:
  *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
index 2d44e99145..4a0c89974e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
@@ -128,7 +128,7 @@ final class ObjectReference {
      * Adds a new identifier into the given map, if non null. No previous value should exist in normal situation.
      * However, a previous value may exit in unusual (probably not very valid) XML, as in the following example:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <cit:CI_Citation>
      *     <cit:series uuidref="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">
      *       <cit:CI_Series uuid="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">
@@ -136,7 +136,7 @@ final class ObjectReference {
      *       </cit:CI_Series>
      *     </cit:series>
      *   </cit:CI_Citation>
-     * }
+     *   }
      *
      * In such situation, this method is silent if the two identifiers are equal, or logs a warning and restores
      * the previous value if they are not equal. The previous value is the "{@code uuid}" attribute, which is
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
index 6ea35ef970..43477c603d 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
@@ -44,7 +44,7 @@ import org.apache.sis.util.resources.Errors;
  * the value to be marshalled. Wrappers exist because ISO 19139 have the strange
  * habit to wrap every properties in an extra level, for example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <CI_ResponsibleParty>
  *     <contactInfo>
  *       <CI_Contact>
@@ -52,7 +52,7 @@ import org.apache.sis.util.resources.Errors;
  *       </CI_Contact>
  *     </contactInfo>
  *   </CI_ResponsibleParty>
- * }
+ *   }
  *
  * The {@code <CI_Contact>} level is not really necessary, and JAXB is not designed for inserting
  * such level since it is not the usual way to write XML. In order to get this output with JAXB,
@@ -73,17 +73,17 @@ import org.apache.sis.util.resources.Errors;
  * This method will be systematically called at marshalling time by JAXB. Typical implementation
  * ({@code BoundType} and {@code ValueType} need to be replaced by the concrete class):
  *
- * {@preformat java
- *   &#64;XmlElementRef
- *   public BoundType getElement() {
- *       if (skip()) return null;
- *       final ValueType metadata = this.metadata;
- *       return (metadata instanceof BoundType) ? (BoundType) metadata : new BoundType(metadata);
- *   }
+ * {@snippet lang="java" :
+ *     @XmlElementRef
+ *     public BoundType getElement() {
+ *         if (skip()) return null;
+ *         final ValueType metadata = this.metadata;
+ *         return (metadata instanceof BoundType) ? (BoundType) metadata : new BoundType(metadata);
+ *     }
  *
- *   public void getElement(final BoundType metadata) {
- *       this.metadata = metadata;
- *   }
+ *     public void getElement(final BoundType metadata) {
+ *         this.metadata = metadata;
+ *     }
  * }
  *
  * The actual implementation may be slightly more complicated than the above if there is
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
index 5a20f033b1..eb4abe596f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
@@ -65,7 +65,7 @@
  *
  * <p>Those two kinds of types are marshalled as below:</p>
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <MD_MetaData>
  *     <property uuidref="…">
  *       <Foo_Type uuid="…">
@@ -73,7 +73,7 @@
  *       </Foo_Type>
  *     </property>
  *   </MD_MetaData>
- * }
+ *   }
  *
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java
index ea96ac25e2..6f1154db17 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  * This is used for the URI in {@link org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic}.
  * Example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <fileName>
  *      <gcx:FileName src="../path/wkj98723.jpg">Overview</gcx:FileName>
  *   </fileName>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java
index 14bbc9f382..2fd771b1bc 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  * This is used in {@link org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic}.
  * Example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <fileType>
  *     <gcx:MimeFileType type="image/tiff">Graphic TIFF</gcx:MimeFileType>
  *   </fileType>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
index 5837a06d9b..6513dbef9e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
@@ -31,9 +31,9 @@ import org.apache.sis.internal.xml.XmlUtilities;
  *
  * <p>Using this adapter is equivalent to apply the following annotation on a {@code Date} field:</p>
  *
- * {@preformat java
- *     &#64;XmlElement
- *     &#64;XmlSchemaType(name="date")
+ * {@snippet lang="java" :
+ *     @XmlElement
+ *     @XmlSchemaType(name="date")
  *     private Date realizationEpoch;
  * }
  *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
index 877503c1a3..ec1c332203 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
@@ -47,7 +47,7 @@ import org.apache.sis.measure.Units;
  * The former expresses some measurements with an object of XML type {@code gco:Distance}
  * (as a substitution for XML type {@code gco:Measure}):
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <mri:distance>
  *     <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
  *   </mri:distance>
@@ -55,7 +55,7 @@ import org.apache.sis.measure.Units;
  *
  * while GML will rather use a a syntax like below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gml:semiMajorAxis uom="urn:ogc:def:uom:EPSG::9001">6378137</gml:semiMajorAxis>
  * }
  *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java
index ae151eef58..c382e5d548 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java
@@ -35,19 +35,19 @@ import org.apache.sis.util.Classes;
  * implementation returning {@code null}. Modules capable to provide an instance shall create
  * a subclass like below:</p>
  *
- * {@preformat java
- *     public final class MyClass extends SC_VerticalCRS implements AdapterReplacement {
- *         &#64;Override
- *         public void register(final Marshaller marshaller) {
- *             marshaller.setAdapter(SC_VerticalCRS.class, this);
- *         }
+ * {@snippet lang="java" :
+ * public final class MyClass extends SC_VerticalCRS implements AdapterReplacement {
+ *     @Override
+ *     public void register(final Marshaller marshaller) {
+ *         marshaller.setAdapter(SC_VerticalCRS.class, this);
+ *     }
  *
- *         &#64;Override
- *         public DefaultVerticalCRS getElement() {
- *             return skip() ? null : DefaultVerticalCRS.castOrCopy(metadata);
- *         }
+ *     @Override
+ *     public DefaultVerticalCRS getElement() {
+ *         return skip() ? null : DefaultVerticalCRS.castOrCopy(metadata);
  *     }
  * }
+ * }
  *
  * Next, the module shall provides the following:
  * <ul>
@@ -110,9 +110,9 @@ public class SC_VerticalCRS extends PropertyType<SC_VerticalCRS, VerticalCRS> {
      * The default implementation returns {@code null}. Subclasses shall override
      * this method like below:
      *
-     * {@preformat java
-     *   return skip() ? null : DefaultVerticalCRS.castOrCopy(metadata);
-     * }
+     * {@snippet lang="java" :
+     *     return skip() ? null : DefaultVerticalCRS.castOrCopy(metadata);
+     *     }
      *
      * @return the metadata to be marshalled.
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
index 6774f3c92e..b8a79a898c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
@@ -63,12 +63,12 @@ public abstract class TimePeriodBound {
      * The begin or end position in a {@link TimePeriod}, expressed in the GML 3 way.
      * Example:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:TimePeriod>
      *     <gml:beginPosition>1992-01-01T01:00:00.000+01:00</gml:beginPosition>
      *     <gml:endPosition>2007-12-31T01:00:00.000+01:00</gml:endPosition>
      *   </gml:TimePeriod>
-     * }
+     *   }
      */
     public static final class GML3 extends TimePeriodBound {
         /**
@@ -123,7 +123,7 @@ public abstract class TimePeriodBound {
      * element inside a GML 2 {@link TimePeriod} in GML 2. This is not used for GML 3.
      * Example:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:TimePeriod>
      *     <gml:begin>
      *       <gml:TimeInstant gml:id="begin">
@@ -136,7 +136,7 @@ public abstract class TimePeriodBound {
      *       </gml:TimeInstant>
      *     </gml:end>
      *   </gml:TimePeriod>
-     * }
+     *   }
      */
     //@XmlType(name = "TimeInstantPropertyType") // TODO: Omitted for now for allowing external modules to define their own type.
     public static final class GML2 extends TimePeriodBound {
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/Country.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/Country.java
index f38c840d26..6ce06f91f7 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/Country.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/Country.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.resources.Errors;
  *
  * <p>This adapter formats the locale like below:</p>
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <cit:country>
  *     <lan:Country codeList="http://(...snip...)" codeListValue="FR">France</lan:Country>
  *   </cit:country>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LanguageCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LanguageCode.java
index 50a46358db..7117619b87 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LanguageCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LanguageCode.java
@@ -32,7 +32,7 @@ import org.apache.sis.internal.jaxb.gco.CharSequenceAdapter;
  *
  * <p>This adapter formats the locale like below (by {@link LocaleAdapter}):</p>
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gmd:language>
  *     <gmd:LanguageCode codeList="http://(...snip...)" codeListValue="eng">English</gmd:LanguageCode>
  *   </gmd:language>
@@ -40,13 +40,13 @@ import org.apache.sis.internal.jaxb.gco.CharSequenceAdapter;
  *
  * or (when using {@link PT_Locale} adapter):
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <lan:PT_Locale>
  *     <lan:language>
  *       <lan:LanguageCode codeList="http://(...snip...)" codeListValue="eng">English</lan:LanguageCode>
  *     </lan:language>
  *   </lan:PT_Locale>
- * }
+ *   }
  *
  * Note that {@code <gco:CharacterString>} can be substituted to the language code.
  *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAdapter.java
index 71b5b849fd..6d39973fd1 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAdapter.java
@@ -25,7 +25,7 @@ import org.apache.sis.internal.jaxb.Context;
  * JAXB adapter for XML {@code <GO_CharacterString>} or {@code <LanguageCode>} elements
  * mapped to {@link Locale}. This adapter formats the locale like below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gmd:language>
  *     <gmd:LanguageCode codeList="(snip)#LanguageCode" codeListValue="jpn">Japanese</gmd:LanguageCode>
  *   </gmd:language>
@@ -83,7 +83,7 @@ public final class LocaleAdapter extends XmlAdapter<LanguageCode, Locale> {
      * JAXB adapter for XML {@code <PT_Locale>} elements mapped to {@link Locale}.
      * This adapter formats the locale like below:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gmd:locale>
      *     <gmd:PT_Locale>
      *       <gmd:language>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java
index 6b5c0c0233..9e9a8ea2b2 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java
@@ -35,7 +35,7 @@ import org.apache.sis.util.ArraysExt;
  * It will be used in order to marshal and unmarshal international strings localized in several language,
  * using the {@link DefaultInternationalString} implementation class. Example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <cit:title xsi:type="lan:PT_FreeText_PropertyType">
  *     <gco:CharacterString>Some title in english is present in this node</gco:CharacterString>
  *     <lan:PT_FreeText>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_Locale.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_Locale.java
index 055abe0401..7c192f3210 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_Locale.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_Locale.java
@@ -39,7 +39,7 @@ import org.apache.sis.internal.util.CollectionsExt;
  * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3.
  * This wrapper formats the locale like below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <lan:locale>
  *     <lan:PT_Locale id="locale-eng">
  *       <lan:language>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/TextGroup.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/TextGroup.java
index 91fbb4d3bc..d1c218f6d9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/TextGroup.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/TextGroup.java
@@ -37,7 +37,7 @@ import javax.xml.bind.annotation.XmlElement;
  * languages. SIS uses the ISO 19139:2007 compliant form for marshalling, but accepts both forms
  * during unmarshalling. More specifically, the name suggests that the format should be:</p>
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gco:CharacterString>Apache SIS, projet OpenSource</gco:CharacterString>
  *   <lan:PT_FreeText>
  *     <lan:textGroup>
@@ -50,7 +50,7 @@ import javax.xml.bind.annotation.XmlElement;
  *
  * But the actual official format is:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gco:CharacterString>Apache SIS, projet OpenSource</gco:CharacterString>
  *   <lan:PT_FreeText>
  *     <lan:textGroup>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
index 901cb16940..87b1e42502 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
@@ -21,7 +21,7 @@
  * JAXB cannot marshal directly interfaces), and wrappers around the value to be marshalled.
  * ISO 19139 have the strange habit to wrap every properties in an extra level, for example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <CI_ResponsibleParty>
  *     <contactInfo>
  *       <CI_Contact>
@@ -29,7 +29,7 @@
  *       </CI_Contact>
  *     </contactInfo>
  *   </CI_ResponsibleParty>
- * }
+ *   }
  *
  * The {@code </CI_Contact>} level is not really necessary, and JAXB is not designed for inserting
  * such level since it is not the usual way to write XML. In order to get this output with JAXB, we
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java
index 240a6b5a12..4e1ea95d7f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java
@@ -28,7 +28,7 @@ import org.apache.sis.internal.xml.LegacyNamespaces;
  * Identifier using {@code <gmd:RS_Identifier>} XML element name.
  * This is used for (un)marshalling legacy metadata only. Example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gmd:RS_Identifier>
  *     <gmd:authority>
  *       <gmd:CI_Citation>
@@ -41,7 +41,7 @@ import org.apache.sis.internal.xml.LegacyNamespaces;
  *       <gco:CharacterString>4326</gco:CharacterString>
  *     </gmd:code>
  *   </gmd:RS_Identifier>
- * }
+ *   }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
index 2a98a1a86b..dc3fd6055e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
@@ -81,7 +81,7 @@ public final class ServiceParameter extends Parameter {
      * element as it does for all other attributes) while in ISO 19139:2007 it was not (i.e. name attributes
      * like {@code <gco:aName>} were marshalled directly, without wrapper). Example:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <srv:name>
      *     <gco:MemberName>
      *       <gco:aName>
@@ -250,7 +250,7 @@ public final class ServiceParameter extends Parameter {
     /**
      * Returns the name to be marshalled in the ISO 19139:2007 way. Example:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <srv:name>
      *     <gco:aName>
      *       <gco:CharacterString>A parameter name</gco:CharacterString>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
index e08fdb9676..be05b9ec0c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
@@ -293,9 +293,9 @@ public class SQLBuilder extends Syntax {
      * Returns a SQL statement for adding a column in a table.
      * The returned statement is of the form:
      *
-     * {@preformat sql
-     *   ALTER TABLE "schema"."table" ADD COLUMN "column" type
-     * }
+     * {@snippet lang="sql" :
+     *     ALTER TABLE "schema"."table" ADD COLUMN "column" type
+     *     }
      *
      * where {@code type} is some SQL keyword like {@code INTEGER} or {@code VARCHAR}
      * depending on the {@code type} argument.
@@ -325,10 +325,10 @@ public class SQLBuilder extends Syntax {
      * Returns a SQL statement for creating a foreigner key constraint.
      * The returned statement is of the form:
      *
-     * {@preformat sql
-     *   ALTER TABLE "schema"."table" ADD CONSTRAINT "table_column_fkey" FOREIGN KEY("column")
-     *   REFERENCES "schema"."target" (primaryKey) ON UPDATE CASCADE ON DELETE RESTRICT
-     * }
+     * {@snippet lang="sql" :
+     *     ALTER TABLE "schema"."table" ADD CONSTRAINT "table_column_fkey" FOREIGN KEY("column")
+     *     REFERENCES "schema"."target" (primaryKey) ON UPDATE CASCADE ON DELETE RESTRICT
+     *     }
      *
      * Note that the primary key is <strong>not</strong> quoted on intent.
      * If quoted are desired, then they must be added explicitly before to call this method.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLUtilities.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLUtilities.java
index eeba575e5b..02b572d079 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLUtilities.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLUtilities.java
@@ -185,10 +185,10 @@ public final class SQLUtilities extends Static {
      * Workaround for what seems to be a Derby 10.11 bug, which seems to behave as if the LIKE pattern
      * had a trailing % wildcard. This can be verified with the following query on the EPSG database:
      *
-     * {@preformat sql
-     *   SELECT COORD_REF_SYS_CODE, COORD_REF_SYS_NAME FROM EPSG."Coordinate Reference System"
-     *    WHERE COORD_REF_SYS_NAME LIKE 'NTF%Paris%Lambert%zone%I'
-     * }
+     * {@snippet lang="sql" :
+     *     SELECT COORD_REF_SYS_CODE, COORD_REF_SYS_NAME FROM EPSG."Coordinate Reference System"
+     *      WHERE COORD_REF_SYS_NAME LIKE 'NTF%Paris%Lambert%zone%I'
+     *     }
      *
      * which returns "NTF (Paris) / Lambert zone I" as expected but also zones II and III.
      *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
index 13a6370932..3d4faa153e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
@@ -120,10 +120,10 @@ public class ScriptRunner implements AutoCloseable {
      * {@code true} if the database supports enums.
      * Example:
      *
-     * {@preformat sql
+     * {@snippet lang="sql" :
      *     CREATE TYPE metadata."CI_DateTypeCode" AS ENUM ('creation', 'publication');
      *     CREATE CAST (VARCHAR AS metadata."CI_DateTypeCode") WITH INOUT AS ASSIGNMENT;
-     * }
+     *     }
      *
      * <p>Notes per database product:</p>
      * <ul>
@@ -151,9 +151,9 @@ public class ScriptRunner implements AutoCloseable {
      * Read-only permissions are typically granted to {@link #PUBLIC}.
      * Example:
      *
-     * {@preformat sql
+     * {@snippet lang="sql" :
      *     GRANT USAGE ON SCHEMA metadata TO PUBLIC;
-     * }
+     *     }
      *
      * @see #statementsToSkip
      */
@@ -164,9 +164,9 @@ public class ScriptRunner implements AutoCloseable {
      * Read-only permissions are typically granted to {@link #PUBLIC}.
      * Example:
      *
-     * {@preformat sql
+     * {@snippet lang="sql" :
      *     GRANT SELECT ON TABLE epsg_coordinatereferencesystem TO PUBLIC;
-     * }
+     *     }
      *
      * @see #statementsToSkip
      */
@@ -176,9 +176,9 @@ public class ScriptRunner implements AutoCloseable {
      * {@code true} if the database supports the {@code COMMENT} statement.
      * Example:
      *
-     * {@preformat sql
+     * {@snippet lang="sql" :
      *     COMMENT ON SCHEMA metadata IS 'ISO 19115 metadata';
-     * }
+     *     }
      *
      * @see #statementsToSkip
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java
index cca641c481..3dd241fe85 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java
@@ -42,7 +42,7 @@
  *   </li>
  *
  *   <li><p>Declare the JNDI name in application {@code WEB-INF/web.xml} file:</p>
- *     {@preformat xml
+ *     {@snippet lang="xml" :
  *       <resource-ref>
  *         <description>EPSG dataset and other metadata used by Apache SIS.</description>
  *         <res-ref-name>jdbc/SpatialMetadata</res-ref-name>
@@ -54,7 +54,7 @@
  *
  *   <li><p>Configure the data source in {@code $CATALINA_HOME/conf/context.xml} or in application
  *     {@code META-INF/context.xml} file (change attribute values as needed for the chosen JDBC driver):</p>
- *     {@preformat xml
+ *     {@snippet lang="xml" :
  *       <Context crossContext="true">
  *         <WatchedResource>WEB-INF/web.xml</WatchedResource>
  *         <Resource name            = "jdbc/SpatialMetadata"
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
index a3435c1c8d..8e2bdf2155 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
@@ -177,11 +177,13 @@ public abstract class AbstractMetadata implements LenientComparable, Emptiable {
      * such collection.
      *
      * <h4>Default implementation</h4>
-     * The default implementation is equivalent to the following method call:
+     * The default implementation is equivalent to the following:
      *
-     * {@preformat java
-     *   return getStandard().asValueMap(this, null, KeyNamePolicy.JAVABEANS_PROPERTY, ValueExistencePolicy.NON_EMPTY);
-     * }
+     * {@snippet lang="java" :
+     *     return getStandard().asValueMap(this, null,
+     *             KeyNamePolicy.JAVABEANS_PROPERTY,
+     *             ValueExistencePolicy.NON_EMPTY);
+     *     }
      *
      * @return a view of this metadata object as a map.
      *
@@ -238,23 +240,23 @@ public abstract class AbstractMetadata implements LenientComparable, Emptiable {
      * to have their {@code IDENTIFIER} set before any other operation. For example, the following code
      * adds a title to a citation:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     TreeTable.Node node = ...;                               // The node for a DefaultCitation.
      *     TreeTable.Node child = node.newChild();
      *     child.setValue(TableColumn.IDENTIFIER, "title");
      *     child.setValue(TableColumn.VALUE, "Le petit prince");
      *     // Nothing else to do - the child node has been added.
-     * }
+     *     }
      *
      * Nodes can be removed by invoking the {@link java.util.Iterator#remove()} method on the
      * {@linkplain org.apache.sis.util.collection.TreeTable.Node#getChildren() children} iterator.
      *
      * <h4>Default implementation</h4>
-     * The default implementation is equivalent to the following method call:
+     * The default implementation is equivalent to the following:
      *
-     * {@preformat java
-     *   return getStandard().asTreeTable(this, null, ValueExistencePolicy.COMPACT);
-     * }
+     * {@snippet lang="java" :
+     *     return getStandard().asTreeTable(this, null, ValueExistencePolicy.COMPACT);
+     *     }
      *
      * @return a tree table representation of the specified metadata.
      *
@@ -283,7 +285,7 @@ public abstract class AbstractMetadata implements LenientComparable, Emptiable {
      * Performs a {@linkplain ComparisonMode#STRICT strict} comparison of this metadata with
      * the given object. This method is implemented as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     public final boolean equals(final Object object) {
      *         return equals(object, ComparisonMode.STRICT);
      *     }
@@ -323,9 +325,9 @@ public abstract class AbstractMetadata implements LenientComparable, Emptiable {
      * Returns a string representation of this metadata.
      * The default implementation is as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return asTreeTable().toString();
-     * }
+     *     }
      *
      * Note that this make extensive use of Unicode characters
      * and is better rendered with a monospaced font.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
index 88a2d59c1f..b0ba36832a 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
@@ -687,16 +687,15 @@ public class MetadataStandard implements Serializable {
      * {@linkplain KeyNamePolicy#METHOD_NAME method names} or {@linkplain KeyNamePolicy#SENTENCE
      * sentences} (usually in English).
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * The following code prints <code>"alternateTitle<u>s</u>"</code> (note the plural):
      *
-     * {@preformat java
-     *   MetadataStandard standard = MetadataStandard.ISO_19115;
-     *   Map<String, String> names = standard.asNameMap(Citation.class, UML_IDENTIFIER, JAVABEANS_PROPERTY);
-     *   String value = names.get("alternateTitle");
-     *   System.out.println(value);                   // alternateTitles
-     * }
-     * </div>
+     * {@snippet lang="java" :
+     *     MetadataStandard standard = MetadataStandard.ISO_19115;
+     *     Map<String, String> names = standard.asNameMap(Citation.class, UML_IDENTIFIER, JAVABEANS_PROPERTY);
+     *     String value = names.get("alternateTitle");
+     *     System.out.println(value);                   // alternateTitles
+     *     }
      *
      * The {@code keyPolicy} argument specify only the string representation of keys returned by the iterators.
      * No matter the key name policy, the {@code key} argument given to any {@link Map} method can be any of the
@@ -725,16 +724,15 @@ public class MetadataStandard implements Serializable {
      * {@linkplain TypeValuePolicy#ELEMENT_TYPE element type} or the
      * {@linkplain TypeValuePolicy#DECLARING_INTERFACE declaring interface} among others.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * the following code prints the {@link org.opengis.util.InternationalString} class name:
      *
-     * {@preformat java
-     *   MetadataStandard  standard = MetadataStandard.ISO_19115;
-     *   Map<String,Class<?>> types = standard.asTypeMap(Citation.class, UML_IDENTIFIER, ELEMENT_TYPE);
-     *   Class<?> value = types.get("alternateTitle");
-     *   System.out.println(value);                       // class org.opengis.util.InternationalString
-     * }
-     * </div>
+     * {@snippet lang="java" :
+     *     MetadataStandard  standard = MetadataStandard.ISO_19115;
+     *     Map<String,Class<?>> types = standard.asTypeMap(Citation.class, UML_IDENTIFIER, ELEMENT_TYPE);
+     *     Class<?> value = types.get("alternateTitle");
+     *     System.out.println(value);                       // class org.opengis.util.InternationalString
+     *     }
      *
      * @param  type         the interface or implementation class of a metadata.
      * @param  keyPolicy    determines the string representation of map keys.
@@ -939,13 +937,13 @@ public class MetadataStandard implements Serializable {
      * to have their {@code IDENTIFIER} set before any other operation. For example, the following code
      * adds a title to a citation:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     TreeTable.Node node = ...;                               // The node for a DefaultCitation.
      *     TreeTable.Node child = node.newChild();
      *     child.setValue(TableColumn.IDENTIFIER, "title");
      *     child.setValue(TableColumn.VALUE, "Le petit prince");
      *     // Nothing else to do - the child node has been added.
-     * }
+     *     }
      *
      * Nodes can be removed by invoking the {@link java.util.Iterator#remove()} method on the
      * {@linkplain org.apache.sis.util.collection.TreeTable.Node#getChildren() children} iterator.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
index 4563198ae7..6232164bc3 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
@@ -55,7 +55,7 @@ import static org.apache.sis.internal.metadata.ImplementationHelper.valueIfDefin
  * Subclasses can follow the pattern below for every {@code get} and {@code set} methods,
  * with a different processing for singleton value or for {@linkplain Collection collections}.
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     public class MyMetadata {
  *
  *         // ==== Example for a singleton value =============================
@@ -84,7 +84,7 @@ import static org.apache.sis.internal.metadata.ImplementationHelper.valueIfDefin
  *             properties = writeCollection(newValues, properties, Foo.class);
  *         }
  *     }
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
@@ -309,22 +309,22 @@ public abstract class ModifiableMetadata extends AbstractMetadata {
      *
      * <p>This method is typically invoked for getting a modifiable metadata from an unmodifiable one:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Metadata source  = ...;          // Any implementation.
      *     DefaultMetadata md = DefaultMetadata.castOrCopy(source);
      *     md = (DefaultMetadata) md.deepCopy(DefaultMetadata.State.EDITABLE);
-     * }
+     *     }
      *
      * <h4>Alternative</h4>
      * If unconditional copy is desired, or if the metadata to copy may be arbitrary implementations
      * of GeoAPI interfaces (i.e. not necessarily a {@code ModifiableMetadata} subclass),
      * then the following code can be used instead:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     MetadataCopier copier = new MetadataCopier(MetadataStandard.ISO_19115);
      *     Metadata source = ...;                           // Any implementation.
      *     Metadata copy = copier.copy(Metadata.class, source);
-     * }
+     *     }
      *
      * The {@code Metadata} type in above example can be replaced by any other ISO 19115 type.
      * Types from other standards can also be used if the {@link MetadataStandard#ISO_19115} constant
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
index 0ea2d55f13..69e9871bb3 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
@@ -122,16 +122,16 @@ class PropertyAccessor {
      * The implementation class, or {@link #type} if none.
      * The following condition must hold:
      *
-     * {@preformat java
-     *     type.isAssignableFrom(implementation);
-     * }
+     * {@snippet lang="java" :
+     *     assert type.isAssignableFrom(implementation);
+     *     }
      *
-     * <div class="note"><b>Design note:</b>
+     * <h4>Design note</h4>
      * We could enforce the above-cited restriction with type parameter: if the {@link #type} field is declared
      * as {@code Class<T>}, then this {@code implementation} field would be declared as {@code Class<? extends T>}.
      * However, this is not useful for this internal class because the {@code <T>} type is never known; we have the
      * {@code <?>} type everywhere except in tests, which result in compiler warnings at {@code PropertyAccessor}
-     * construction.</div>
+     * construction.
      */
     final Class<?> implementation;
 
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
index 7eb27838f9..cf5b798869 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
@@ -713,13 +713,13 @@ class TreeNode implements Node {
      * The user shall set the identifier and the value, in that order, before
      * any other operation on the new child. Example:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     TreeTable.Node node = ...;
      *     TreeTable.Node child = node.newChild();
      *     child.setValue(TableColumn.IDENTIFIER, "title");
      *     child.setValue(TableColumn.VALUE, "Le petit prince");
      *     // Nothing else to do - node has been added.
-     * }
+     *     }
      *
      * Do not keep a reference to the returned node for a long time, since it is only
      * a proxy toward the real node to be created once the identifier is known.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
index 8ccfed083b..f2d20173c1 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
@@ -82,9 +82,9 @@ final class TreeNodeChildren extends AbstractCollection<TreeTable.Node> {
      * {@link #metadata} object. This is given at construction time and shall be the
      * same than the following code:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     accessor = parent.table.standard.getAccessor(metadata.getClass(), true);
-     * }
+     *     }
      */
     final PropertyAccessor accessor;
 
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
index 41c6797f86..d6ce8f6526 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
@@ -136,7 +136,7 @@ public enum ValueExistencePolicy {
      * This policy is relevant for metadata classes annotated with {@link TitleProperty};
      * for all other classes, this policy is identical to {@link #NON_EMPTY}.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * the {@link org.apache.sis.metadata.iso.citation.DefaultCitation} and
      * {@link org.apache.sis.metadata.iso.citation.DefaultCitationDate} classes are annotated with
      * <code>&#64;TitleProperty(name="title")</code> and <code>&#64;TitleProperty(name="date")</code>
@@ -162,7 +162,7 @@ public enum ValueExistencePolicy {
      *           └─Date type…… Creation
      *     }
      *   </td></tr>
-     * </table></div>
+     * </table>
      *
      * This policy is the default behavior of {@link AbstractMetadata#asTreeTable()},
      * and consequently defines the default rendering of {@link AbstractMetadata#toString()}.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
index 295f36aa6a..29aca8b100 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
@@ -57,8 +57,8 @@ import org.apache.sis.xml.Namespaces;
  * <h2>Text, URN and XML representations</h2>
  * The XML representation of {@link DefaultIdentifier} is as the following example:
  *
- * {@preformat xml
- *   <mcc:MD_Identifier
+ * {@snippet lang="xml" :
+ *   <mcc:MD_Identifier>
  *     <mcc:code>
  *       <gco:CharacterString>4326</gco:CharacterString>
  *     </mcc:code>
@@ -70,7 +70,7 @@ import org.apache.sis.xml.Namespaces;
  *       </cit:CI_Citation>
  *     </mcc:authority>
  *   </mcc:MD_Identifier>
- * }
+ *   }
  *
  * <h2>Limitations</h2>
  * <ul>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
index 7c3e5aa5ac..f2729c257a 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
@@ -125,7 +125,7 @@ public final class Citations extends Static {
      * "OGP" identifier as "IOGP" (see the special case in fromName(String) method). This is also a way to share
      * the same citation instance in GML like below:</p>
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:identifier codeSpace="IOGP">urn:ogc:def:crs:EPSG::4326</gml:identifier>
      * }
      *
@@ -159,7 +159,7 @@ public final class Citations extends Static {
      * But in the particular case of GML, both {@code "EPSG"} and {@code "IOGP"} appear in different locations.
      * For example:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:identifier codeSpace="IOGP">urn:ogc:def:crs:EPSG::4326</gml:identifier>
      * }
      *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
index a86994dba1..4509fd096b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
@@ -530,9 +530,9 @@ public class DefaultCitation extends ISOMetadata implements Citation {
      * Returns the International Standard Book Number.
      * In this SIS implementation, invoking this method is equivalent to:
      *
-     * {@preformat java
-     *   return getIdentifierMap().getSpecialized(Citations.ISBN);
-     * }
+     * {@snippet lang="java" :
+     *     return getIdentifierMap().getSpecialized(Citations.ISBN);
+     *     }
      *
      * @return the ISBN, or {@code null} if none.
      *
@@ -549,9 +549,9 @@ public class DefaultCitation extends ISOMetadata implements Citation {
      * Sets the International Standard Book Number.
      * In this SIS implementation, invoking this method is equivalent to:
      *
-     * {@preformat java
-     *   getIdentifierMap().putSpecialized(Citations.ISBN, newValue);
-     * }
+     * {@snippet lang="java" :
+     *     getIdentifierMap().putSpecialized(Citations.ISBN, newValue);
+     *     }
      *
      * @param  newValue  the new ISBN, or {@code null} if none.
      *
@@ -569,9 +569,9 @@ public class DefaultCitation extends ISOMetadata implements Citation {
      * Returns the International Standard Serial Number.
      * In this SIS implementation, invoking this method is equivalent to:
      *
-     * {@preformat java
-     *   return getIdentifierMap().getSpecialized(Citations.ISSN);
-     * }
+     * {@snippet lang="java" :
+     *     return getIdentifierMap().getSpecialized(Citations.ISSN);
+     *     }
      *
      * @return the ISSN, or {@code null} if none.
      *
@@ -588,9 +588,9 @@ public class DefaultCitation extends ISOMetadata implements Citation {
      * Sets the International Standard Serial Number.
      * In this SIS implementation, invoking this method is equivalent to:
      *
-     * {@preformat java
-     *   getIdentifierMap().putSpecialized(Citations.ISSN, newValue);
-     * }
+     * {@snippet lang="java" :
+     *     getIdentifierMap().putSpecialized(Citations.ISSN, newValue);
+     *     }
      *
      * @param  newValue  the new ISSN.
      *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
index b958400878..351e123a15 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
@@ -310,15 +310,14 @@ public class DefaultOnlineResource extends ISOMetadata implements OnlineResource
      * Returns the request used to access the resource depending on the protocol.
      * This is used mainly for POST requests.
      *
-     * <div class="note"><b>Example:</b>
-     * {@preformat xml
+     * <h4>Example</h4>
+     * {@snippet lang="xml" :
      *     <GetFeature service="WFS" version="2.0.0"
      *                 outputFormat="application/gml+xml;verson=3.2"
      *                 xmlns="(…snip…)">
      *         <Query typeNames="Roads"/>
      *     </GetFeature>
-     * }
-     * </div>
+     *     }
      *
      * @return Request used to access the resource.
      *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
index b100ef138f..23e6726fb1 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
@@ -488,9 +488,9 @@ public final class Extents extends Static {
      * or {@code null} if none. First, this method computes the union of all temporal elements. Then this method
      * computes the linear interpolation between the start and end time as in the following pseudo-code:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return new Date(startTime + (endTime - startTime) * location);
-     * }
+     *     }
      *
      * Special cases:
      * <ul>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
index c635e21db8..23a99bf31d 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
@@ -264,9 +264,9 @@ public class DefaultRepresentativeFraction extends Number implements Representat
      * Returns {@code true} if no scale is defined.
      * The following relationship shall hold:
      *
-     * {@preformat java
-     *   assert isEmpty() == Double.isNaN(doubleValue());
-     * }
+     * {@snippet lang="java" :
+     *     assert isEmpty() == Double.isNaN(doubleValue());
+     *     }
      *
      * @return {@code true} if no scale is defined.
      *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
index 4cf7975876..25b1d9dfa0 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
@@ -82,10 +82,10 @@ import org.apache.sis.util.iso.Types;
  * or another database specified at construction time.
  * Metadata instances can be obtained as in the example below:
  *
- * {@preformat java
- *   MetadataSource metadata = MetadataSource.getProvided();
- *   Format format = source.lookup(Format.class, "PNG");
- * }
+ * {@snippet lang="java" :
+ *     MetadataSource metadata = MetadataSource.getProvided();
+ *     Format format = source.lookup(Format.class, "PNG");
+ *     }
  *
  * where {@code id} is the primary key value for the desired record in the {@code Format} table.
  *
@@ -178,7 +178,7 @@ public class MetadataSource implements AutoCloseable {
      * because a single JDBC connection cannot be assumed thread-safe.
      *
      * <p>Usage example:</p>
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Class<?> type = …;
      *     synchronized (this) {
      *         // Get an entry, or create a new one if no entry is available.
@@ -191,7 +191,7 @@ public class MetadataSource implements AutoCloseable {
      *         Object value = statement.getValue(…);
      *         preferredIndex = recycle(statement, preferredIndex);
      *     }
-     * }
+     *     }
      *
      * @see #prepareStatement(Class, String, int)
      * @see #recycle(CachedStatement, int)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
index b244a90535..ab49cacfd9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
@@ -634,9 +634,9 @@ public class MetadataWriter extends MetadataSource {
      * Returns the SQL statement for creating the given table with the given primary key.
      * This method returns a string of the following form:
      *
-     * {@preformat sql
+     * {@snippet lang="sql" :
      *     CREATE TABLE "schema"."table" (primaryKey VARCHAR(20) NOT NULL PRIMARY KEY)
-     * }
+     *     }
      */
     private String createTable(final String table, final String primaryKey) throws SQLException {
         return helper().clear().append("CREATE TABLE ").appendIdentifier(schema(), table)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
index 4f91ff0fff..12a9c27709 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
@@ -98,19 +98,19 @@ public class DefaultLocalName extends AbstractName implements LocalName {
      * which replace the {@code LocalName} instance by an internal {@code NameValue} object (so the XML element
      * declared here is never marshalled). Example:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gco:LocalName codeSpace=\"A code space\">A name in a scope</gco:LocalName>
-     * }
+     *   }
      *
      * versus
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gco:TypeName>
      *     <gco:aName>
      *       <gco:CharacterString>Another local name</gco:CharacterString>
      *     </gco:aName>
      *   </gco:TypeName>
-     * }
+     *   }
      */
     @SuppressWarnings("serial")
     @XmlJavaTypeAdapter(CharSequenceAdapter.class)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
index 99ef3143be..fb805a3fc1 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
@@ -321,9 +321,9 @@ public class DefaultNameSpace implements NameSpace, Serializable {
      * {@linkplain AbstractName#toFullyQualifiedName() fully-qualified names} where
      * the following condition holds:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     assert name.scope().isGlobal() == true;
-     * }
+     *     }
      *
      * @return the identifier of this namespace.
      */
@@ -509,10 +509,10 @@ public class DefaultNameSpace implements NameSpace, Serializable {
      * With this convention, it would be possible to create an <cite>expanded form</cite> of a generic name
      * (except for escaping of illegal characters) with a simple concatenation as in the following code example:
      *
-     * {@preformat java
-     *     GenericName name = ...; // A name
+     * {@snippet lang="java" :
+     *     GenericName name = ...;                // A name
      *     println("Expanded form = " + name.scope() + name);
-     * }
+     *     }
      *
      * However, the convention followed by this {@code DefaultNameSpace} implementation is not specified in the
      * {@link NameSpace} contract. This implementation follows the JCR convention for debugging convenience,
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecord.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
index e70021ff00..f9f7305b8f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
@@ -438,14 +438,14 @@ public class DefaultRecord implements Record, Serializable {
      * A record can be anything, but usages that we have seen so far write a character
      * sequence or a code list. Examples:
      *
-     * {@preformat xml
-     *    <gco:Record>Alphanumeric values: Product is alphanumeric.</gco:Record>
-     *    <gco:Record>Alphanumeric Text: Message contains alphanumeric text.</gco:Record>
-     *    <gco:Record>Part A: Reflectivity presented as a tabular listing of alphanumerics.</gco:Record>
-     *    <gco:Record>
-     *      <gmd:CodeListValue codelist="someURL#DataQualityAssessment" codeListValue="intermediate">intermediate</gmd:CodeListValue>
-     *    </gco:Record>
-     * }
+     * {@snippet lang="xml" :
+     *   <gco:Record>Alphanumeric values: Product is alphanumeric.</gco:Record>
+     *   <gco:Record>Alphanumeric Text: Message contains alphanumeric text.</gco:Record>
+     *   <gco:Record>Part A: Reflectivity presented as a tabular listing of alphanumerics.</gco:Record>
+     *   <gco:Record>
+     *     <gmd:CodeListValue codelist="someURL#DataQualityAssessment" codeListValue="intermediate">intermediate</gmd:CodeListValue>
+     *   </gco:Record>
+     *   }
      *
      * @see <a href="https://issues.apache.org/jira/browse/SIS-419">SIS-419</a>
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
index ee1683dea4..35ad99a54a 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
@@ -63,8 +63,7 @@ import org.apache.sis.internal.metadata.RecordSchemaSIS;
  * {@link DefaultRecordSchema#createRecordType(CharSequence, Map)} method.
  * Example:
  *
- * <div class="note">
- * {@preformat java
+ * {@snippet lang="java" :
  *     DefaultRecordSchema schema = new DefaultRecordSchema(null, null, "MySchema");
  *     // The same instance can be reused for all records to create in that schema.
  *
@@ -74,8 +73,7 @@ import org.apache.sis.internal.metadata.RecordSchemaSIS;
  *     fields.put("longitude",   Double .class);
  *     fields.put("population",  Integer.class);
  *     RecordType record = schema.createRecordType("MyRecordType", fields);
- * }
- * </div>
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * This class is immutable and thus inherently thread-safe if the {@link TypeName}, the {@link RecordSchema}
@@ -294,9 +292,9 @@ public class DefaultRecordType extends RecordDefinition implements RecordType, S
      * {@linkplain DefaultRecordSchema record schema}, then the record type name shall be valid in the
      * {@linkplain DefaultNameSpace name space} of the record schema:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     NameSpace namespace = getContainer().getSchemaName().scope()
-     * }
+     *     }
      *
      * <div class="note"><b>Comparison with Java reflection:</b>
      * If we think about this {@code RecordType} as equivalent to a {@code Class} instance,
@@ -347,9 +345,9 @@ public class DefaultRecordType extends RecordDefinition implements RecordType, S
      * Returns the set of attribute names defined in this {@code RecordType}'s dictionary.
      * This method is functionally equivalent to the following code, but slightly more efficient:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     getFieldTypes().keySet();
-     * }
+     *     }
      *
      * @return the set of field names, or an empty set if none.
      */
@@ -369,14 +367,13 @@ public class DefaultRecordType extends RecordDefinition implements RecordType, S
      * Returns the type associated to the given attribute name, or {@code null} if none.
      * This method is functionally equivalent to (omitting the check for null value):
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     getFieldTypes().get(name).getTypeName();
-     * }
+     *     }
      *
-     * <div class="note"><b>Comparison with Java reflection:</b>
+     * <h4>Comparison with Java reflection</h4>
      * If we think about this {@code RecordType} as equivalent to a {@code Class} instance, then
      * this method can be though as related to the Java {@link Class#getField(String)} method.
-     * </div>
      *
      * @param  fieldName  the attribute name for which to get the associated type name.
      * @return the associated type name, or {@code null} if none.
@@ -391,14 +388,14 @@ public class DefaultRecordType extends RecordDefinition implements RecordType, S
      * Determines if the given record is compatible with this record type. This method returns {@code true}
      * if the given {@code record} argument is non-null and the following condition holds:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Set<MemberName> attributeNames = record.getAttributes().keySet();
      *     boolean isInstance = getMembers().containsAll(attributeNames);
-     * }
+     *     }
      *
-     * <div class="note"><b>Implementation note:</b>
+     * <h4>Implementation note</h4>
      * We do not require that {@code record.getRecordType() == this} in order to allow record
-     * "sub-types" to define additional fields, in a way similar to Java sub-classing.</div>
+     * "sub-types" to define additional fields, in a way similar to Java sub-classing.
      *
      * @param  record  the record to test for compatibility.
      * @return {@code true} if the given record is compatible with this {@code RecordType}.
@@ -479,12 +476,12 @@ public class DefaultRecordType extends RecordDefinition implements RecordType, S
      * A record can be anything, but usages that we have seen so far write a character sequence
      * of what seems <var>key</var>-<var>description</var> pairs. Examples:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gco:RecordType>
      *     General Meteorological Products: General products include the baseline reflectivity and velocity,
      *     and also algorithmic graphic products spectrum width, vertical integrated liquid, and VAD wind profile.
      *   </gco:RecordType>
-     * }
+     *   }
      *
      * @see <a href="https://issues.apache.org/jira/browse/SIS-419">SIS-419</a>
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
index e0a9599dab..57b68f5b2f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
@@ -75,13 +75,20 @@ import static java.util.logging.Logger.getLogger;
  *
  * <h2>Substituting a free text by a code list</h2>
  * The ISO standard allows to substitute some character strings in the <cite>"free text"</cite> domain
- * by a {@link CodeList} value.
+ * by a {@link CodeList} value. Such substitution can be done with:
  *
- * <div class="note"><b>Example:</b>
- * in the following XML fragment, the {@code <mac:type>} value is normally a {@code <gco:CharacterString>}
+ * <ul>
+ *   <li>{@link #getCodeTitle(ControlledVocabulary)} for getting the {@link InternationalString} instance
+ *       to store in a metadata property.</li>
+ *   <li>{@link #forCodeTitle(CharSequence)} for retrieving the {@link CodeList} previously stored as an
+ *       {@code InternationalString}.</li>
+ * </ul>
+ *
+ * <h2>Example</h2>
+ * In the following XML fragment, the {@code <mac:type>} value is normally a {@code <gco:CharacterString>}
  * but has been replaced by a {@code SensorType} code below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <mac:MI_Instrument>
  *     <mac:type>
  *       <gmi:MI_SensorTypeCode
@@ -89,17 +96,7 @@ import static java.util.logging.Logger.getLogger;
  *           codeListValue="RADIOMETER">Radiometer</gmi:MI_SensorTypeCode>
  *     </mac:type>
  *   </mac:MI_Instrument>
- * }
- * </div>
- *
- * Such substitution can be done with:
- *
- * <ul>
- *   <li>{@link #getCodeTitle(ControlledVocabulary)} for getting the {@link InternationalString} instance
- *       to store in a metadata property.</li>
- *   <li>{@link #forCodeTitle(CharSequence)} for retrieving the {@link CodeList} previously stored as an
- *       {@code InternationalString}.</li>
- * </ul>
+ *   }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifiedObject.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifiedObject.java
index 2ab996e908..afeff1f93b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifiedObject.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifiedObject.java
@@ -32,10 +32,10 @@ import org.opengis.metadata.citation.Citation;
  * attributes of the XML element. Those identifiers can be specified using the {@link IdentifierSpace}
  * enum values as below:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     IdentifiedObject object = ...;
  *     object.getIdentifierMap().put(IdentifierSpace.ID, "myID");
- * }
+ *     }
  *
  * <h2>Relationship with GeoAPI</h2>
  * Identifiers exist also in some (not all) GeoAPI objects. Some GeoAPI objects
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifierSpace.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifierSpace.java
index 6416194f23..7903d38e88 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifierSpace.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifierSpace.java
@@ -29,7 +29,7 @@ import org.apache.sis.internal.jaxb.NonMarshalledAuthority;
  * group are handled in a special way. For example, identifiers associated to the {@link #HREF}
  * space are marshalled in the outer property element, as in the example below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <cit:CI_Citation>
  *     <cit:series xlink:href="http://myReference">
  *       <cit:CI_Series>
@@ -37,7 +37,7 @@ import org.apache.sis.internal.jaxb.NonMarshalledAuthority;
  *       </cit:CI_Series>
  *     </cit:series>
  *   </cit:CI_Citation>
- * }
+ *   }
  *
  * The values defined in this interface can be used as keys in the map returned by
  * {@link IdentifiedObject#getIdentifierMap()}.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java
index 734550d2f6..aeb140066c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java
@@ -45,11 +45,11 @@ import static java.util.logging.Logger.getLogger;
  * {@link #acquireUnmarshaller()} methods, and can restitute the (un)marshaller to the pool
  * after usage like below:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Marshaller marshaller = pool.acquireMarshaller();
  *     marshaller.marchall(...);
  *     pool.recycle(marshaller);
- * }
+ *     }
  *
  * <h2>Configuring (un)marshallers</h2>
  * The (un)marshallers created by this class can optionally by configured with the SIS-specific
@@ -290,11 +290,11 @@ public class MarshallerPool {
      *
      * <p>This method shall be used as below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Marshaller marshaller = pool.acquireMarshaller();
      *     marshaller.marchall(...);
      *     pool.recycle(marshaller);
-     * }
+     *     }
      *
      * Note that {@link #recycle(Marshaller)} shall not be invoked in case of exception,
      * since the marshaller may be in an invalid state.
@@ -316,11 +316,11 @@ public class MarshallerPool {
      *
      * <p>This method shall be used as below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Unmarshaller unmarshaller = pool.acquireUnmarshaller();
      *     Unmarshaller.unmarchall(...);
      *     pool.recycle(unmarshaller);
-     * }
+     *     }
      *
      * Note that {@link #recycle(Unmarshaller)} shall not be invoked in case of exception,
      * since the unmarshaller may be in an invalid state.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/NilObject.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/NilObject.java
index c11933f844..96b46f2fc8 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/NilObject.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/NilObject.java
@@ -38,7 +38,7 @@ package org.apache.sis.xml;
  *   <th>Normal {@code Series} element</th>
  *   <th>Unknown {@code Series} element</th>
  * </tr><tr><td>
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <cit:CI_Citation>
  *     <cit:series>
  *       <cit:CI_Series>
@@ -46,13 +46,13 @@ package org.apache.sis.xml;
  *       </cit:CI_Series>
  *     </cit:series>
  *   </cit:CI_Citation>
- * }
+ *   }
  * </td><td>
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <cit:CI_Citation>
  *     <cit:series nilReason="unknown"/>
  *   </cit:CI_Citation>
- * }
+ *   }
  * </td></tr></table>
  *
  * If the {@code CI_Series} element was completely omitted, then {@link org.opengis.metadata.citation.Citation#getSeries()}
@@ -66,9 +66,9 @@ package org.apache.sis.xml;
  * is missing, then invoking {@link NilReason#createNilObject(Class)}. The following example
  * instantiates a {@code Citation} object which is nil because the information are missing:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Citation nil = NilReason.MISSING.createNilObject(Citation.class);
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.3
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/Pooled.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/Pooled.java
index cc112fc728..5b327690ca 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/Pooled.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/Pooled.java
@@ -520,14 +520,14 @@ abstract class Pooled {
      * Must be invoked by subclasses before a {@code try} block performing a (un)marshalling
      * operation. Must be followed by a call to {@code finish()} in a {@code finally} block.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Context context = begin();
      *     try {
      *         ...
      *     } finally {
      *         context.finish();
      *     }
-     * }
+     *     }
      *
      * @see Context#finish()
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java
index 290a365d1c..84a61c775b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java
@@ -143,7 +143,7 @@ abstract class Transformer {
      * JAXB annotations. For example, given the following XML, this list should contain {@code cit:CI_Citation},
      * {@code cit:date} and {@code cit:CI_Date} (in that order) when the (un)marshalling reaches the "…" location.
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <cit:CI_Citation>
      *     <cit:date>
      *       <cit:CI_Date>
@@ -151,7 +151,7 @@ abstract class Transformer {
      *       </cit:CI_Date>
      *     </cit:date>
      *   </cit:CI_Citation>
-     * }
+     *   }
      */
     private final List<QName> outerElements;
 
@@ -455,7 +455,7 @@ abstract class Transformer {
      * For example, given the following XML, this method returns {@code true} for {@code cit:CI_Date} but
      * {@code false} for {@code cit:date}:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <cit:CI_Citation>
      *     <cit:date>
      *       <cit:CI_Date>
@@ -463,7 +463,7 @@ abstract class Transformer {
      *       </cit:CI_Date>
      *     </cit:date>
      *   </cit:CI_Citation>
-     * }
+     *   }
      *
      * This method is based on simple heuristic applicable to OGC/ISO conventions,
      * and may change in any future SIS version depending on new formats to support.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/ValueConverter.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/ValueConverter.java
index 895f00fb99..e793b6b8cc 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/ValueConverter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/ValueConverter.java
@@ -44,9 +44,9 @@ import org.apache.sis.util.Locales;
  * document to fail. An application may want to change this behavior by replacing URLs that
  * are known to be erroneous by fixed versions of those URLs. Example:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     class URLFixer extends ValueConverter {
- *         &#64;Override
+ *         @Override
  *         public URL toURL(MarshalContext context, URI uri) throws MalformedURLException {
  *             try {
  *                 return super.toURL(context, uri);
@@ -59,7 +59,7 @@ import org.apache.sis.util.Locales;
  *             }
  *         }
  *     }
- * }
+ *     }
  *
  * See the {@link XML#CONVERTER} javadoc for an example of registering a custom
  * {@code ValueConverter} to a (un)marshaller.
@@ -369,9 +369,9 @@ public class ValueConverter {
      * is as below, omitting the check for null value and the call to {@link #exceptionOccured
      * exceptionOccured(…)} in case of error:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return UUID.fromString(value);
-     * }
+     *     }
      *
      * @param  context  context (GML version, locale, <i>etc.</i>) of the (un)marshalling process.
      * @param  value    the string to convert to a UUID, or {@code null}.
@@ -398,9 +398,9 @@ public class ValueConverter {
      * (omitting the check for null value and the call to {@link #exceptionOccured
      * exceptionOccured(…)} in case of error):
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return new URI(value);
-     * }
+     *     }
      *
      * @param  context  context (GML version, locale, <i>etc.</i>) of the (un)marshalling process.
      * @param  value    the string to convert to a URI, or {@code null}.
@@ -427,9 +427,9 @@ public class ValueConverter {
      * the check for null value and the call to {@link #exceptionOccured exceptionOccured(…)}
      * in case of error:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return value.toURI();
-     * }
+     *     }
      *
      * @param  context  context (GML version, locale, <i>etc.</i>) of the (un)marshalling process.
      * @param  value    the URL to convert to a URI, or {@code null}.
@@ -455,9 +455,9 @@ public class ValueConverter {
      * the check for null value and the call to {@link #exceptionOccured exceptionOccured(…)}
      * in case of error:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return value.toURL();
-     * }
+     *     }
      *
      * @param  context  context (GML version, locale, <i>etc.</i>) of the (un)marshalling process.
      * @param  value    the URI to convert to a URL, or {@code null}.
@@ -483,9 +483,9 @@ public class ValueConverter {
      * omitting the check for null value and the call to {@link #exceptionOccured exceptionOccured(…)}
      * in case of error:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return NilReason.valueOf(value);
-     * }
+     *     }
      *
      * @param  context  context (GML version, locale, <i>etc.</i>) of the (un)marshalling process.
      * @param  value    the string to convert to a nil reason, or {@code null}.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
index 85334b19a5..6821b279b6 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
@@ -265,12 +265,12 @@ public final class XML extends Static {
      * database. Users can define their search algorithm by subclassing {@link ReferenceResolver} and configuring
      * a unmarshaller as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     ReferenceResolver  myResolver = ...;
      *     Map<String,Object> properties = new HashMap<>();
      *     properties.put(XML.RESOLVER, myResolver);
      *     Object obj = XML.unmarshal(source, properties);
-     * }
+     *     }
      *
      * @see Unmarshaller#setProperty(String, Object)
      * @see ReferenceResolver
@@ -289,17 +289,17 @@ public final class XML extends Static {
      * for replacing an erroneous URL by a fixed URL. See the {@link ValueConverter} javadoc for
      * more details.</p>
      *
-     * <div class="note"><b>Example:</b>
-     * the following example collects the failures in a list without stopping the (un)marshalling process.
+     * <h4>Example</h4>
+     * The following example collects the failures in a list without stopping the (un)marshalling process.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     class WarningCollector extends ValueConverter {
      *         // The warnings collected during (un)marshalling.
      *         List<String> messages = new ArrayList<String>();
      *
      *         // Override the default implementation in order to
      *         // collect the warnings and allow the process to continue.
-     *         &#64;Override
+     *         @Override
      *         protected <T> boolean exceptionOccured(MarshalContext context,
      *                 T value, Class<T> sourceType, Class<T> targetType, Exception e)
      *         {
@@ -319,7 +319,6 @@ public final class XML extends Static {
      *         // Report here the warnings to the user.
      *     }
      * }
-     * </div>
      *
      * @see Unmarshaller#setProperty(String, Object)
      * @see ValueConverter
@@ -340,7 +339,7 @@ public final class XML extends Static {
      * <div class="note"><b>Example:</b>
      * INSPIRE compliant language code shall be formatted like below (details may vary):
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gmd:language>
      *     <gmd:LanguageCode
      *         codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#LanguageCode"
@@ -351,7 +350,7 @@ public final class XML extends Static {
      * However if this property contains the "{@code language}" value, then the marshaller will format
      * the language code like below (which is legal according OGC schemas, but is not INSPIRE compliant):
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <lan:language>
      *     <gco:CharacterString>fra</gco:CharacterString>
      *   </lan:language>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/package-info.java
index 4d5fce35b6..b667651652 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/package-info.java
@@ -24,13 +24,13 @@
  * property keys that can be used for configuring (un)marshallers and convenience static methods.
  * For example, the following code:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     XML.marshal(Citations.OGC, System.out);
- * }
+ *     }
  *
  * will produce a string like below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
  *   <cit:CI_Citation xmlns:gmd="http://www.isotc211.org/2005/gmd"
  *                    xmlns:gco="http://www.isotc211.org/2005/gco">
@@ -39,7 +39,7 @@
  *     </cit:title>
  *     ... much more XML below this point ...
  *   </cit:CI_Citation>
- * }
+ *   }
  *
  * <h2>Customizing the XML</h2>
  * In order to parse and format ISO 19115-3 compliant documents, SIS needs its own
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
index d3d675caef..b20ea7e251 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
@@ -39,9 +39,9 @@ public final strictfp class MeasureTest extends TestCase {
      * The URL used in {@code uom} attribute of XML elements which contains a measurements.
      * Example:
      *
-     * {@preformat xml
-     *     <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
-     * }
+     * {@snippet lang="xml" :
+     *   <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
+     *   }
      */
     public static final String UOM_URL = CodeListUID.METADATA_ROOT_LEGACY + CodeListUID.UOM_PATH;
 
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
index cb14efb036..255046b793 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
@@ -109,13 +109,13 @@ public final strictfp class LanguageCodeTest extends TestCase {
      * Returns the XML of a metadata element. This method returns a string like below,
      * where the {@code ${languageCode}} string is replaced by the given argument.
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gmd:MD_Metadata>
      *     <gmd:language>
      *       ${languageCode}
      *     </gmd:language>
      *   </gmd:MD_Metadata>
-     * }
+     *   }
      *
      * @param  languageCode  the XML fragment to write inside the {@code <gmd:language>} element.
      */
@@ -150,13 +150,13 @@ public final strictfp class LanguageCodeTest extends TestCase {
     /**
      * Tests the unmarshalling using the {@code <gmd:LanguageCode>} construct. XML fragment:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gmd:MD_Metadata>
      *     <gmd:language>
      *       <gmd:LanguageCode codeList="(snip)/gmxCodelists.xml#LanguageCode" codeListValue="jpn">Japanese</gmd:LanguageCode>
      *     </gmd:language>
      *   </gmd:MD_Metadata>
-     * }
+     *   }
      *
      * @throws JAXBException if an error occurs while unmarshalling the language.
      *
@@ -174,13 +174,13 @@ public final strictfp class LanguageCodeTest extends TestCase {
      * Tests the unmarshalling using the {@code <gmd:LanguageCode>} construct without attributes.
      * The adapter is expected to parse the element value. XML fragment:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gmd:MD_Metadata>
      *     <gmd:language>
      *       <gmd:LanguageCode>jpn</gmd:LanguageCode>
      *     </gmd:language>
      *   </gmd:MD_Metadata>
-     * }
+     *   }
      *
      * @throws JAXBException if an error occurs while unmarshalling the language.
      */
@@ -217,13 +217,13 @@ public final strictfp class LanguageCodeTest extends TestCase {
      * Tests the unmarshalling of an XML using the {@code gco:CharacterString} construct.
      * XML fragment:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gmd:MD_Metadata>
      *     <gmd:language>
      *       <gco:CharacterString>jpn</gco:CharacterString>
      *     </gmd:language>
      *   </gmd:MD_Metadata>
-     * }
+     *   }
      *
      * @throws JAXBException if an error occurs while unmarshalling the language.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
index 70f16a3605..298be20fa6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
@@ -107,13 +107,13 @@ public final strictfp class DefaultResolutionTest extends TestCase {
      * Tests XML (un)marshalling of a resolution element. This test creates a {@link DefaultResolution}
      * instance which is expected to be marshalled as below (ignoring namespace declarations):
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <mri:MD_Resolution>
      *     <mri:distance>
      *       <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
      *     </mri:distance>
      *   </mri:MD_Resolution>
-     * }
+     *   }
      *
      * @throws JAXBException if an error occurred while marshalling the element.
      */
@@ -138,13 +138,13 @@ public final strictfp class DefaultResolutionTest extends TestCase {
      * This test creates a {@link DefaultResolution} instance which is expected to be marshalled as below
      * (ignoring namespace declarations):
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gmd:MD_Resolution>
      *     <gmd:distance>
      *       <gco:Distance uom="http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])">1000.0</gco:Distance>
      *     </gmd:distance>
      *   </gmd:MD_Resolution>
-     * }
+     *   }
      *
      * @throws JAXBException if an error occurred while marshalling the element.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
index 05b10aaf34..c277347315 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
@@ -139,7 +139,7 @@ public abstract strictfp class AnnotationConsistencyCheck extends TestCase {
      * directly inside its parent as we usually do in XML. Instead, we have a {@code <CI_Contact>}.
      * inside the {@code <contactInfo>} element as below:</p>
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <CI_ResponsibleParty>
      *     <contactInfo>
      *       <CI_Contact>
@@ -147,7 +147,7 @@ public abstract strictfp class AnnotationConsistencyCheck extends TestCase {
      *       </CI_Contact>
      *     </contactInfo>
      *   </CI_ResponsibleParty>
-     * }
+     *   }
      *
      * To reflect that fact, this method shall return the internal {@code CI_Contact}
      * wrapper class for the {@link org.apache.sis.metadata.iso.citation.DefaultCitation} argument.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
index acacde4878..3f7cdf84cd 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
@@ -41,14 +41,14 @@ public final strictfp class ReferenceResolverMock extends ReferenceResolver {
      * Creates a new SIS context using a {@code ReferenceResolverMock}.
      * Callers shall use this method in a {@code try} … {@code finally} block as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     final Context context = ReferenceResolverMock.begin(true);
      *     try {
      *         // So some test
      *     } finally {
      *         context.finish();
      *     }
-     * }
+     *     }
      *
      * Alternatively, the {@code finally} block can be replaced by a call to {@code context.finish()} in a method
      * annotated by {@link org.junit.After}. This is done automatically by {@link org.apache.sis.test.xml.TestCase}.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java
index ad6ca6bf1e..468ab17857 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java
@@ -62,7 +62,7 @@ import org.apache.sis.internal.xml.LegacyNamespaces;
  *
  * For generating a new file:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     public static void main(String[] args) throws Exception {
  *         RenameListGenerator gen = new RenameListGenerator(Paths.get("/home/user/project/build/classes"));
  *         gen.add(Paths.get("org/apache/sis/metadata/iso"));
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
index 14214bc58d..db367ee153 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
@@ -97,7 +97,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
      * The element of interest for this test is the {@code "uuid"} attribute value
      * in the {@code <cit:CI_Series>} element of the following XML fragment:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <cit:CI_Citation>
      *     <cit:title>
      *       <gco:CharacterString>My data</gco:CharacterString>
@@ -110,7 +110,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
      *       </cit:CI_Series>
      *     </cit:series>
      *   </cit:CI_Citation>
-     * }
+     *   }
      *
      * On an implementation note, the {@code uuid} and other attributes of the {@code <cit:CI_Series>}
      * elements are handled by {@link org.apache.sis.internal.jaxb.gco.PropertyType}.
@@ -148,7 +148,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
      * <p>The element of interest for this test is the {@code "uuidref"} part
      * in the {@code <cit:series>} property of the following XML fragment:</p>
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <cit:CI_Citation>
      *     <cit:title>
      *       <gco:CharacterString>My data</gco:CharacterString>
@@ -161,7 +161,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
      *       </cit:CI_Series>
      *     </cit:series>
      *   </cit:CI_Citation>
-     * }
+     *   }
      *
      * On an implementation note, the {@code uuidref}, {@code xlink:href} and other attributes of the
      * {@code <cit:series>} element are handled by {@link org.apache.sis.internal.jaxb.gco.PropertyType}.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
index 4faf343014..53b1acdda4 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
@@ -87,11 +87,11 @@ public final strictfp class XLinkMarshallingTest extends TestCase {
      * Tests (un)marshalling of an object with a {@code xlink:href} attribute without element definition.
      * The XML fragment is:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <mdb:MD_Metadata>
      *     <mdb:identificationInfo xlink:href="http://test.net"/>
      *   </mdb:MD_Metadata>
-     * }
+     *   }
      *
      * @throws JAXBException if an error occurred during (un)marshalling.
      * @throws URISyntaxException if the URI used in this test is malformed.
@@ -113,7 +113,7 @@ public final strictfp class XLinkMarshallingTest extends TestCase {
      * Tests (un)marshalling of an object with a {@code xlink:href} attribute with an element definition.
      * The XML fragment is:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <mdb:MD_Metadata>
      *     <mdb:identificationInfo xlink:href="http://test.net">
      *       <mdb:MD_DataIdentification>
@@ -123,7 +123,7 @@ public final strictfp class XLinkMarshallingTest extends TestCase {
      *       </mdb:MD_DataIdentification>
      *     </mdb:identificationInfo>
      *   </mdb:MD_Metadata>
-     * }
+     *   }
      *
      * @throws JAXBException if an error occurred during (un)marshalling.
      * @throws URISyntaxException if the URI used in this test is malformed.
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasFollower.java b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasFollower.java
index 632eaf5500..6727290c6e 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasFollower.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasFollower.java
@@ -165,12 +165,12 @@ public class CanvasFollower implements PropertyChangeListener, Disposable {
      * but not necessarily immediately after (it is okay to defer until first needed).
      * The default implementation registers the following listeners:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     source.addPropertyChangeListener(PlanarCanvas.OBJECTIVE_CRS_PROPERTY, this);
      *     target.addPropertyChangeListener(PlanarCanvas.OBJECTIVE_CRS_PROPERTY, this);
      *     source.addPropertyChangeListener(PlanarCanvas.OBJECTIVE_TO_DISPLAY_PROPERTY, this);
      *     target.addPropertyChangeListener(PlanarCanvas.OBJECTIVE_TO_DISPLAY_PROPERTY, this);
-     * }
+     *     }
      *
      * This method is idempotent (it is okay to invoke it twice).
      *
diff --git a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
index d7752b976d..b889c9d637 100644
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
@@ -165,9 +165,9 @@ abstract class AbstractLocationType implements LocationType, LenientComparable {
      * and {@link #getReferenceSystem()}, for avoiding never-ending loops.
      *
      * <p>This method is implemented as below:</p>
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return equals(object, ComparisonMode.STRICT);
-     * }
+     *     }
      *
      * @param  object  the object to compare to {@code this}.
      * @return {@code true} if both objects are equal.
diff --git a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
index 1f0575558f..a1f4effa7a 100644
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
@@ -113,12 +113,12 @@ import org.opengis.referencing.gazetteer.LocationType;
  * <div class="note"><b>Example:</b>
  * the following code:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     MilitaryGridReferenceSystem system = new MilitaryGridReferenceSystem();
  *     MilitaryGridReferenceSystem.Coder coder = system.createCoder();
  *     Location loc = coder.decode("32TNL83");
  *     System.out.println(loc);
- * }
+ *     }
  *
  * should display (locale may vary):
  *
@@ -193,20 +193,20 @@ public class MilitaryGridReferenceSystem extends ReferencingByIdentifiers {
      * The first of the two letters ({@code 'I'} and {@code 'O'}) excluded in MGRS notation.
      * This letter and all following letters shall be shifted by one character. Example:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     char band = ...;
      *     if (band >= EXCLUDE_I) {
      *         band++;
      *         if (band >= EXCLUDE_O) band++;
      *     }
-     * }
+     *     }
      *
      * or equivalently:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     char band = ...;
      *     if (band >= EXCLUDE_I && ++band >= EXCLUDE_O) band++;
-     * }
+     *     }
      */
     private static final char EXCLUDE_I = 'I';
 
@@ -1823,16 +1823,16 @@ public class MilitaryGridReferenceSystem extends ReferencingByIdentifiers {
          *     coordinates in the latitude band, as a multiple of the number of metres in a full cycle of
          *     {@value #GRID_ROW_COUNT} rows. That northing value can be computed in metre as below:
          *
-         *     {@preformat java
+         *     {@snippet lang="java" :
          *         double northing = (ROW_RESOLVER[i] & NORTHING_BITS_MASK) * (GRID_SQUARE_SIZE * GRID_ROW_COUNT);
-         *     }
+         *         }
          *   </li><li>
          *     Given a row number <var>row</var> in the [0 … 19] range, the following expression tells
          *     if that row can be inside the latitude band:
          *
-         *     {@preformat java
+         *     {@snippet lang="java" :
          *         boolean isValidRow = (ROW_RESOLVER[i] & (1 << (row + NORTHING_BITS_COUNT))) != 0;
-         *     }
+         *         }
          *
          *     Note that the same row may be valid in two consecutive latitude bands.
          *     The trailing {@code _0000} parts make room for {@value #NORTHING_BITS_COUNT} bits.
diff --git a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
index 4b06d9a226..65653a492f 100644
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
@@ -44,29 +44,29 @@ import org.opengis.referencing.gazetteer.ReferenceSystemUsingIdentifiers;
  * Instead, unmodifiable {@linkplain #snapshot snapshots} should be published.
  * The same {@code ModifiableLocationType} instance can be used for many snapshots.
  *
- * <div class="note"><b>Example:</b>
+ * <h2>Example</h2>
  * the following code creates 3 levels of location types: <var>administrative areas</var>, which contain
  * <var>towns</var>, which themselves contain <var>streets</var>. Note that the {@code street} location
  * type has two parents, {@code town} and {@code area}, because a street can be outside any town and
  * directly under the authority of an administrative area instead.
  *
- * {@preformat java
- *   ModifiableLocationType area   = new ModifiableLocationType("administrative area");
- *   ModifiableLocationType town   = new ModifiableLocationType("town");
- *   ModifiableLocationType street = new ModifiableLocationType("street");
+ * {@snippet lang="java" :
+ *     ModifiableLocationType area   = new ModifiableLocationType("administrative area");
+ *     ModifiableLocationType town   = new ModifiableLocationType("town");
+ *     ModifiableLocationType street = new ModifiableLocationType("street");
  *
- *   area  .setTheme("local administration");
- *   town  .setTheme("built environment");
- *   street.setTheme("access");
+ *     area  .setTheme("local administration");
+ *     town  .setTheme("built environment");
+ *     street.setTheme("access");
  *
- *   area  .setDefinition("area of responsibility of highest level local authority");
- *   town  .setDefinition("city or town");
- *   street.setDefinition("thoroughfare providing access to properties");
+ *     area  .setDefinition("area of responsibility of highest level local authority");
+ *     town  .setDefinition("city or town");
+ *     street.setDefinition("thoroughfare providing access to properties");
  *
- *   town  .addParent(area);
- *   street.addParent(area);
- *   street.addParent(town);
- * }
+ *     town  .addParent(area);
+ *     street.addParent(area);
+ *     street.addParent(town);
+ *     }
  *
  * A string representation of the {@code area} location type is as below:
  *
@@ -76,7 +76,6 @@ import org.opengis.referencing.gazetteer.ReferenceSystemUsingIdentifiers;
  *     │   └─street……………………………… thoroughfare providing access to properties
  *     └─street………………………………………… thoroughfare providing access to properties
  * }
- * </div>
  *
  * <h2>Inheritance of property values</h2>
  * According ISO 19112:2003, all properties except the collection of
@@ -95,9 +94,9 @@ import org.opengis.referencing.gazetteer.ReferenceSystemUsingIdentifiers;
  * reasonably presumed to be in the same territory of use. That territory can be specified only once
  * as below:
  *
- * {@preformat java
- *   area.setTerritoryOfUse("Japan");
- * }
+ * {@snippet lang="java" :
+ *     area.setTerritoryOfUse("Japan");
+ *     }
  *
  * Then, the towns and streets automatically inherit the same value for that property,
  * unless they are explicitly given another value.</div>
diff --git a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
index 45477c973e..59a2b71b61 100644
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
@@ -320,10 +320,10 @@ public abstract class ReferencingByIdentifiers extends AbstractReferenceSystem i
          * A combined method which sets the encoder precision to the given value, then formats the given position.
          * The default implementation is equivalent to the following code:
          *
-         * {@preformat java
+         * {@snippet lang="java" :
          *     setPrecision(precision, position);
          *     return encode(position);
-         * }
+         *     }
          *
          * Subclasses should override with more efficient implementation,
          * for example by transforming the given position only once.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
index 105e5686bd..5506c8606f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
@@ -238,9 +238,9 @@ public abstract class AbstractDirectPosition extends FormattableObject implement
      * The format is like below, where {@code x₀}, {@code x₁}, {@code x₂}, <i>etc.</i>
      * are the coordinate values at index 0, 1, 2, <i>etc.</i>:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   POINT[x₀ x₁ x₂ …]
-     * }
+     *   }
      *
      * If the coordinate reference system is geodetic or projected, then coordinate values are formatted
      * with a precision equivalent to one centimetre on Earth (the actual number of fraction digits is
@@ -265,9 +265,9 @@ public abstract class AbstractDirectPosition extends FormattableObject implement
      * The returned string is like below, where {@code x₀}, {@code x₁}, {@code x₂}, <i>etc.</i>
      * are the coordinate values at index 0, 1, 2, <i>etc.</i>:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   POINT(x₀ x₁ x₂ …)
-     * }
+     *   }
      *
      * This method formats the numbers as with {@link Double#toString(double)} (i.e. without fixed number of fraction digits).
      * The string returned by this method can be {@linkplain GeneralDirectPosition#GeneralDirectPosition(CharSequence) parsed}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
index db823c6fad..e78dfa66f3 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
@@ -268,11 +268,11 @@ public abstract class AbstractEnvelope extends FormattableObject implements Enve
      * For example in the following code, {@code NaN} values were implicitly checked by
      * the {@code (a < b)} comparison:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     if (a < b && isNegativeUnsafe(a)) {
      *         // ... do some stuff
      *     }
-     * }
+     *     }
      */
     static boolean isNegativeUnsafe(final double value) {
         return (Double.doubleToRawLongBits(value) & SIGN_BIT_MASK) != 0;
@@ -427,9 +427,9 @@ public abstract class AbstractEnvelope extends FormattableObject implements Enve
      * Returns the median coordinate along the specified dimension.
      * In most cases, the result is equal (minus rounding error) to:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     median = (getUpper(dimension) + getLower(dimension)) / 2;
-     * }
+     *     }
      *
      * <h4>Crossing the anti-meridian of a Geographic CRS</h4>
      * If <var>upper</var> &lt; <var>lower</var> and the
@@ -480,9 +480,9 @@ public abstract class AbstractEnvelope extends FormattableObject implements Enve
      * Returns the envelope span (typically width or height) along the specified dimension.
      * In most cases, the result is equal (minus rounding error) to:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     span = getUpper(dimension) - getLower(dimension);
-     * }
+     *     }
      *
      * <h4>Crossing the anti-meridian of a Geographic CRS</h4>
      * If <var>upper</var> &lt; <var>lower</var> and the
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
index d27ed75799..bb83bde6a1 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
@@ -212,9 +212,9 @@ class ArrayEnvelope extends AbstractEnvelope implements Serializable {
      * {@code BOX} or <cite>Well Known Text</cite> (WKT) format. The given string is typically
      * a {@code BOX} element like below:
      *
-     * {@preformat wkt
-     *     BOX(-180 -90, 180 90)
-     * }
+     * {@snippet lang="wkt" :
+     *   BOX(-180 -90, 180 90)
+     *   }
      *
      * However, this constructor is lenient to other geometry types like {@code POLYGON}.
      * See the javadoc of the {@link GeneralEnvelope#GeneralEnvelope(CharSequence) GeneralEnvelope}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
index ff20de3640..2209d4314c 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
@@ -91,9 +91,9 @@ public class DirectPosition1D extends AbstractDirectPosition implements Serializ
      * <cite>Well Known Text</cite> (WKT) format. The given string is typically a {@code POINT}
      * element like below:
      *
-     * {@preformat wkt
-     *     POINT(6)
-     * }
+     * {@snippet lang="wkt" :
+     *   POINT(6)
+     *   }
      *
      * @param  wkt  the {@code POINT} or other kind of element to parse.
      * @throws IllegalArgumentException if the given string cannot be parsed.
@@ -212,9 +212,9 @@ public class DirectPosition1D extends AbstractDirectPosition implements Serializ
      * Formats this position in the <cite>Well Known Text</cite> (WKT) format.
      * The output is like below:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   POINT(coordinate)
-     * }
+     *   }
      *
      * The string returned by this method can be {@linkplain #DirectPosition1D(CharSequence) parsed}
      * by the {@code DirectPosition1D} constructor.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
index 62cd3e0c1f..b0e0d878e1 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
@@ -161,9 +161,9 @@ public class DirectPosition2D extends Point2D.Double implements DirectPosition,
      * <cite>Well Known Text</cite> (WKT) format. The given string is typically a {@code POINT}
      * element like below:
      *
-     * {@preformat wkt
-     *     POINT(6 10)
-     * }
+     * {@snippet lang="wkt" :
+     *   POINT(6 10)
+     *   }
      *
      * @param  wkt  the {@code POINT} or other kind of element to parse.
      * @throws IllegalArgumentException if the given string cannot be parsed.
@@ -295,9 +295,9 @@ public class DirectPosition2D extends Point2D.Double implements DirectPosition,
      * Formats this position in the <cite>Well Known Text</cite> (WKT) format.
      * The output is like below:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   POINT(x y)
-     * }
+     *   }
      *
      * The string returned by this method can be {@linkplain #DirectPosition2D(CharSequence) parsed}
      * by the {@code DirectPosition2D} constructor.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
index e9d8a34c6e..f571739e69 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
@@ -1182,9 +1182,9 @@ public class Envelope2D extends Rectangle2D.Double implements Envelope, Emptiabl
      * lower corner}{@code ,}{@linkplain #getUpperCorner() upper corner}{@code )}".
      * Example:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   BOX(-90 -180, 90 180)
-     * }
+     *   }
      *
      * @see Envelopes#toString(Envelope)
      */
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
index ff84a23f51..5b8900896e 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
@@ -144,9 +144,9 @@ public class GeneralDirectPosition extends AbstractDirectPosition implements Ser
      * from the given string in <cite>Well Known Text</cite> (WKT) format.
      * The given string is typically a {@code POINT} element like below:
      *
-     * {@preformat wkt
-     *     POINT(6 10)
-     * }
+     * {@snippet lang="wkt" :
+     *   POINT(6 10)
+     *   }
      *
      * However, this constructor is lenient to other types like {@code POINT ZM}.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
index 23f3b3af19..428399538f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
@@ -227,9 +227,9 @@ public class GeneralEnvelope extends ArrayEnvelope implements Cloneable, Seriali
      * {@code BOX} or <cite>Well Known Text</cite> (WKT) format. The given string is typically
      * a {@code BOX} element like below:
      *
-     * {@preformat wkt
-     *     BOX(-180 -90, 180 90)
-     * }
+     * {@snippet lang="wkt" :
+     *   BOX(-180 -90, 180 90)
+     *   }
      *
      * However, this constructor is lenient to other geometry types like {@code POLYGON}.
      * Actually this constructor ignores the geometry type and just applies the following
@@ -984,11 +984,11 @@ public class GeneralEnvelope extends ArrayEnvelope implements Cloneable, Seriali
      * as a result of this method call. If such effect is undesirable, then this method may be
      * combined with {@link #simplify()} as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     if (envelope.normalize()) {
      *         envelope.simplify();
      *     }
-     * }
+     *     }
      *
      * <h4>Choosing the range of longitude values</h4>
      * Geographic CRS typically have longitude values in the [-180 … +180]° range, but the [0 … 360]°
@@ -1244,15 +1244,15 @@ public class GeneralEnvelope extends ArrayEnvelope implements Cloneable, Seriali
      * For example, in order to expand only the horizontal component of a four dimensional
      * (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>) envelope, one can use:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     envelope.subEnvelope(0, 2).add(myPosition2D);
-     * }
+     *     }
      *
      * If the sub-envelope needs to be independent from the original envelope, use the following idiom:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     GeneralEnvelope copy = envelope.subEnvelope(0, 2).clone();
-     * }
+     *     }
      *
      * The sub-envelope is initialized with a {@code null} {@linkplain #getCoordinateReferenceSystem() CRS}.
      * This method does not compute a sub-CRS because it may not be needed, or the sub-CRS may be already
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
index 13472deebe..c304b8062b 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
@@ -138,9 +138,9 @@ public final class ImmutableEnvelope extends ArrayEnvelope implements Serializab
      * {@code BOX} or <cite>Well Known Text</cite> (WKT) format. The given string is typically
      * a {@code BOX} element like below:
      *
-     * {@preformat wkt
-     *     BOX(-180 -90, 180 90)
-     * }
+     * {@snippet lang="wkt" :
+     *   BOX(-180 -90, 180 90)
+     *   }
      *
      * However, this constructor is lenient to other geometry types like {@code POLYGON}.
      * See the javadoc of the {@link GeneralEnvelope#GeneralEnvelope(CharSequence) GeneralEnvelope}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundMethod.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundMethod.java
index 2e562562d1..b6f4a42b6e 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundMethod.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundMethod.java
@@ -65,9 +65,9 @@ public enum WraparoundMethod {
      * given the {@code BBOX(+170 0, -170 1)} envelope, a polygon created from the 4 corners
      * and ignoring the fact that the envelope crosses the anti-meridian may be as below:</p>
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   POLYGON(+170 0, -170 0, -170 1, +170 1, +170 0)
-     * }
+     *   }
      */
     NONE,
 
@@ -100,9 +100,9 @@ public enum WraparoundMethod {
      * given the {@code BBOX(+170 0, -170 1)} envelope,
      * a polygon created after shifting the "upper" corner (-170 1) may be as below:</p>
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   POLYGON(+170 0, +190 0, +190 1, +170 1, +170 0)
-     * }
+     *   }
      */
     CONTIGUOUS_UPPER,
 
@@ -117,9 +117,9 @@ public enum WraparoundMethod {
      * given the {@code BBOX(+170 0, -170 1)} envelope,
      * a polygon created after shifting the "lower" corner (+170 0) may be as below:</p>
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   POLYGON(-190 0, -170 0, -170 1, -190 1, -190 0)
-     * }
+     *   }
      */
     CONTIGUOUS_LOWER,
 
@@ -142,9 +142,9 @@ public enum WraparoundMethod {
      * given the {@code BBOX(+170 0, -170 1)} envelope,
      * a polygon created after expanding the envelope may be as below:</p>
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   POLYGON(-180 0, +180 0, +180 1, -180 1, -180 0)
-     * }
+     *   }
      *
      * @see GeneralEnvelope#simplify()
      */
@@ -161,11 +161,11 @@ public enum WraparoundMethod {
      * given the {@code BBOX(+170 0, -170 1)} envelope,
      * polygons created after splitting the envelope may be as below:</p>
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   MULTI-POLYGON(
      *       (-180 0,  -170 0,  -170 1,  -180 1,  -180 0)
      *       (+170 0,  +180 0,  +180 1,  +170 1,  +170 0))
-     * }
+     *   }
      *
      * @see GeneralEnvelope#toSimpleEnvelopes()
      */
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
index d8bf8139f2..5948c9c1db 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
@@ -32,21 +32,21 @@ import org.opengis.metadata.Identifier;
  * <h2>Marshalling</h2>
  * Identifiers are typically marshalled as below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gml:identifier codeSpace="EPSG">4326</gml:identifier>
  * }
  *
  * If the {@code Identifier} to marshal contains a {@linkplain Identifier#getVersion() version},
  * then this adapter concatenates the version to the codespace in a "URI-like" way like below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gml:identifier codeSpace="EPSG:8.3">4326</gml:identifier>
  * }
  *
  * <h2>Unmarshalling</h2>
  * Some data producers put a URN instead of a simple code value, as in the example below:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gml:identifier codeSpace="IOGP">urn:ogc:def:crs:EPSG::4326</gml:identifier>
  * }
  *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java
index b428fdba79..97f135cb4b 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java
@@ -43,7 +43,7 @@ public final class SecondDefiningParameter {
      * Nested parameter, for JAXB purpose.
      * This is used for marshalling XML like below:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:secondDefiningParameter>
      *     <gml:SecondDefiningParameter>
      *       <gml:semiMinorAxis uom="urn:ogc:def:uom:EPSG::9001">6371007</gml:semiMinorAxis>
@@ -58,7 +58,7 @@ public final class SecondDefiningParameter {
      * Whether the ellipsoid is a sphere, or {@code null} if unspecified.
      * If this value is {@code true}, then the XML shall be marshalled like below:
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:secondDefiningParameter>
      *     <gml:SecondDefiningParameter>
      *       <gml:isSphere>true</gml:isSphere>
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ExtentSelector.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ExtentSelector.java
index 19191f1ded..d52ae917e1 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ExtentSelector.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ExtentSelector.java
@@ -69,13 +69,13 @@ import org.apache.sis.util.resources.Errors;
  * <h2>Usage</h2>
  * Example:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     ExtentSelector<Foo> selector = new ExtentSelector<>(areaOfInterest);
  *     for (Foo candidate : candidates) {
  *         selector.evaluate(candidate.extent, candidate),
  *     }
  *     Foo best = selector.best();
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java
index e7472718cb..9da359e2af 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java
@@ -254,9 +254,9 @@ public final class Formulas extends Static {
      * broken when x=0 and |y| ≤ 1.4914711209038602E-154 or conversely. This method does not check for such cases;
      * it is caller responsibility to add this check is necessary, for example as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     double D = max(fastHypot(x, y), max(abs(x), abs(y)));
-     * }
+     *     }
      *
      * According JMH, above check is 1.65 time slower than {@code fastHypot} without checks.
      * We define this {@code fastHypot(…)} method for tracing where {@code sqrt(x² + y²)} is used,
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/GeodeticObjectBuilder.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/GeodeticObjectBuilder.java
index f851379ffb..e8d8cd9ff7 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/GeodeticObjectBuilder.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/GeodeticObjectBuilder.java
@@ -302,9 +302,9 @@ public class GeodeticObjectBuilder extends Builder<GeodeticObjectBuilder> {
      * is a parameter value of the old projection and {@code target} is the group of parameters where to set
      * the values for new projection. If {@code mapper} is null, then the default implementation is as below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     target.getOrCreate(source.getDescriptor()).setValue(source.getValue());
-     * }
+     *     }
      *
      * @param  newMethod  name of the new operation method, or {@code null} if no change.
      * @param  mapper     mapper from old parameters to new parameters, or {@code null} for verbatim copy.
@@ -441,25 +441,24 @@ public class GeodeticObjectBuilder extends Builder<GeodeticObjectBuilder> {
     /**
      * Creates a projected CRS using a conversion built from the values given by the {@code setParameter(…)} calls.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * The following example creates a projected CRS for the <cite>"NTF (Paris) / Lambert zone II"</cite> projection,
      * from a base CRS which is presumed to already exists in this example.
      *
-     * {@preformat java
-     *   GeodeticObjectBuilder builder = new GeodeticObjectBuilder();
-     *   GeographicCRS baseCRS = ...;
-     *   CartesianCS derivedCS = ...;
-     *   ProjectedCRS crs = builder
-     *           .setConversionMethod("Lambert Conic Conformal (1SP)")
-     *           .setConversionName("Lambert zone II")
-     *           .setParameter("Latitude of natural origin",             52, Units.GRAD)
-     *           .setParameter("Scale factor at natural origin", 0.99987742, Units.UNITY)
-     *           .setParameter("False easting",                      600000, Units.METRE)
-     *           .setParameter("False northing",                    2200000, Units.METRE)
-     *           .addName("NTF (Paris) / Lambert zone II")
-     *           .createProjectedCRS(baseCRS, derivedCS);
-     * }
-     * </div>
+     * {@snippet lang="java" :
+     *     var builder = new GeodeticObjectBuilder();
+     *     GeographicCRS baseCRS = ...;
+     *     CartesianCS derivedCS = ...;
+     *     ProjectedCRS crs = builder
+     *             .setConversionMethod("Lambert Conic Conformal (1SP)")
+     *             .setConversionName("Lambert zone II")
+     *             .setParameter("Latitude of natural origin",             52, Units.GRAD)
+     *             .setParameter("Scale factor at natural origin", 0.99987742, Units.UNITY)
+     *             .setParameter("False easting",                      600000, Units.METRE)
+     *             .setParameter("False northing",                    2200000, Units.METRE)
+     *             .addName("NTF (Paris) / Lambert zone II")
+     *             .createProjectedCRS(baseCRS, derivedCS);
+     *     }
      *
      * @param  baseCRS    coordinate reference system to base the derived CRS on.
      * @param  derivedCS  the coordinate system for the derived CRS, or {@code null} for the default.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Legacy.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Legacy.java
index 914dccf316..b534bd65c6 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Legacy.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Legacy.java
@@ -48,9 +48,9 @@ public final class Legacy {
      * A three-dimensional Cartesian CS with the legacy set of geocentric axes.
      * OGC 01-009 defines the default geocentric axes as:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   AXIS[“X”,OTHER], AXIS[“Y”,EAST], AXIS[“Z”,NORTH]
-     * }
+     *   }
      *
      * where the {@code OTHER} axis is toward prime meridian. Those directions and axis names are different than
      * the ISO 19111's ones (ISO names are "Geocentric X", "Geocentric Y" and "Geocentric Z"). This constant uses
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionTransformer.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionTransformer.java
index b4e10bf172..88a12d3f71 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionTransformer.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionTransformer.java
@@ -57,7 +57,7 @@ import org.apache.sis.util.Utilities;
  * For example, suppose that {@code MyClass} needs to perform its internal working in some particular CRS,
  * but we want robust API accepting whatever CRS the client uses. {@code MyClass} can be written as below:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     public class MyClass {
  *         private static final CoordinateReferenceSystem PUBLIC_CRS = ...
  *         private static final CoordinateReferenceSystem INTERNAL_CRS = ...
@@ -74,7 +74,7 @@ import org.apache.sis.util.Utilities;
  *             return myPosition.inverseTransform(PUBLIC_CRS);
  *         }
  *     }
- * }
+ *     }
  *
  * This class is not thread-safe.
  *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/IntervalRectangle.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/IntervalRectangle.java
index 7f7c98ff7a..5cd42560a1 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/IntervalRectangle.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/IntervalRectangle.java
@@ -82,15 +82,15 @@ public class IntervalRectangle extends Rectangle2D {
      * full longitude range (i.e. this constructor does not preserve the convention of using
      * negative width for envelopes crossing anti-meridian).
      *
-     * <div class="note"><b>Note:</b> this constructor expands envelopes that cross the anti-meridian
+     * <h4>Design note</h4>
+     * This constructor expands envelopes that cross the anti-meridian
      * because the methods defined in this class are not designed for handling such envelopes.
      * If a rectangle with negative width is nevertheless desired for envelope crossing the anti-meridian,
      * one can use the following constructor:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     new IntervalRectangle(envelope.getLowerCorner(), envelope.getUpperCorner());
-     * }
-     * </div>
+     *     }
      *
      * @param envelope  the envelope from which to copy the values.
      */
@@ -467,9 +467,9 @@ public class IntervalRectangle extends Rectangle2D {
      * Invoking this method is equivalent to invoking the following code, except that this
      * method behaves correctly with infinite values and {@link Envelope2D} implementation.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Rectangle2D.intersect(this, rect, this);
-     * }
+     *     }
      *
      * @param  rect  the {@code Rectangle2D} to intersect with this rectangle.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/Tile.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/Tile.java
index ca8cdf69fa..b5dddfcc2d 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/Tile.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/Tile.java
@@ -427,17 +427,16 @@ public class Tile implements Serializable {
      * since it may have been {@linkplain AffineTransform#translate(double, double) translated}
      * in order to get a uniform grid geometry for every tiles.
      *
-     * <div class="note"><b>Tip:</b>
+     * <h4>Tip</h4>
      * the <a href="https://en.wikipedia.org/wiki/World_file">World File</a> coefficients of this tile
      * (i.e. the <cite>grid to CRS</cite> transform that we would have if the pixel in the upper-left
      * corner always had indices (0,0)) can be computed as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Point location = tile.getLocation();
      *     AffineTransform gridToCRS = new AffineTransform(tile.getGridToCRS());
      *     gridToCRS.translate(location.x, location.y);
-     * }
-     * </div>
+     *     }
      *
      * @return the <cite>"grid to real world"</cite> transform mapping pixel
      *         {@linkplain PixelOrientation#UPPER_LEFT upper left} corner, or {@code null} if undefined.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Element.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Element.java
index 90ed2cc72a..83c70e7097 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Element.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Element.java
@@ -139,20 +139,20 @@ final class Element {
      * This wrapper is a convenience for branching on different codes depending on
      * the keyword value. For example:
      *
-     * {@preformat java
-     *    Element wrapper = new Element(an_element_with_unknown_keyword);
-     *    Element e = wrapper.pullElement(…, "ProjectedCRS");
-     *    if (e != null) {
-     *        // Do something specific to projected CRS.
-     *        return;
-     *    }
-     *    e = wrapper.pullElement(…, "GeographicCRS");
-     *    if (e != null) {
-     *        // Do something specific to Geographic CRS.
-     *        return;
-     *    }
-     *    // etc.
-     * }
+     * {@snippet lang="java" :
+     *     Element wrapper = new Element(an_element_with_unknown_keyword);
+     *     Element e = wrapper.pullElement(…, "ProjectedCRS");
+     *     if (e != null) {
+     *         // Do something specific to projected CRS.
+     *         return;
+     *     }
+     *     e = wrapper.pullElement(…, "GeographicCRS");
+     *     if (e != null) {
+     *         // Do something specific to Geographic CRS.
+     *         return;
+     *     }
+     *     // etc.
+     *     }
      *
      * @param  singleton  the only child for this root.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
index 8ac4b233fa..e28df8c1b7 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
@@ -1599,9 +1599,9 @@ public class Formatter implements Localized {
      * Invoking this method is equivalent to first verifying the {@code other} class,
      * then delegating as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return other.formatTo(this);
-     * }
+     *     }
      *
      * This method is useful for {@code FormattableObject} which are wrapper around another object.
      * It allows to delegate the WKT formatting to the wrapped object.
@@ -1678,11 +1678,11 @@ public class Formatter implements Localized {
      * Restores the contextual unit to its previous state before the call to {@link #addContextualUnit(Unit)}.
      * This method is used in the following pattern:
      *
-     * {@preformat java
-     *   final Unit<?> previous = formatter.addContextualUnit(unit);
-     *   // ... format some WKT elements here.
-     *   formatter.restoreContextualUnit(unit, previous);
-     * }
+     * {@snippet lang="java" :
+     *     final Unit<?> previous = formatter.addContextualUnit(unit);
+     *     // ... format some WKT elements here.
+     *     formatter.restoreContextualUnit(unit, previous);
+     *     }
      *
      * @param  unit      the value given in argument to {@code addContextualUnit(unit)} (can be {@code null}).
      * @param  previous  the value returned by {@code addContextualUnit(unit)} (can be {@code null}).
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
index f3aa4afcf8..e595bfd8df 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@ -395,9 +395,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      * This includes elements like {@code "SCOPE"}, {@code "ID"} (WKT 2) or {@code "AUTHORITY"} (WKT 1).
      * This WKT 1 element has the following pattern:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     AUTHORITY["<name>", "<code>"]
-     * }
+     *     }
      *
      * <h4>Fallback</h4>
      * The name is a mandatory property, but some invalid WKT with an empty string exist. In such case,
@@ -583,9 +583,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      * Parses an optional {@code "UNIT"} element of a known dimension.
      * This element has the following pattern:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     UNIT["<name>", <conversion factor> {,<authority>}]
-     * }
+     *     }
      *
      * Unit was a mandatory element in WKT 1, but became optional in WKT 2 because the unit may be specified
      * in each {@code AXIS[…]} element instead of for the whole coordinate system.
@@ -657,12 +657,12 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      * Parses a {@code "CS"} element followed by all {@code "AXIS"} elements.
      * This element has the following pattern (simplified):
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     CS["<type>", dimension],
      *     AXIS["<name>", NORTH | SOUTH | EAST | WEST | UP | DOWN | OTHER],
      *     UNIT["<name>", <conversion factor>],
      *     etc.
-     * }
+     *     }
      *
      * This element is different from all other elements parsed by {@code GeodeticObjectParser}
      * in that its components are sibling elements rather than child elements of the CS element.
@@ -986,15 +986,15 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      * Parses an {@code "AXIS"} element.
      * This element has the following pattern (simplified):
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     AXIS["<name (abbr.)>", NORTH | SOUTH | EAST | WEST | UP | DOWN | OTHER, ORDER[n], UNIT[…], ID[…]]
-     * }
+     *     }
      *
      * Abbreviation may be specified between parenthesis. Nested parenthesis are possible, as for example:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     AXIS["Easting (E(X))", EAST]
-     * }
+     *     }
      *
      * @param  mode         {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent       the parent element.
@@ -1130,9 +1130,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 pattern was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     PRIMEM["<name>", <longitude> {,<authority>}]
-     * }
+     *     }
      *
      * @param  mode         {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent       the parent element.
@@ -1173,9 +1173,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      * Parses an <strong>optional</strong> {@code "TOWGS84"} element.
      * This element is specific to WKT 1 and has the following pattern:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     TOWGS84[<dx>, <dy>, <dz>, <ex>, <ey>, <ez>, <ppm>]
-     * }
+     *     }
      *
      * @param  mode    {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent  the parent element.
@@ -1207,9 +1207,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 pattern was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     SPHEROID["<name>", <semi-major axis>, <inverse flattening> {,<authority>}]
-     * }
+     *     }
      *
      * @param  mode    {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent  the parent element.
@@ -1312,9 +1312,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 specification was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     PROJECTION["<name>" {,<authority>}]
-     * }
+     *     }
      *
      * Note that in WKT 2, this element is wrapped inside a {@code Conversion} or {@code DerivingConversion}
      * element which is itself inside the {@code ProjectedCRS} element. This is different than WKT 1, which
@@ -1387,9 +1387,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 pattern was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     DATUM["<name>", <spheroid> {,<to wgs84>} {,<authority>}]
-     * }
+     *     }
      *
      * @param  mode      {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent    the parent element.
@@ -1428,9 +1428,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 pattern was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     VERT_DATUM["<name>", <datum type> {,<authority>}]
-     * }
+     *     }
      *
      * @param  mode    {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent  the parent element.
@@ -1467,9 +1467,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
     /**
      * Parses a {@code "TimeDatum"} element. This element has the following pattern:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     TimeDatum["<name>", TimeOrigin[<time origin>] {,<authority>}]
-     * }
+     *     }
      *
      * @param  mode    {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent  the parent element.
@@ -1496,9 +1496,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
     /**
      * Parses a {@code "ParametricDatum"} element. This element has the following pattern:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     ParametricDatum["<name>", Anchor[...] {,<authority>}]
-     * }
+     *     }
      *
      * @param  mode    {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent  the parent element.
@@ -1525,9 +1525,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 pattern was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     LOCAL_DATUM["<name>", <datum type> {,<authority>}]
-     * }
+     *     }
      *
      * The datum type (WKT 1 only) is currently ignored.
      *
@@ -1588,9 +1588,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 pattern was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     LOCAL_CS["<name>", <local datum>, <unit>, <axis>, {,<axis>}* {,<authority>}]
-     * }
+     *     }
      *
      * @param  mode       {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent     the parent element.
@@ -1698,15 +1698,15 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 specification had two elements for this:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     GEOGCS["<name>", <datum>, <prime meridian>, <angular unit>  {,<twin axes>} {,<authority>}]
-     * }
+     *     }
      *
      * and
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     GEOCCS["<name>", <datum>, <prime meridian>, <linear unit> {,<axis> ,<axis> ,<axis>} {,<authority>}]
-     * }
+     *     }
      *
      * @param  mode       {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent     the parent element.
@@ -1873,9 +1873,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 pattern was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     VERT_CS["<name>", <vert datum>, <linear unit>, {<axis>,} {,<authority>}]
-     * }
+     *     }
      *
      * @param  mode       {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent     the parent element.
@@ -2089,10 +2089,10 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 specification was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     PROJCS["<name>", <geographic cs>, <projection>, {<parameter>,}*,
      *            <linear unit> {,<twin axes>}{,<authority>}]
-     * }
+     *     }
      *
      * @param  mode       {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent     the parent element.
@@ -2172,9 +2172,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      *
      * The legacy WKT 1 specification was:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     COMPD_CS["<name>", <head cs>, <tail cs> {,<authority>}]
-     * }
+     *     }
      *
      * In the particular case where there is a geographic CRS and an ellipsoidal height,
      * this method rather build a three-dimensional geographic CRS.
@@ -2208,9 +2208,9 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
      * Parses a {@code "FITTED_CS"} element.
      * This element has the following pattern:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *     FITTED_CS["<name>", <to base>, <base cs>]
-     * }
+     *     }
      *
      * @param  mode    {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
      * @param  parent  the parent element.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/StoredTree.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/StoredTree.java
index a38a706649..38d6bf9b08 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/StoredTree.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/StoredTree.java
@@ -305,12 +305,12 @@ final class StoredTree implements Serializable {
      * where we need to allow more roots: when user wants to represent a coordinate system.
      * A WKT 2 coordinate system looks like:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   CS[Cartesian, 2],
      *     Axis["Easting (E)", east],
      *     Axis["Northing (N)", north],
      *     Unit["metre", 1]
-     * }
+     *   }
      *
      * While axes are conceptually parts of coordinate system, they are not declared inside the {@code CS[…]}
      * element for historical reasons (for compatibility with WKT 1). For representing such "flattened tree",
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Symbols.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Symbols.java
index dc5cc5735e..b88cc0ea4b 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Symbols.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Symbols.java
@@ -352,13 +352,13 @@ public class Symbols implements Localized, Cloneable, Serializable {
      * Each string shall contain exactly two code points (usually two characters).
      * The first code point is taken as the opening bracket, and the second code point as the closing bracket.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * The following code will instruct the WKT formatter to use the (…) pair of brackets at formatting time,
      * but still accept the more common […] pair of brackets at parsing time:
      *
-     * {@preformat java
-     *   symbols.setPairedBrackets("()", "[]");
-     * }</div>
+     * {@snippet lang="java" :
+     *     symbols.setPairedBrackets("()", "[]");
+     *     }
      *
      * @param  preferred     the preferred pair of opening and closing quotes, used at formatting time.
      * @param  alternatives  alternative pairs of opening and closing quotes accepted at parsing time.
@@ -430,14 +430,14 @@ public class Symbols implements Localized, Cloneable, Serializable {
      * Each string shall contain exactly two code points (usually two characters).
      * The first code point is taken as the opening quote, and the second code point as the closing quote.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * The following code will instruct the WKT formatter to use the prettier “…” quotation marks at formatting time
      * (especially useful for {@code String} constants in Java code), but still accept the standard "…" quotation marks
      * at parsing time:
      *
-     * {@preformat java
-     *   symbols.setPairedQuotes("“”", "\"\"");
-     * }</div>
+     * {@snippet lang="java" :
+     *     symbols.setPairedQuotes("“”", "\"\"");
+     *     }
      *
      * @param  preferred     the preferred pair of opening and closing quotes, used at formatting time.
      * @param  alternatives  alternative pairs of opening and closing quotes accepted at parsing time.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java
index d62c5db8a5..7a3adcec8b 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java
@@ -37,9 +37,9 @@ import org.apache.sis.metadata.iso.extent.DefaultVerticalExtent;
  * Stores temporary information needed for completing the construction of an {@link DefaultVerticalExtent} instance.
  * WKT of vertical extents looks like:
  *
- * {@preformat wkt
+ * {@snippet lang="wkt" :
  *     VERTICALEXTENT[-1000, 0, LENGTHUNIT[“metre”, 1]]
- * }
+ *     }
  *
  * But {@code DefaultVerticalExtent} has no {@code unit} property. Instead, {@code DefaultVerticalExtent} has a
  * {@code verticalCRS} property. The WKT specification said that heights are positive toward up and relative to
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/WKTDictionary.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/WKTDictionary.java
index e7ac6de1f3..4ca865cd27 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/WKTDictionary.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/WKTDictionary.java
@@ -88,7 +88,7 @@ import org.apache.sis.util.SimpleInternationalString;
  * The additional CRS are defined by Well-Known Text strings in a {@code "MyCRS.txt"} file.
  * First step is to create a CRS factory with those definitions:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     public final class MyCRS extends WKTDictionary implements CRSAuthorityFactory {
  *         MyCRS() throws IOException, FactoryException {
  *             super(new DefaultCitation("MyAuthority"));
@@ -97,7 +97,7 @@ import org.apache.sis.util.SimpleInternationalString;
  *             }
  *         }
  *     }
- * }
+ *     }
  *
  * The second step is to register this factory as a service with a
  * {@code META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory} file on the classpath.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/WKTFormat.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
index 4a3c80389c..3c0c69c038 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
@@ -771,20 +771,19 @@ public class WKTFormat extends CompoundFormat<Object> {
      * Adds a fragment of Well Know Text (WKT). The {@code wkt} argument given to this method
      * can contains itself other fragments specified in some previous calls to this method.
      *
-     * <div class="note"><b>Example</b>
-     * if the following method is invoked:
+     * <h4>Example</h4>
+     * If the following method is invoked:
      *
-     * {@preformat java
-     *   addFragment("MyEllipsoid", "Ellipsoid[“Bessel 1841”, 6377397.155, 299.1528128, ID[“EPSG”,“7004”]]");
-     * }
+     * {@snippet lang="java" :
+     *     addFragment("MyEllipsoid", "Ellipsoid[“Bessel 1841”, 6377397.155, 299.1528128, ID[“EPSG”,“7004”]]");
+     *     }
      *
      * Then other WKT strings parsed by this {@code WKTFormat} instance can refer to the above fragment as below
      * (WKT after the ellipsoid omitted for brevity):
      *
-     * {@preformat java
-     *   Object crs = parseObject("GeodeticCRS[“Tokyo”, Datum[“Tokyo”, $MyEllipsoid], …]");
-     * }
-     * </div>
+     * {@snippet lang="java" :
+     *     Object crs = parseObject("GeodeticCRS[“Tokyo”, Datum[“Tokyo”, $MyEllipsoid], …]");
+     *     }
      *
      * For removing a fragment, use <code>{@linkplain #getFragmentNames()}.remove(name)</code>.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Warnings.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Warnings.java
index 35d7745648..e53c1416ee 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Warnings.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Warnings.java
@@ -50,13 +50,13 @@ import org.apache.sis.util.resources.Vocabulary;
  *
  * <div class="note"><b>Example:</b> after parsing the following WKT:
  *
- * {@preformat wkt
+ * {@snippet lang="wkt" :
  *   GeographicCRS[“WGS 84”,
  *     Datum[“World Geodetic System 1984”,
  *       Ellipsoid[“WGS84”, 6378137.0, 298.257223563, Intruder[“some text here”]]],
  *       PrimeMeridian[“Greenwich”, 0.0, Intruder[“other text here”]],
  *     AngularUnit[“degree”, 0.017453292519943295]]
- * }
+ *   }
  *
  * a call to {@link WKTFormat#getWarnings()} would return a {@code Warnings} instance with the following information:
  *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
index 6df857e380..3a0b072a3d 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
@@ -593,7 +593,7 @@ public class DefaultParameterDescriptor<T> extends AbstractParameterDescriptor i
      * the parameter value element, like below. In such case, {@link #valueClass} is defined at construction time
      * by {@link #DefaultParameterDescriptor()} because the value is before the descriptor.
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:ParameterValue>
      *     <gml:value uom="…">…</gml:value>
      *     <gml:operationParameter>
@@ -602,18 +602,18 @@ public class DefaultParameterDescriptor<T> extends AbstractParameterDescriptor i
      *       </gml:OperationParameter>
      *     </gml:operationParameter>
      *   </gml:ParameterValue>
-     * }
+     *   }
      *
      * In the second scenario shows below, the descriptor was defined before the value and is referenced by a link.
      * In that case, {@link #valueClass} is {@code null} the first time that this method is invoked. It may become
      * non-null if the same parameter descriptor is reused for many parameter values.
      *
-     * {@preformat xml
+     * {@snippet lang="xml" :
      *   <gml:ParameterValue>
      *     <gml:value uom="…">…</gml:value>
      *     <gml:operationParameter xlink:href="#LongitudeRotation"/>
      *   </gml:ParameterValue>
-     * }
+     *   }
      *
      * This method modifies the state of this class despite the fact that it should be immutable.
      * It is okay because we are updating an instance created during GML unmarshalling, and that
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
index 6c42e7b59c..358d8c64fc 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
@@ -56,11 +56,11 @@ import static org.apache.sis.util.Utilities.deepEquals;
  * If nevertheless a {@code ParameterDescriptorGroup} needs to be instantiated directly,
  * then the {@link ParameterBuilder} class may make the task easier.
  *
- * <div class="note"><b>Example:</b>
+ * <h2>Example</h2>
  * The following example declares the parameters for a <cite>Mercator (variant A)</cite> projection method
  * valid from 80°S to 84°N on all the longitude range (±180°).
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     class Mercator {
  *         static final ParameterDescriptorGroup PARAMETERS;
  *         static {
@@ -80,8 +80,7 @@ import static org.apache.sis.util.Utilities.deepEquals;
  *             PARAMETERS = builder.createGroup(parameters);
  *         }
  *     }
- * }
- * </div>
+ *     }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Johann Sorel (Geomatys)
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
index f900dafc56..43b7d9bef7 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
@@ -93,9 +93,9 @@ import static org.apache.sis.util.Utilities.deepEquals;
  * The type and constraints on parameter values are given by the {@linkplain #getDescriptor() descriptor},
  * which is specified at construction time. The parameter type can be fetch with the following idiom:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Class<T> valueClass = parameter.getDescriptor().getValueClass();
- * }
+ *     }
  *
  * <h2>Instantiation</h2>
  * A {@linkplain DefaultParameterDescriptor parameter descriptor} must be defined before parameter value can be created.
@@ -857,9 +857,9 @@ convert:            if (componentType != null) {
      * Compares the specified object with this parameter for equality.
      * This method is implemented as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return equals(other, ComparisonMode.STRICT);
-     * }
+     *     }
      *
      * Subclasses shall override {@link #equals(Object, ComparisonMode)} instead of this method.
      *
@@ -942,9 +942,9 @@ convert:            if (componentType != null) {
      * Formats this parameter as a <cite>Well Known Text</cite> {@code Parameter[…]} element.
      * Example:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   Parameter["False easting", 0.0, LengthUnit["metre", 1]]
-     * }
+     *   }
      *
      * <h4>Unit of measurement</h4>
      * The units of measurement were never specified in WKT 1 format, and are optional in WKT 2 format.
@@ -960,7 +960,7 @@ convert:            if (componentType != null) {
      * parameters, which are in kilometres in this example.
      *
      * <p><b>WKT 1:</b></p>
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   PROJCS[…,
      *     GEOGCS[…,
      *       UNIT[“grad”, 0.015707963267948967]],       // Unit for all angles
@@ -970,10 +970,10 @@ convert:            if (componentType != null) {
      *     PARAMETER[“false_easting”, 600.0],           // In kilometres
      *     PARAMETER[“false_northing”, 2200.0],         // In kilometres
      *     UNIT[“kilometre”, 1000]]                     // Unit for all lengths
-     * }
+     *   }
      *
      * <p><b>WKT 2:</b></p>
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   ProjectedCRS[…
      *     BaseGeodCRS[…
      *       AngleUnit[“grad”, 0.015707963267948967]],
@@ -985,7 +985,7 @@ convert:            if (componentType != null) {
      *       Parameter[“False northing”, 2200.0]],
      *     CS[“Cartesian”, 2],
      *       LengthUnit[“kilometre”, 1000]]
-     * }
+     *   }
      * </div>
      *
      * @param  formatter  the formatter where to format the inner content of this WKT element.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
index 908ab5c746..d4aec7fd5b 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
@@ -71,29 +71,28 @@ import org.apache.sis.util.Utilities;
  * be invoked regardless of whether the parameter is mandatory or optional: if the parameter was optional and not
  * yet present in this group, it will be created.
  *
- * <div class="note"><b>Example:</b>
+ * <h3>Example 1</h3>
  * Assuming the descriptor defined in the {@link DefaultParameterDescriptorGroup} example,
  * one can set <cite>Mercator (variant A)</cite> projection parameters as below:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     ParameterValueGroup mercator = Mercator.PARAMETERS.createValue();
  *     mercator.parameter("Longitude of natural origin").setValue(-60, Units.DEGREE);  // 60°W
  *     mercator.parameter("Latitude of natural origin") .setValue( 40, Units.DEGREE);  // 40°N
  *     // Keep default values for other parameters.
- * }
- * </div>
+ *     }
  *
+ * <h3>Example 2</h3>
  * Alternatively, if all parameters were created elsewhere and the user wants to copy them in a new
  * parameter group, the {@link List#addAll(Collection)} method can be invoked on the values list.
  *
- * <div class="note"><b>Example:</b>
- * {@preformat java
+ * {@snippet lang="java" :
  *     ParameterValue<?>[] parameter = ...;        // Defined elsewhere.
  *     ParameterValueGroup mercator = Mercator.PARAMETERS.createValue();
  *     Collections.addAll(mercator.values(), parameters);
- * }
- * </div>
+ *     }
  *
+ * <h2>Removing elements</h2>
  * Optional parameters can be removed by the usual {@link List#remove(int)} or {@link List#remove(Object)}
  * operations on the values list. But attempts to remove a mandatory parameter will cause an
  * {@link InvalidParameterCardinalityException} to be thrown.
@@ -263,11 +262,11 @@ public class DefaultParameterValueGroup extends Parameters implements LenientCom
      * For example, the following idiom fetches a floating point value for the <cite>False easting</cite>
      * and <cite>False northing</cite> parameters and set a new value for the <cite>False easting</cite> one:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     double easting  = parameter("False easting" ).doubleValue();
      *     double northing = parameter("False northing").doubleValue();
      *     parameter("False easting").setValue(500000.0);
-     * }
+     *     }
      *
      * <div class="note"><b>API note:</b> there is no <code>parameter<b><u>s</u></b>(String)</code> method
      * returning a list of parameter values because the ISO 19111 standard fixes the {@code ParameterValue}
@@ -495,9 +494,9 @@ scan:   for (final GeneralParameterValue param : actual.values()) {
      * Compares the specified object with this parameter for equality.
      * This method is implemented as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return equals(other, ComparisonMode.STRICT);
-     * }
+     *     }
      *
      * Subclasses shall override {@link #equals(Object, ComparisonMode)} instead of this method.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
index ec4fd2e263..f755c33242 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
@@ -65,42 +65,47 @@ import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
  * In this example, the <cite>"Longitude of natural origin"</cite> parameter is giving different aliases
  * for illustrating the case of different software libraries or standards using different conventions.
  *
- * {@preformat java
- *   ParameterBuilder builder = new ParameterBuilder();
- *   builder.setCodeSpace(Citations.EPSG, "EPSG")                   // The default namespace to be used below.
- *          .setRequired(true);                                     // All parameters will be considered mandatory.
+ * {@snippet lang="java" :
+ * public class MyOperation {
+ *     public static final ParameterDescriptorGroup PARAMETERS;
+ *     static {
+ *         ParameterBuilder builder = new ParameterBuilder();
+ *         builder.setCodeSpace(Citations.EPSG, "EPSG")                   // The default namespace to be used below.
+ *                .setRequired(true);                                     // All parameters will be considered mandatory.
  *
- *   // Constructs the list of parameters.
- *   ParameterDescriptor<?>[] parameters = {
- *       builder.addName("Latitude of natural origin")              // Name in the default namespace ("EPSG" in this example).
- *              .createBounded( -80,  +84, 0, Units.DEGREE),        // Latitude of Mercator projection cannot go to the poles.
+ *         // Constructs the list of parameters.
+ *         ParameterDescriptor<?>[] parameters = {
+ *             builder.addName("Latitude of natural origin")              // Name in the default namespace ("EPSG" in this example).
+ *                    .createBounded( -80,  +84, 0, Units.DEGREE),        // Latitude of Mercator projection cannot go to the poles.
  *
- *       builder.addIdentifier("8802")                              // Primary key in default namespace ("EPSG" in this example).
- *              .addName("Longitude of natural origin")             // Primary name in default namespace ("EPSG" in this example).
- *              .addName(Citations.OGC, "central_meridian")         // First alias in "OGC" namespace.
- *              .addName(Citations.GEOTIFF, "NatOriginLong")        // Second alias in "GeoTIFF" namespace.
- *              .createBounded(-180, +180, 0, Units.DEGREE),        // Projection is valid on all the longitude range (±180°).
+ *             builder.addIdentifier("8802")                              // Primary key in default namespace ("EPSG" in this example).
+ *                    .addName("Longitude of natural origin")             // Primary name in default namespace ("EPSG" in this example).
+ *                    .addName(Citations.OGC, "central_meridian")         // First alias in "OGC" namespace.
+ *                    .addName(Citations.GEOTIFF, "NatOriginLong")        // Second alias in "GeoTIFF" namespace.
+ *                    .createBounded(-180, +180, 0, Units.DEGREE),        // Projection is valid on all the longitude range (±180°).
  *
- *       builder.addName("Scale factor at natural origin")
- *              .createStrictlyPositive(1, Units.UNITY),
+ *             builder.addName("Scale factor at natural origin")
+ *                    .createStrictlyPositive(1, Units.UNITY),
  *
- *       builder.addName("False easting")
- *              .create(0, Units.METRE),
+ *             builder.addName("False easting")
+ *                    .create(0, Units.METRE),
  *
- *       builder.addName("False northing")
- *              .create(0, Units.METRE)
- *   };
+ *             builder.addName("False northing")
+ *                    .create(0, Units.METRE)
+ *         };
  *
- *   // Put all above parameters in a group.
- *   ParameterDescriptorGroup group = builder
- *           .addIdentifier("9804")                                 // Defined in implicit "EPSG" namespace.
- *           .addName      ("Mercator (variant A)")                 // Defined in implicit "EPSG" namespace.
- *           .addName      ("Mercator (1SP)")                       // Defined in implicit "EPSG" namespace.
- *           .addName      (Citations.OGC, "Mercator_1SP")          // "OGC" namespace explicitly shown by toString().
- *           .addName      (Citations.GEOTIFF, "CT_Mercator")       // "GeoTIFF" namespace explicitly shown by toString().
- *           .addIdentifier(Citations.GEOTIFF, "7")
- *           .setRemarks   ("The “Mercator (1SP)” method name was used prior to October 2010.")
- *           .createGroupForMapProjection(parameters);
+ *         // Put all above parameters in a group.
+ *         PARAMETERS = ParameterDescriptorGroup group = builder
+ *                 .addIdentifier("9804")                                 // Defined in implicit "EPSG" namespace.
+ *                 .addName      ("Mercator (variant A)")                 // Defined in implicit "EPSG" namespace.
+ *                 .addName      ("Mercator (1SP)")                       // Defined in implicit "EPSG" namespace.
+ *                 .addName      (Citations.OGC, "Mercator_1SP")          // "OGC" namespace explicitly shown by toString().
+ *                 .addName      (Citations.GEOTIFF, "CT_Mercator")       // "GeoTIFF" namespace explicitly shown by toString().
+ *                 .addIdentifier(Citations.GEOTIFF, "7")
+ *                 .setRemarks   ("The “Mercator (1SP)” method name was used prior to October 2010.")
+ *                 .createGroupForMapProjection(parameters);
+ *     }
+ * }
  * }
  *
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
index 85aaf2d889..31a564a956 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
@@ -809,9 +809,9 @@ public abstract class Parameters implements ParameterValueGroup, Cloneable {
      *
      * <p>The default implementation is equivalent to:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return cast(parameter(name), parameter.getValueClass());
-     * }
+     *     }
      *
      * where {@code name} is a {@code parameter} {@linkplain DefaultParameterDescriptor#getName() name}
      * or {@linkplain DefaultParameterDescriptor#getAlias() alias} chosen by the same algorithm than
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
index b4dda2e9df..3ddc175ba9 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
@@ -87,7 +87,7 @@ import org.apache.sis.util.resources.Errors;
  *   <th class="sep">Using OGC names</th>
  * </tr>
  * <tr><td>
- * {@preformat wkt
+ * {@snippet lang="wkt" :
  *   Parameter["A0", <value>, Id["EPSG", 8623]],
  *   Parameter["A1", <value>, Id["EPSG", 8624]],
  *   Parameter["A2", <value>, Id["EPSG", 8625]],
@@ -101,7 +101,7 @@ import org.apache.sis.util.resources.Errors;
  * but they are for polynomial transformations, not for affine transformations.</div>
  *
  * </td><td class="sep">
- * {@preformat wkt
+ * {@snippet lang="wkt" :
  *   Parameter["num_row", 3],
  *   Parameter["num_col", 3],
  *   Parameter["elt_0_0", <value>],
@@ -123,18 +123,18 @@ import org.apache.sis.util.resources.Errors;
  * For creating a new group of parameters for a matrix using the {@link #WKT1} naming conventions,
  * one can use the following code:
  *
- * {@preformat java
- *   Map<String,?> properties = Map.of(ParameterValueGroup.NAME_KEY, "Affine");
- *   ParameterValueGroup p = TensorParameters.WKT1.createValueGroup(properties);
- * }
+ * {@snippet lang="java" :
+ *     Map<String,?> properties = Map.of(ParameterValueGroup.NAME_KEY, "Affine");
+ *     ParameterValueGroup p = TensorParameters.WKT1.createValueGroup(properties);
+ *     }
  *
  * For setting the elements of a few values, then create a matrix from the parameter values:
  *
- * {@preformat java
- *   p.parameter("elt_0_0").setValue(4);    // "A0" also accepted as a synonymous of "elt_0_0".
- *   p.parameter("elt_1_1").setValue(6);    // "B1" also accepted as a synonymous of "elt_1_1".
- *   Matrix m = TensorParameters.WKT1.toMatrix(p);
- * }
+ * {@snippet lang="java" :
+ *     p.parameter("elt_0_0").setValue(4);    // "A0" also accepted as a synonymous of "elt_0_0".
+ *     p.parameter("elt_1_1").setValue(6);    // "B1" also accepted as a synonymous of "elt_1_1".
+ *     Matrix m = TensorParameters.WKT1.toMatrix(p);
+ *     }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.2
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java
index 19fd915929..2616089c56 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java
@@ -68,16 +68,17 @@
  * method is provided for fetching a parameter regardless of whether it was present or not — optional parameters
  * are created when first needed.</p>
  *
- * <div class="note"><b>Example:</b> the following code snippet assumes that the implementer of a Mercator projection
+ * <h3>Example</h3>
+ * The following code snippet assumes that the implementer of a Mercator projection
  * provides a {@code ParameterDescriptorGroup} instance in a {@code PARAMETERS} static constant:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     ParameterValueGroup group = Mercator.PARAMETERS.createValue();
  *     group.parameter("Longitude of natural origin").setValue(-60);        // Using default units (e.g. degrees).
  *     group.parameter("False easting").setValue(200.0, Units.KILOMETRE);   // Using explicit units.
- * }
- * </div>
+ *     }
  *
+ * <h2>Exceptions</h2>
  * Calls to {@code parameter(…)} throw a {@link org.opengis.parameter.ParameterNotFoundException}
  * if the given name is unknown to the group.
  * Calls to {@code setValue(…)} throw a {@link org.opengis.parameter.InvalidParameterValueException}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 40bac3475c..f445e7f302 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@ -765,9 +765,9 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident
      * Compares the specified object with this object for equality.
      * This method is implemented as below (omitting assertions):
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return equals(other, ComparisonMode.STRICT);
-     * }
+     *     }
      *
      * Subclasses shall override {@link #equals(Object, ComparisonMode)} instead of this method.
      *
@@ -821,8 +821,8 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident
      * All {@code computeHashCode()} methods shall invoke {@code super.computeHashCode()},
      * <strong>not</strong> {@code hashCode()}. Example:
      *
-     * {@preformat java
-     *     &#64;Override
+     * {@snippet lang="java" :
+     *     @Override
      *     protected long computeHashCode() {
      *         return super.computeHashCode() + 31 * Objects.hash(myProperties);
      *     }
@@ -855,10 +855,13 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident
      * }
      * </div><div>
      * <p><b>Java code example</b></p>
-     * {@preformat java
-     *     super.formatTo(formatter);
-     *     // ... write the elements at the insertion point ...
-     *     return "GeodeticCRS";
+     * {@snippet lang="java" :
+     *     @Override
+     *     protected String formatTo(final Formatter formatter) {
+     *         super.formatTo(formatter);
+     *         // ... write the elements at the insertion point ...
+     *         return "GeodeticCRS";
+     *     }
      * }
      * </div></div>
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
index da9f292aa5..a0b380ee75 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
@@ -97,23 +97,23 @@ import static org.apache.sis.util.ArgumentChecks.*;
  *       information given to the {@code Builder} are ignored.</li>
  * </ul>
  *
- * <div class="note"><b>Example:</b>
+ * <h2>Example</h2>
  * The EPSG database defines a projection named <cite>"Mercator (variant A)"</cite> (EPSG:9804).
  * This projection was named <cite>"Mercator (1SP)"</cite> in older EPSG database versions.
  * The same projection was also named "{@code Mercator_1SP}" by OGC some specifications.
  * If we choose EPSG as our primary naming authority, then those three names can be declared as below:
  *
- * {@preformat java
- *   builder.setCodespace (Citations.EPSG, "EPSG")
- *          .addName("Mercator (variant A)")
- *          .addName("Mercator (1SP)")
- *          .addName(Citations.OGC, "Mercator_1SP")
- * }
+ * {@snippet lang="java" :
+ *     builder.setCodespace (Citations.EPSG, "EPSG")
+ *            .addName("Mercator (variant A)")
+ *            .addName("Mercator (1SP)")
+ *            .addName(Citations.OGC, "Mercator_1SP")
+ *     }
  *
  * The {@code toString()} representation of those three names are {@code "Mercator (variant A)"},
  * {@code "Mercator (1SP)"} (note the absence of {@code "EPSG:"} prefix, which is stored as the
  * name {@linkplain org.apache.sis.util.iso.DefaultLocalName#scope() scope} but not shown) and
- * <code>"<b>OGC:</b>Mercator_1SP"</code> respectively.</div>
+ * <code>"<b>OGC:</b>Mercator_1SP"</code> respectively.
  *
  *
  * <h2>Builder property lifetimes</h2>
@@ -154,8 +154,8 @@ import static org.apache.sis.util.ArgumentChecks.*;
  *       usage of {@link #properties} map by the factory.</li>
  * </ul>
  *
- * <div class="note"><b>Example:</b>
- * {@preformat java
+ * <p>Example:</p>
+ * {@snippet lang="java" :
  *     public class MyBuilder extends Builder<MyBuilder> {
  *         public Foo createFoo() {
  *             onCreate(false);
@@ -164,8 +164,7 @@ import static org.apache.sis.util.ArgumentChecks.*;
  *             return foo;
  *         }
  *     }
- * }
- * </div>
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
@@ -515,23 +514,23 @@ public abstract class Builder<B extends Builder<B>> {
      * Adds an {@code IdentifiedObject} name in an alternative namespace. This method is typically invoked for
      * {@linkplain AbstractIdentifiedObject#getAlias() aliases} defined after the primary name.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * The <cite>"Longitude of natural origin"</cite> parameter defined by EPSG is named differently
      * by OGC and GeoTIFF. Those alternative names can be defined as below:
      *
-     * {@preformat java
-     *   builder.setCodespace(Citations.EPSG, "EPSG")          // Sets the default namespace to "EPSG".
-     *          .addName("Longitude of natural origin")        // Primary name in builder default namespace.
-     *          .addName(Citations.OGC, "central_meridian")    // First alias in "OGC" namespace.
-     *          .addName(Citations.GEOTIFF, "NatOriginLong");  // Second alias in "GeoTIFF" namespace.
-     * }
+     * {@snippet lang="java" :
+     *     builder.setCodespace(Citations.EPSG, "EPSG")          // Sets the default namespace to "EPSG".
+     *            .addName("Longitude of natural origin")        // Primary name in builder default namespace.
+     *            .addName(Citations.OGC, "central_meridian")    // First alias in "OGC" namespace.
+     *            .addName(Citations.GEOTIFF, "NatOriginLong");  // Second alias in "GeoTIFF" namespace.
+     *     }
      *
      * In this example, {@code "central_meridian"} will be the
      * {@linkplain org.apache.sis.util.iso.DefaultScopedName#tip() tip} and {@code "OGC"} will be the
-     * {@linkplain org.apache.sis.util.iso.DefaultScopedName#head() head} of the first alias.</div>
+     * {@linkplain org.apache.sis.util.iso.DefaultScopedName#head() head} of the first alias.
      *
-     * <p><b>Lifetime:</b>
-     * the name and all aliases are cleared after a {@code createXXX(…)} method has been invoked.</p>
+     * <h4>Lifetime</h4>
+     * The name and all aliases are cleared after a {@code createXXX(…)} method has been invoked.
      *
      * @param  authority  bibliographic reference to the authority defining the codes, or {@code null} if none.
      * @param  name       the {@code IdentifiedObject} alias as a name in the namespace of the given authority.
@@ -1012,7 +1011,7 @@ public abstract class Builder<B extends Builder<B>> {
      * Initializes/cleanups the {@link #properties} map before/after a {@code createXXX(…)} execution.
      * Subclasses shall invoke this method in their {@code createXXX(…)} methods as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     public Foo createFoo() {
      *         final Foo foo;
      *         onCreate(false);
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
index e288bcf6af..18fd2a110b 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
@@ -112,19 +112,19 @@ import org.opengis.geometry.Geometry;
  * (see the <a href="https://sis.apache.org/tables/CoordinateReferenceSystems.html">Apache SIS™ Coordinate
  * Reference System (CRS) codes</a> page for the complete list of EPSG codes):
  *
- * {@preformat java
- *   CoordinateReferenceSystem source = CRS.forCode("EPSG:4326");                   // WGS 84
- *   CoordinateReferenceSystem target = CRS.forCode("EPSG:3395");                   // WGS 84 / World Mercator
- *   CoordinateOperation operation = CRS.findOperation(source, target, null);
- *   if (CRS.getLinearAccuracy(operation) > 100) {
- *       // If the accuracy is coarser than 100 metres (or any other threshold at application choice)
- *       // maybe the operation is not suitable. Decide here what to do (throw an exception, etc).
- *   }
- *   MathTransform mt = operation.getMathTransform();
- *   DirectPosition position = new DirectPosition2D(20, 30);            // 20°N 30°E   (watch out axis order!)
- *   position = mt.transform(position, position);
- *   System.out.println(position);
- * }
+ * {@snippet lang="java" :
+ *     CoordinateReferenceSystem source = CRS.forCode("EPSG:4326");                   // WGS 84
+ *     CoordinateReferenceSystem target = CRS.forCode("EPSG:3395");                   // WGS 84 / World Mercator
+ *     CoordinateOperation operation = CRS.findOperation(source, target, null);
+ *     if (CRS.getLinearAccuracy(operation) > 100) {
+ *         // If the accuracy is coarser than 100 metres (or any other threshold at application choice)
+ *         // maybe the operation is not suitable. Decide here what to do (throw an exception, etc).
+ *     }
+ *     MathTransform mt = operation.getMathTransform();
+ *     DirectPosition position = new DirectPosition2D(20, 30);            // 20°N 30°E   (watch out axis order!)
+ *     position = mt.transform(position, position);
+ *     System.out.println(position);
+ *     }
  *
  * <h2>Note on kinds of CRS</h2>
  * The {@link #getSingleComponents(CoordinateReferenceSystem)} method decomposes an arbitrary CRS into a flat
@@ -261,10 +261,11 @@ public final class CRS extends Static {
      * The default {@linkplain org.apache.sis.io.wkt Apache SIS parser} understands both
      * version 1 (a.k.a. OGC 01-009) and version 2 (a.k.a. ISO 19162) of the WKT format.
      *
-     * <div class="note"><b>Example:</b> below is a slightly simplified WKT 2 string for a Mercator projection.
+     * <h4>Example</h4>
+     * Below is a slightly simplified WKT 2 string for a Mercator projection.
      * For making this example smaller, some optional {@code UNIT[…]} and {@code ORDER[…]} elements have been omitted.
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   ProjectedCRS["SIRGAS 2000 / Brazil Mercator",
      *     BaseGeodCRS["SIRGAS 2000",
      *       Datum["Sistema de Referencia Geocentrico para las Americas 2000",
@@ -280,9 +281,9 @@ public final class CRS extends Static {
      *       Axis["northing (N)", north],
      *       LengthUnit["metre", 1],
      *     Id["EPSG",5641]]
-     * }
-     * </div>
+     *   }
      *
+     * <h4>Logging</h4>
      * If the parsing produced warnings, they will be reported in a logger named {@code "org.apache.sis.io.wkt"}.
      * In particular, this method verifies if the description provided by the WKT matches the description provided
      * by the authority ({@code "EPSG:5641"} in above example) and reports discrepancies.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
index f1dd4fffc5..4672338fc4 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
@@ -116,14 +116,15 @@ import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_D
  * instance twice will return the same {@link IdentifiedObject} instance, unless the internal cache has been cleared
  * (e.g. the application is running in a container environment and some modules have been installed or uninstalled).</p>
  *
- * <div class="note"><b>Example:</b> the following code fetches a geographic Coordinate Reference System
+ * <h2>Example</h2>
+ * The following code fetches a geographic Coordinate Reference System
  * using (<var>longitude</var>, <var>latitude</var>) axis order on the {@link #WGS84} geodetic datum:
  *
- * {@preformat java
- *   GeographicCRS crs = CommonCRS.WGS84.normalizedGeographic();
- * }
- * </div>
+ * {@snippet lang="java" :
+ *     GeographicCRS crs = CommonCRS.WGS84.normalizedGeographic();
+ *     }
  *
+ * <h2>Available objects</h2>
  * For each enumeration value, the name of the CRS, datum and ellipsoid objects may or may not be the same.
  * Below is an alphabetical list of object names available in this enumeration:
  *
@@ -1189,9 +1190,9 @@ public enum CommonCRS {
      * <p><b>Example:</b> the following code fetches a vertical Coordinate Reference System for heights
      * above the Mean Sea Level (MSL):</p>
      *
-     * {@preformat java
-     *   VerticalCRS crs = CommonCRS.Vertical.MEAN_SEA_LEVEL.crs();
-     * }
+     * {@snippet lang="java" :
+     *     VerticalCRS crs = CommonCRS.Vertical.MEAN_SEA_LEVEL.crs();
+     *     }
      *
      * Below is an alphabetical list of object names available in this enumeration:
      *
@@ -1500,9 +1501,9 @@ public enum CommonCRS {
      *
      * <p><b>Example:</b> the following code fetches a temporal Coordinate Reference System using the Julian calendar:</p>
      *
-     * {@preformat java
-     *   TemporalCRS crs = CommonCRS.Temporal.JULIAN.crs();
-     * }
+     * {@snippet lang="java" :
+     *     TemporalCRS crs = CommonCRS.Temporal.JULIAN.crs();
+     *     }
      *
      * Below is an alphabetical list of object names available in this enumeration.
      * Note that the namespace of identifiers ("OGC" versus "SIS") may change in any future version.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
index fb058662a2..caac227d23 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
@@ -431,9 +431,9 @@ public final class IdentifiedObjects extends Static {
      * declares explicitly its identifier. If the declared identifier is wanted unconditionally,
      * one can use the following pattern instead:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     String urn = toURN(object.getClass(), getIdentifier(object, authority));
-     * }
+     *     }
      *
      * This method can be seen as a converse of {@link CRS#forCode(String)}.
      *
@@ -542,9 +542,9 @@ public final class IdentifiedObjects extends Static {
      * declares explicitly its identifier. If the declared identifier is wanted unconditionally,
      * one can use the following pattern instead:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     String code = toString(getIdentifier(object, Citations.EPSG));
-     * }
+     *     }
      *
      * This method can be seen as a converse of {@link CRS#forCode(String)}.
      *
@@ -587,30 +587,30 @@ public final class IdentifiedObjects extends Static {
      * Creates a finder which can be used for looking up unidentified objects.
      * This method is an alternative to {@code lookup(…)} methods when more control are desired.
      *
-     * <div class="note"><b>Example 1: be lenient regarding axis order</b><br>
+     * <h4>Example 1: be lenient regarding axis order</h4>
      * By default, {@code lookup(…)} methods require that objects in the dataset have their axes in the
      * same order than the given object. For relaxing this condition, one can use the following Java code.
      * This example assumes that at most one object from the dataset will match the given object.
      * If more than one object may match, then the call to {@code findSingleton(…)} should be replaced
      * by {@code find(…)}.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     IdentifiedObjectFinder finder = IdentifiedObjects.newFinder(null);
      *     finder.setIgnoringAxes(true);
      *     IdentifiedObject found = finder.findSingleton(object);
-     * }</div>
+     *     }
      *
-     * <div class="note"><b>Example 2: extend the search to deprecated definitions</b><br>
+     * <h4>Example 2: extend the search to deprecated definitions</h4>
      * By default, {@code lookup(…)} methods exclude deprecated objects from the search.
      * To search also among deprecated objects, one can use the following Java code:
      * This example does not use the {@code findSingleton(…)} convenience method on the assumption
      * that the search may find both deprecated and non-deprecated objects.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     IdentifiedObjectFinder finder = IdentifiedObjects.newFinder(null);
      *     finder.setSearchDomain(IdentifiedObjectFinder.Domain.ALL_DATASET);
      *     Set<IdentifiedObject> found = finder.find(object);
-     * }</div>
+     *     }
      *
      * @param  authority  the authority of the objects to search (typically {@code "EPSG"} or {@code "OGC"}),
      *         or {@code null} for searching among the objects created by all authorities.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java
index 7b7fff59c9..21382694fc 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java
@@ -67,9 +67,9 @@ import static org.apache.sis.util.collection.Containers.property;
  * If there is no code space, then the {@linkplain #getAuthority() authority} abbreviation is used as a fallback.
  * Example:
  *
- * {@preformat wkt
+ * {@snippet lang="wkt" :
  *   AUTHORITY["EPSG", "4326"]
- * }
+ *   }
  *
  * </li><li><b><cite>Well Known Text</cite> (WKT) version 2</b><br>
  * The WKT 2 format contains the {@linkplain #getCodeSpace() code space}, the {@linkplain #getCode() code},
@@ -78,15 +78,15 @@ import static org.apache.sis.util.collection.Containers.property;
  * (the URN syntax is described in the next item below).
  * Example:
  *
- * {@preformat wkt
+ * {@snippet lang="wkt" :
  *   ID["EPSG", 4326, URI["urn:ogc:def:crs:EPSG::4326"]]
- * }
+ *   }
  *
  * </li><li><b>XML in referencing objects</b><br>
  * The <cite>Definition identifier URNs in OGC namespace</cite> paper defines a syntax for identifiers commonly
  * found in Geographic Markup Language (GML) documents. Example:
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <gml:identifier codeSpace="IOGP">urn:ogc:def:crs:EPSG::4326</gml:identifier>
  * }
  *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
index 838e3584f6..8ce9eb7eb1 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
@@ -62,9 +62,9 @@ import static org.apache.sis.internal.referencing.WKTUtilities.toFormattable;
  * <p>Coordinate reference systems can have an arbitrary number of dimensions.
  * The actual dimension of a given instance can be determined as below:</p>
  *
- * {@preformat java
- *   int dimension = crs.getCoordinateSystem().getDimension();
- * }
+ * {@snippet lang="java" :
+ *     int dimension = crs.getCoordinateSystem().getDimension();
+ *     }
  *
  * However, most subclasses restrict the allowed number of dimensions.
  *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
index a15aa3a391..165fb5391b 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
@@ -297,16 +297,16 @@ public class DefaultEngineeringCRS extends AbstractCRS implements EngineeringCRS
      * <div class="note"><b>Implementation note:</b>
      * The usual way to handle {@code <xs:choice>} with JAXB is to annotate a single method like below:
      *
-     * {@preformat java
-     *     &#64;Override
-     *     &#64;XmlElements({
-     *       &#64;XmlElement(name = "cartesianCS",   type = DefaultCartesianCS.class),
-     *       &#64;XmlElement(name = "affineCS",      type = DefaultAffineCS.class),
-     *       &#64;XmlElement(name = "cylindricalCS", type = DefaultCylindricalCS.class),
-     *       &#64;XmlElement(name = "linearCS",      type = DefaultLinearCS.class),
-     *       &#64;XmlElement(name = "polarCS",       type = DefaultPolarCS.class),
-     *       &#64;XmlElement(name = "sphericalCS",   type = DefaultSphericalCS.class),
-     *       &#64;XmlElement(name = "userDefinedCS", type = DefaultUserDefinedCS.class)
+     * {@snippet lang="java" :
+     *     @Override
+     *     @XmlElements({
+     *       @XmlElement(name = "cartesianCS",   type = DefaultCartesianCS.class),
+     *       @XmlElement(name = "affineCS",      type = DefaultAffineCS.class),
+     *       @XmlElement(name = "cylindricalCS", type = DefaultCylindricalCS.class),
+     *       @XmlElement(name = "linearCS",      type = DefaultLinearCS.class),
+     *       @XmlElement(name = "polarCS",       type = DefaultPolarCS.class),
+     *       @XmlElement(name = "sphericalCS",   type = DefaultSphericalCS.class),
+     *       @XmlElement(name = "userDefinedCS", type = DefaultUserDefinedCS.class)
      *     })
      *     public CoordinateSystem getCoordinateSystem() {
      *         return super.getCoordinateSystem();
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
index e704c43bc2..abc01870d0 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
@@ -59,9 +59,9 @@ import org.apache.sis.referencing.AbstractReferenceSystem;
  *
  * <b>Example:</b> the following code gets a geocentric CRS using the <cite>World Geodetic System 1984</cite> datum:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     GeodeticDatum datum = CommonCRS.WGS84.geocentric();
- * }
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself),
@@ -248,10 +248,11 @@ public class DefaultGeocentricCRS extends DefaultGeodeticCRS implements Geocentr
     /**
      * Formats this CRS as a <cite>Well Known Text</cite> {@code GeodeticCRS[…]} element.
      *
-     * <div class="note"><b>Example:</b> Well-Known Text (version 2)
+     * <h4>Example</h4>
+     * Well-Known Text (version 2)
      * of a geocentric coordinate reference system using the WGS 84 datum.
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   GeodeticCRS["Geocentric",
      *     Datum["World Geodetic System 1984",
      *       Ellipsoid["WGS84", 6378137.0, 298.257223563, LengthUnit["metre", 1]]],
@@ -261,11 +262,11 @@ public class DefaultGeocentricCRS extends DefaultGeodeticCRS implements Geocentr
      *       Axis["(Y)", geocentricY],
      *       Axis["(Z)", geocentricZ],
      *       LengthUnit["metre", 1]]
-     * }
+     *   }
      *
      * <p>Same coordinate reference system using WKT 1. Note that axis directions are totally different.</p>
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   GEOCCS["Geocentric",
      *     DATUM["World Geodetic System 1984",
      *       SPHEROID["WGS84", 6378137.0, 298.257223563]],
@@ -274,9 +275,9 @@ public class DefaultGeocentricCRS extends DefaultGeodeticCRS implements Geocentr
      *     AXIS["X", OTHER],
      *     AXIS["Y", EAST],
      *     AXIS["Z", NORTH]]
-     * }
-     * </div>
+     *   }
      *
+     * @param  formatter  the formatter where to format the inner content of this WKT element.
      * @return {@code "GeodeticCRS"} (WKT 2) or {@code "GeocCS"} (WKT 1).
      *
      * @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html#49">WKT 2 specification §8</a>
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
index 21b4782194..249c96ba16 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
@@ -309,15 +309,15 @@ class DefaultGeodeticCRS extends AbstractCRS implements GeodeticCRS { // If made
     /**
      * Invoked by JAXB at marshalling time.
      *
-     * <div class="note"><b>Implementation note:</b>
+     * <h4>Implementation note</h4>
      * The usual way to handle {@code <xs:choice>} with JAXB is to annotate a single method like below:
      *
-     * {@preformat java
-     *     &#64;Override
-     *     &#64;XmlElements({
-     *       &#64;XmlElement(name = "ellipsoidalCS", type = DefaultEllipsoidalCS.class),
-     *       &#64;XmlElement(name = "cartesianCS",   type = DefaultCartesianCS.class),
-     *       &#64;XmlElement(name = "sphericalCS",   type = DefaultSphericalCS.class)
+     * {@snippet lang="java" :
+     *     @Override
+     *     @XmlElements({
+     *       @XmlElement(name = "ellipsoidalCS", type = DefaultEllipsoidalCS.class),
+     *       @XmlElement(name = "cartesianCS",   type = DefaultCartesianCS.class),
+     *       @XmlElement(name = "sphericalCS",   type = DefaultSphericalCS.class)
      *     })
      *     public CoordinateSystem getCoordinateSystem() {
      *         return super.getCoordinateSystem();
@@ -325,7 +325,7 @@ class DefaultGeodeticCRS extends AbstractCRS implements GeodeticCRS { // If made
      * }
      *
      * However, our attempts to apply this approach worked for {@code DefaultParameterValue} but not for this class:
-     * for an unknown reason, the unmarshalled CS object is empty.</div>
+     * for an unknown reason, the unmarshalled CS object is empty.
      *
      * @see <a href="http://issues.apache.org/jira/browse/SIS-166">SIS-166</a>
      */
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
index bdc2ec248f..23f3b2b957 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
@@ -74,9 +74,9 @@ import static org.apache.sis.internal.util.Constants.CRS84;
  * <b>Example:</b> the following code gets a two-dimensional geographic CRS
  * using the <cite>World Geodetic System 1984</cite> datum:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     GeodeticDatum datum = CommonCRS.WGS84.geographic();
- * }
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself),
@@ -278,10 +278,11 @@ public class DefaultGeographicCRS extends DefaultGeodeticCRS implements Geograph
     /**
      * Formats this CRS as a <cite>Well Known Text</cite> {@code GeodeticCRS[…]} element.
      *
-     * <div class="note"><b>Example:</b> Well-Known Text (version 2)
+     * <h4>Example</h4>
+     * Well-Known Text (version 2)
      * of a geographic coordinate reference system using the WGS 84 datum.
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   GeodeticCRS["WGS 84",
      *      Datum["World Geodetic System 1984",
      *        Ellipsoid["WGS84", 6378137.0, 298.257223563, LengthUnit["metre", 1]]],
@@ -294,11 +295,11 @@ public class DefaultGeographicCRS extends DefaultGeodeticCRS implements Geograph
      *      BBox[-90.00, -180.00, 90.00, 180.00],
      *      Scope["Used by GPS satellite navigation system."],
      *      Id["EPSG", 4326, Citation["IOGP"], URI["urn:ogc:def:crs:EPSG::4326"]]]
-     * }
+     *   }
      *
      * <p>Same coordinate reference system using WKT 1.</p>
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   GEOGCS["WGS 84",
      *      DATUM["World Geodetic System 1984",
      *        SPHEROID["WGS84", 6378137.0, 298.257223563]],
@@ -307,9 +308,9 @@ public class DefaultGeographicCRS extends DefaultGeodeticCRS implements Geograph
      *      AXIS["Latitude", NORTH],
      *      AXIS["Longitude", EAST],
      *      AUTHORITY["EPSG", "4326"]]
-     * }
-     * </div>
+     *   }
      *
+     * @param  formatter  the formatter where to format the inner content of this WKT element.
      * @return {@code "GeodeticCRS"} (WKT 2) or {@code "GeogCS"} (WKT 1).
      *
      * @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html#49">WKT 2 specification §8</a>
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
index c7b5cb3bac..a05830e454 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
@@ -292,14 +292,14 @@ public class DefaultImageCRS extends AbstractCRS implements ImageCRS {
      * Used by JAXB only (invoked by reflection).
      * Only one of {@code getCartesianCS()} and {@link #getAffineCS()} can return a non-null value.
      *
-     * <div class="note"><b>Implementation note:</b>
+     * <h4>Implementation note</h4>
      * The usual way to handle {@code <xs:choice>} with JAXB is to annotate a single method like below:
      *
-     * {@preformat java
-     *     &#64;Override
-     *     &#64;XmlElements({
-     *       &#64;XmlElement(name = "cartesianCS", type = DefaultCartesianCS.class),
-     *       &#64;XmlElement(name = "affineCS",    type = DefaultAffineCS.class)
+     * {@snippet lang="java" :
+     *     @Override
+     *     @XmlElements({
+     *       @XmlElement(name = "cartesianCS", type = DefaultCartesianCS.class),
+     *       @XmlElement(name = "affineCS",    type = DefaultAffineCS.class)
      *     })
      *     public AffineCS getCoordinateSystem() {
      *         return super.getCoordinateSystem();
@@ -307,7 +307,7 @@ public class DefaultImageCRS extends AbstractCRS implements ImageCRS {
      * }
      *
      * However, our attempts to apply this approach worked for {@code DefaultParameterValue} but not for this class:
-     * for an unknown reason, the unmarshalled CS object is empty.</div>
+     * for an unknown reason, the unmarshalled CS object is empty.
      *
      * @see <a href="http://issues.apache.org/jira/browse/SIS-166">SIS-166</a>
      */
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
index 09356d81a1..192d8d58d6 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
@@ -312,10 +312,11 @@ public class DefaultProjectedCRS extends AbstractDerivedCRS<Projection> implemen
     /**
      * Formats the inner part of the <cite>Well Known Text</cite> (WKT) representation of this CRS.
      *
-     * <div class="note"><b>Example:</b> Well-Known Text (version 2)
+     * <h4>Example</h4>
+     * Well-Known Text (version 2)
      * of a projected coordinate reference system using the Lambert Conformal method.
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   ProjectedCRS[“NTF (Paris) / Lambert zone II”,
      *     BaseGeodCRS[“NTF (Paris)”,
      *       Datum[“Nouvelle Triangulation Francaise”,
@@ -333,11 +334,11 @@ public class DefaultProjectedCRS extends AbstractDerivedCRS<Projection> implemen
      *       Axis[“Northing (N)”, north, Order[2]],
      *       LengthUnit[“metre”, 1],
      *     Id[“EPSG”, 27572, Citation[“IOGP”], URI[“urn:ogc:def:crs:EPSG::27572”]]]
-     * }
+     *   }
      *
      * <p>Same coordinate reference system using WKT 1.</p>
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   PROJCS[“NTF (Paris) / Lambert zone II”,
      *     GEOGCS[“NTF (Paris)”,
      *       DATUM[“Nouvelle Triangulation Francaise”,
@@ -356,9 +357,9 @@ public class DefaultProjectedCRS extends AbstractDerivedCRS<Projection> implemen
      *     AXIS[“Easting”, EAST],
      *     AXIS[“Northing”, NORTH],
      *     AUTHORITY[“EPSG”, “27572”]]
-     * }
-     * </div>
+     *   }
      *
+     * @param  formatter  the formatter where to format the inner content of this WKT element.
      * @return {@code "ProjectedCRS"} (WKT 2) or {@code "ProjCS"} (WKT 1).
      *
      * @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html#57">WKT 2 specification §9</a>
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
index 94d8581031..b48ef85eea 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
@@ -508,19 +508,20 @@ public class AbstractCS extends AbstractIdentifiedObject implements CoordinateSy
      * the {@code CS[…]} element for historical reasons. Axes shall be formatted by the enclosing
      * element (usually an {@link org.apache.sis.referencing.crs.AbstractCRS}).
      *
-     * <div class="note"><b>Example:</b> Well-Known Text of a two-dimensional {@code EllipsoidalCS}
+     * <h4>Example</h4>
+     * Well-Known Text of a two-dimensional {@code EllipsoidalCS}
      * having (φ,λ) axes in a unit defined by the enclosing CRS (usually degrees).
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   CS[ellipsoidal, 2],
      *   Axis["latitude", north],
      *   Axis["longitude", east]
      * }
-     * </div>
      *
-     * <div class="note"><b>Compatibility note:</b>
-     * {@code CS} is defined in the WKT 2 specification only.</div>
+     * <h4>Compatibility note</h4>
+     * {@code CS} is defined in the WKT 2 specification only.
      *
+     * @param  formatter  the formatter where to format the inner content of this WKT element.
      * @return {@code "CS"}.
      *
      * @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html#36">WKT 2 specification §7.5</a>
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java
index b437269198..1898faa92a 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java
@@ -68,12 +68,12 @@ public interface AxisFilter {
      * Returns a replacement for the given axis direction.
      * The default implementation unconditionally returns the given {@code direction} unchanged.
      *
-     * <div class="note"><b>Example:</b>
-     * for forcing the direction of the <var>z</var> axis toward up while leaving other axes unchanged,
+     * <h4>Example</h4>
+     * For forcing the direction of the <var>z</var> axis toward up while leaving other axes unchanged,
      * one can write:
      *
-     * {@preformat java
-     *     &#64;Override
+     * {@snippet lang="java" :
+     *     @Override
      *     public getDirectionReplacement(CoordinateSystemAxis axis, AxisDirection direction) {
      *         if (direction == AxisDirection.DOWN) {
      *             direction = AxisDirection.UP;
@@ -81,7 +81,6 @@ public interface AxisFilter {
      *         return direction;
      *     }
      * }
-     * </div>
      *
      * @param  axis       the axis for which to change axis direction, if desired.
      * @param  direction  the original axis direction.
@@ -97,12 +96,12 @@ public interface AxisFilter {
      * Returns a replacement for the given axis unit.
      * The default implementation unconditionally returns the given {@code unit} unchanged.
      *
-     * <div class="note"><b>Example:</b>
-     * for replacing all angular units of a coordinate system to degrees (regardless what the original
+     * <h4>Example</h4>
+     * For replacing all angular units of a coordinate system to degrees (regardless what the original
      * angular units were) while leaving other kinds of units unchanged, one can write:
      *
-     * {@preformat java
-     *     &#64;Override
+     * {@snippet lang="java" :
+     *     @Override
      *     public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, Unit<?> unit) {
      *         if (Units.isAngular(unit)) {
      *             unit = Units.DEGREE;
@@ -110,7 +109,6 @@ public interface AxisFilter {
      *         return unit;
      *     }
      * }
-     * </div>
      *
      * @param  axis  the axis for which to change unit, if desired.
      * @param  unit  the original axis unit.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
index f259026dac..857dadb5e4 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
@@ -439,14 +439,14 @@ next:   for (final CoordinateSystem cs : targets) {
      * Returns a coordinate system derived from the given one but with a modified list of axes.
      * The axes may be filtered (excluding some axes), reordered or have their unit and direction modified.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * for replacing all angular units of a coordinate system to degrees (regardless what the original
      * angular units were) while leaving other kinds of units unchanged, one can write:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     CoordinateSystem cs = ...;
      *     cs = CoordinateSystems.replaceAxes(cs, new AxisFilter() {
-     *         &#64;Override
+     *         @Override
      *         public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, Unit<?> unit) {
      *             if (Units.isAngular(unit)) {
      *                 unit = Units.DEGREE;
@@ -454,21 +454,21 @@ next:   for (final CoordinateSystem cs : targets) {
      *             return unit;
      *         }
      *     });
-     * }</div>
+     *     }
      *
      * <h4>Coordinate system normalization</h4>
      * This method is often used together with {@link #swapAndScaleAxes swapAndScaleAxes(…)} for normalizing the
      * coordinate values given to a {@linkplain org.apache.sis.referencing.operation.transform.AbstractMathTransform
      * math transform}.
      *
-     * <div class="note"><b>Example:</b>
-     * {@preformat java
+     * <h4>Example</h4>
+     * {@snippet lang="java" :
      *     CoordinateSystem sourceCS = ...;
      *     CoordinateSystem targetCS = ...;
      *     Matrix step1 = swapAndScaleAxes(sourceCS, replaceAxes(sourceCS, AxisConvention.NORMALIZED));
      *     Matrix step2 = ...; // some transform working on coordinates with standard axis order and unit.
      *     Matrix step3 = swapAndScaleAxes(replaceAxes(targetCS, AxisConvention.NORMALIZED), targetCS);
-     * }</div>
+     *     }
      *
      * A rational for normalized axis order and units is explained in the <cite>Axis units and direction</cite> section
      * in the description of the {@linkplain org.apache.sis.referencing.operation.projection map projection package}.
@@ -511,13 +511,13 @@ next:   for (final CoordinateSystem cs : targets) {
      * Non-linear units (e.g. angular or scale units) are left unchanged.
      *
      * <p>This convenience method is equivalent to the following code:</p>
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return CoordinateSystems.replaceAxes(cs, new AxisFilter() {
-     *         &#64;Override public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, Unit<?> unit) {
+     *         @Override public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, Unit<?> unit) {
      *             return Units.isLinear(unit) ? newUnit : unit;
      *         }
      *     });
-     * }
+     *     }
      *
      * @param  cs       the coordinate system in which to replace linear units, or {@code null}.
      * @param  newUnit  the new linear unit.
@@ -542,13 +542,13 @@ next:   for (final CoordinateSystem cs : targets) {
      * Non-angular units (e.g. linear or scale units) are left unchanged.
      *
      * <p>This convenience method is equivalent to the following code:</p>
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return CoordinateSystems.replaceAxes(cs, new AxisFilter() {
-     *         &#64;Override public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, Unit<?> unit) {
+     *         @Override public Unit<?> getUnitReplacement(CoordinateSystemAxis axis, Unit<?> unit) {
      *             return Units.isAngular(unit) ? newUnit : unit;
      *         }
      *     });
-     * }
+     *     }
      *
      * @param  cs       the coordinate system in which to replace angular units, or {@code null}.
      * @param  newUnit  the new angular unit.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
index 40e4749e41..09529a759f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
@@ -786,19 +786,19 @@ public abstract class DatumShiftGrid<C extends Quantity<C>, T extends Quantity<T
      * So the period to add or remove is the number of cells that the grid would have if it was spanning 360° of
      * longitude.</p>
      *
-     * <div class="note"><b>Example:</b>
-     * if longitude values are mapped to {@code gridX} coordinates (in dimension 0), and if a shift of 360° in
+     * <h4>Example</h4>
+     * If longitude values are mapped to {@code gridX} coordinates (in dimension 0), and if a shift of 360° in
      * longitude values is equivalent to a shift of {@code periodX} cells in the grid, then this method can be
      * implemented as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     private final double periodX = ...;      // Number of grid cells in 360° of longitude.
      *
-     *     &#64;Override
+     *     @Override
      *     protected void replaceOutsideGridCoordinates(double[] gridCoordinates) {
      *         gridCoordinates[0] = Math.IEEEremainder(gridCoordinates[0], periodX);
      *     }
-     * }</div>
+     * }
      *
      * This method receives all grid coordinates in the {@code gridCoordinates} argument and can modify any
      * of them, possibly many at once. The reason is because a shift of 360° of longitude (for example) may
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
index ec98e279be..aee602ef93 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
@@ -93,9 +93,9 @@ import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
  *
  * <b>Example:</b> the following code gets the WGS84 ellipsoid:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Ellipsoid e = CommonCRS.WGS84.ellipsoid();
- * }
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
index 4ee9e84a07..61da37db7a 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
@@ -116,9 +116,9 @@ import static org.apache.sis.internal.referencing.WKTUtilities.toFormattable;
  *
  * <b>Example:</b> the following code gets a <cite>World Geodetic System 1984</cite> datum:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     GeodeticDatum datum = CommonCRS.WGS84.datum();
- * }
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself),
@@ -622,22 +622,22 @@ public class DefaultGeodeticDatum extends AbstractDatum implements GeodeticDatum
     /**
      * Formats this datum as a <cite>Well Known Text</cite> {@code Datum[…]} element.
      *
-     * <div class="note"><b>Example:</b> Well-Known Text of a WGS 84 datum.
+     * <h4>Example</h4>
+     * Well-Known Text of a WGS 84 datum.
      *
-     * {@preformat wkt
-     *      Datum["World Geodetic System 1984",
-     *        Ellipsoid["WGS84", 6378137.0, 298.257223563, LengthUnit["metre", 1]],
-     *      Id["EPSG", 6326, Citation["IOGP"], URI["urn:ogc:def:datum:EPSG::6326"]]]
-     * }
+     * {@snippet lang="wkt" :
+     *   Datum["World Geodetic System 1984",
+     *     Ellipsoid["WGS84", 6378137.0, 298.257223563, LengthUnit["metre", 1]],
+     *   Id["EPSG", 6326, Citation["IOGP"], URI["urn:ogc:def:datum:EPSG::6326"]]]
+     *   }
      *
      * <p>Same datum using WKT 1.</p>
      *
-     * {@preformat wkt
-     *      DATUM["World Geodetic System 1984"
-     *        SPHEROID["WGS84", 6378137.0, 298.257223563],
-     *      AUTHORITY["EPSG", "6326"]]
-     * }
-     * </div>
+     * {@snippet lang="wkt" :
+     *   DATUM["World Geodetic System 1984"
+     *     SPHEROID["WGS84", 6378137.0, 298.257223563],
+     *   AUTHORITY["EPSG", "6326"]]
+     *   }
      *
      * Note that the {@linkplain #getPrimeMeridian() prime meridian} shall be formatted by the caller
      * as a separated element after the geodetic datum (for compatibility with WKT 1).
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
index d13e602c7b..c98aaf2cfb 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
@@ -71,9 +71,9 @@ import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
  *
  * <b>Example:</b> the following code gets the Greenwich prime meridian:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     PrimeMeridian pm = CommonCRS.WGS84.primeMeridian();
- * }
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
@@ -227,9 +227,9 @@ public class DefaultPrimeMeridian extends AbstractIdentifiedObject implements Pr
      * This convenience method makes it easier to obtain longitude in decimal degrees using the following
      * code, regardless of the underlying angular units of this prime meridian:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     double longitudeInDegrees = primeMeridian.getGreenwichLongitude(Units.DEGREE);
-     * }
+     *     }
      *
      * @param  unit  the unit in which to express longitude.
      * @return the Greenwich longitude in the given units.
@@ -312,7 +312,7 @@ public class DefaultPrimeMeridian extends AbstractIdentifiedObject implements Pr
      * of an {@code AbstractDerivedCRS}. In such case, base CRS coordinate system axes shall not be formatted, which
      * has the consequence of bringing the {@code UNIT[…]} element right below the {@code PRIMEM[…]} one. Example:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   ProjectedCRS[“NTF (Paris) / Lambert zone II”,
      *     BaseGeodCRS[“NTF (Paris)”,
      *       Datum[“Nouvelle Triangulation Francaise”,
@@ -321,7 +321,7 @@ public class DefaultPrimeMeridian extends AbstractIdentifiedObject implements Pr
      *       AngleUnit[“grad”, 0.015707963267948967]],
      *     Conversion[“Lambert zone II”,
      *       etc...
-     * }
+     *   }
      *
      * If we were not formatting a base CRS, we would have many lines between {@code PrimeMeridian[…]} and
      * {@code AngleUnit[…]} in the above example, which would make less obvious that the angle unit applies
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
index 942e22bfd3..7be27c2d69 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
@@ -60,9 +60,9 @@ import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
  *
  * <b>Example:</b> the following code gets a temporal datum having its origin at January 1st, 4713 BC at 12:00 UTC:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     TemporalDatum datum = CommonCRS.Temporal.JULIAN.datum();
- * }
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
index d1ee13c462..a5cfc6fcd1 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
@@ -62,9 +62,9 @@ import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
  *
  * <b>Example:</b> the following code gets a vertical datum for height above the geoid:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     VerticalDatum datum = CommonCRS.Vertical.GEOID.datum();
- * }
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
index 6a41667ee6..7303869eef 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
@@ -45,16 +45,16 @@ import org.apache.sis.internal.util.Strings;
  * It may also be used as a workaround for authority factories that do not implement the {@code createObject(String)}
  * method.</p>
  *
- * <div class="note"><b>Example:</b>
- * the following code creates a proxy which will delegates its work to the
+ * <h2>Example</h2>
+ * The following code creates a proxy which will delegates its work to the
  * {@link GeodeticAuthorityFactory#createGeographicCRS createGeographicCRS} method.
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     String code = ...;
  *     AuthorityFactory factory = ...;
  *     AuthorityFactoryProxy proxy = AuthorityFactoryProxy.getInstance(GeographicCRS.class);
  *     GeographicCRS crs = proxy.create(factory, code); // Invokes factory.createGeographicCRS(code);
- * }</div>
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
index ba8cf41646..3c5537d2fe 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
@@ -1819,14 +1819,14 @@ public abstract class ConcurrentAuthorityFactory<DAO extends GeodeticAuthorityFa
          * The {@link #release()} method must be invoked in a {@code finally} block after the call to {@code acquire}.
          * The pattern must be as below (note that the call to {@code acquire()} is inside the {@code try} block):
          *
-         * {@preformat java
+         * {@snippet lang="java" :
          *     try {
          *         acquire();
          *         (finder or proxy).doSomeStuff();
          *     } finally {
          *         release();
          *     }
-         * }
+         *     }
          */
         private void acquire() throws FactoryException {
             assert Thread.holdsLock(this);
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
index 130abbc8ec..8089641574 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
@@ -1590,10 +1590,11 @@ public class GeodeticObjectFactory extends AbstractFactory implements CRSFactory
      * This method understands both version 1 (a.k.a. OGC 01-009) and version 2 (a.k.a. ISO 19162)
      * of the WKT format.
      *
-     * <div class="note"><b>Example:</b> below is a slightly simplified WKT 2 string for a Mercator projection.
+     * <h4>Example</h4>
+     * Below is a slightly simplified WKT 2 string for a Mercator projection.
      * For making this example smaller, some optional {@code UNIT[…]} and {@code ORDER[…]} elements have been omitted.
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   ProjectedCRS["SIRGAS 2000 / Brazil Mercator",
      *     BaseGeodCRS["SIRGAS 2000",
      *       Datum["Sistema de Referencia Geocentrico para las Americas 2000",
@@ -1609,9 +1610,9 @@ public class GeodeticObjectFactory extends AbstractFactory implements CRSFactory
      *       Axis["northing (N)", north],
      *       LengthUnit["metre", 1],
      *     Id["EPSG",5641]]
-     * }
-     * </div>
+     *   }
      *
+     * <h4>Logging</h4>
      * If the given text contains non-fatal anomalies
      * (unknown or unsupported WKT elements, inconsistent unit definitions, unparsable axis abbreviations, <i>etc.</i>),
      * warnings may be reported in a {@linkplain java.util.logging.Logger logger} named {@code "org.apache.sis.io.wkt"}.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java
index 5c6ad247c7..2e5a538f88 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java
@@ -41,17 +41,17 @@ import org.apache.sis.referencing.factory.IdentifiedObjectSet;
  *       Those conversions are obtained by a SQL query like below (note that this query can return at most
  *       one result, because {@code COORD_REF_SYS_CODE} is a primary key):
  *
- *       {@preformat sql
+ *       {@snippet lang="sql" :
  *         SELECT PROJECTION_CONV_CODE FROM "Coordinate Reference System" WHERE SOURCE_GEOGCRS_CODE = ? AND COORD_REF_SYS_CODE = ?
- *       }
+ *         }
  *   </li>
  *
  *   <li>The coordinate operation may be standalone. This is the case of coordinate transformations having stochastic errors.
  *       Those transformations are obtained by a SQL query like below (note that this query can return many results):
  *
- *       {@preformat sql
+ *       {@snippet lang="sql" :
  *         SELECT COORD_OP_CODE FROM "Coordinate_Operation" … WHERE … AND SOURCE_CRS_CODE = ? AND TARGET_CRS_CODE = ?
- *       }
+ *         }
  *   </li>
  * </ol>
  *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
index b2eebd81bd..d7d6a4c222 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
@@ -161,10 +161,10 @@ final class EPSGCodeFinder extends IdentifiedObjectFinder {
      * A condition to put in a SQL {@code WHERE} clause. SQL query will be one of the forms shown below,
      * where {@code <column>} and {@code <values>} are {@link #column} and {@link #values} respectively.
      *
-     * {@preformat sql
+     * {@snippet lang="sql" :
      *     SELECT <codeColumn> FROM <table> WHERE <column> IN (<values>)
      *     SELECT <codeColumn> FROM <table> WHERE <column> >= <value - ε> AND <column> <= <value + ε>
-     * }
+     *     }
      *
      * The latter form is used if {@code <filters>} is a floating point value.
      * Otherwise, {@code <filters>} are typically EPSG codes of dependencies.
@@ -521,9 +521,9 @@ crs:    if (isInstance(CoordinateReferenceSystem.class, object)) {
      * Appends to the given buffer the SQL statement for filtering datum names using a pattern created by
      * {@link #toDatumPattern(String, StringBuilder)}. This method append a SQL fragment like below:
      *
-     * {@preformat sql
+     * {@snippet lang="sql" :
      *     (LOWER(<column>) LIKE '<pattern>' OR …)
-     * }
+     *     }
      *
      * This method assumes that {@code namePatterns} contains at least one element.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index f9a24349b0..29de4e764f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@ -511,9 +511,9 @@ addURIs:    for (int i=0; ; i++) {
      * This returned set may keep a connection to the EPSG database,
      * so the set can execute efficiently idioms like the following one:
      *
-     * {@preformat java
-     *     getAuthorityCodes(type).containsAll(others)
-     * }
+     * {@snippet lang="java" :
+     *     getAuthorityCodes(type).containsAll(others);
+     *     }
      *
      * The returned set should not be referenced for a long time, as it may prevent this factory to release
      * JDBC resources. If the set of codes is needed for a long time, their values should be copied in another
@@ -1030,14 +1030,14 @@ codes:  for (int i=0; i<codes.length; i++) {
      * Ensures that this factory is not already building an object of the given code.
      * This method shall be followed by a {@code try ... finally} block like below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     ensureNoCycle(type, code);
      *     try {
      *         ...
      *     } finally {
      *         endOfRecursive(type, code);
      *     }
-     * }
+     *     }
      */
     private void ensureNoCycle(final Class<?> type, final Integer code) throws FactoryException {
         if (safetyGuard.putIfAbsent(code, type) != null) {
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
index f69e253222..992a9a7823 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
@@ -504,9 +504,9 @@ public class EPSGFactory extends ConcurrentAuthorityFactory<EPSGDataAccess> impl
      * wanting to return instances of their own {@link EPSGDataAccess} subclass.
      * The default implementation is simply:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return new EPSGDataAccess(this, connection, translator);
-     * }
+     *     }
      *
      * Subclasses can override this method with a similar code but with {@code new EPSGDataAccess(…)} replaced
      * by {@code new MyDataAccessSubclass(…)}.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
index f377a06fb8..6b7c9e097c 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
@@ -56,10 +56,10 @@ final class EPSGInstaller extends ScriptRunner {
      * The pattern for an {@code "UPDATE … SET … REPLACE"} instruction.
      * Example:
      *
-     * {@preformat sql
+     * {@snippet lang="sql" :
      *     UPDATE epsg_datum
      *     SET datum_name = replace(datum_name, CHAR(182), CHAR(10));
-     * }
+     *     }
      *
      * Note: this regular expression use a capturing group.
      */
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
index 516152c8db..ba2c16efc6 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
@@ -234,28 +234,26 @@ public abstract class InstallationScriptProvider extends InstallationResources {
      * This method is invoked by the default implementation of {@link #openScript(String, int)}
      * for all scripts except {@link #PREPARE} and {@link #FINISH}.
      *
-     * <div class="note"><b>Example 1:</b>
+     * <h4>Example 1</h4>
      * if this {@code InstallationScriptProvider} instance gets the SQL scripts from files in a well-known directory
      * and if the names given at {@linkplain #InstallationScriptProvider(String, String...) construction time} are the
      * filenames in that directory, then this method can be implemented as below:
      *
-     * {@preformat java
-     *    protected InputStream openStream(String name) throws IOException {
-     *        return Files.newInputStream(directory.resolve(name));
-     *    }
+     * {@snippet lang="java" :
+     *      protected InputStream openStream(String name) throws IOException {
+     *          return Files.newInputStream(directory.resolve(name));
+     *      }
      * }
-     * </div>
      *
-     * <div class="note"><b>Example 2:</b>
+     * <h4>Example 2</h4>
      * if this {@code InstallationScriptProvider} instance rather gets the SQL scripts from resources bundled
      * in the same JAR files than and in the same package, then this method can be implemented as below:
      *
-     * {@preformat java
-     *    protected InputStream openStream(String name) {
-     *        return MyClass.getResourceAsStream(name);
-     *    }
+     * {@snippet lang="java" :
+     *      protected InputStream openStream(String name) {
+     *          return MyClass.getResourceAsStream(name);
+     *      }
      * }
-     * </div>
      *
      * @param  name  name of the script file to open. Can be {@code null} if the resource is not found.
      * @return an input stream opened of the given script file.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/TableInfo.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/TableInfo.java
index 4df3c3a943..14d2096ebc 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/TableInfo.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/TableInfo.java
@@ -257,9 +257,9 @@ final class TableInfo {
      * if such condition can be added. The clause appended by this method looks like the following example
      * (details may vary because of enumeration values):
      *
-     * {@preformat sql
-     *   WHERE COORD_REF_SYS_KIND LIKE 'geographic%' AND
-     * }
+     * {@snippet lang="sql" :
+     *     WHERE COORD_REF_SYS_KIND LIKE 'geographic%' AND
+     *     }
      *
      * In any case, the caller shall add at least one condition after this method call.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
index 48e30c93de..7e3e3ba96f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
@@ -933,11 +933,11 @@ check:      for (int isTarget=0; ; isTarget++) {        // 0 == source check; 1
      * allows a subset of coordinate operations with the ESRI-specific {@code GEOGTRAN} keyword.
      * To enabled this variant, {@link org.apache.sis.io.wkt.WKTFormat} can be configured as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     format = new WKTFormat(null, null);
      *     format.setConvention(Convention.WKT1_IGNORE_AXES);
      *     format.setNameAuthority(Citations.ESRI);
-     * }
+     *     }
      *
      * @param  formatter  the formatter to use.
      * @return {@code "CoordinateOperation"}.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
index 5aa369fa38..af2235e161 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
@@ -836,9 +836,9 @@ next:   for (int i=components.size(); --i >= 0;) {
      * CoordinateOperationContext) createOperation(…)} when no operation was found in the cache.
      * The default implementation is straightforward:
      *
-     * {@preformat java
-     *   return new CoordinateOperationFinder(registry, this, context);
-     * }
+     * {@snippet lang="java" :
+     *     return new CoordinateOperationFinder(registry, this, context);
+     *     }
      *
      * Subclasses can override this method is they want to modify the way coordinate operations are inferred.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
index 86e0d10ca0..181f6c13e9 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
@@ -904,19 +904,20 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements
      * <p>However, it could happen that the user really wanted to specify a {@code ParameterDescriptorGroup} as
      * the sole {@code <gml:parameter>} element. We currently have no easy way to distinguish those cases.</p>
      *
-     * <div class="note"><b>Tip:</b>
+     * <h4>Tip</h4>
      * One possible way to distinguish the two cases would be to check that the parameter group does not contain
      * any property that this method does not have:
      *
-     * {@preformat java
-     *   if (IdentifiedObjects.getProperties(this).entrySet().containsAll(
-     *       IdentifiedObjects.getProperties(parameters).entrySet())) ...
-     * }
+     * {@snippet lang="java" :
+     *     if (IdentifiedObjects.getProperties(this).entrySet().containsAll(
+     *         IdentifiedObjects.getProperties(parameters).entrySet())) ...
+     *     }
      *
      * But we would need to make sure that {@link AbstractSingleOperation#getParameters()} is consistent
-     * with the decision taken by this method.</div>
+     * with the decision taken by this method.
      *
-     * <p><b>Historical note:</b> older, deprecated, names for the parameters were:
+     * <h4>Historical note</h4>
+     * Older, deprecated, names for the parameters were:
      * <ul>
      *   <li>{@code includesParameter}</li>
      *   <li>{@code generalOperationParameter} - note that this name was used by the EPSG repository</li>
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
index d4e804c289..5c8c2b0c81 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
@@ -291,10 +291,10 @@ public class LinearTransformBuilder extends TransformBuilder {
      * <p>If this builder has been created for randomly distributed source points, then the allocation
      * should rather be performed as below:</p>
      *
-     * {@preformat java
-     *    sources = new double[srcDim][capacity];
-     *    targets = new double[tgtDim][capacity];
-     * }
+     * {@snippet lang="java" :
+     *     sources = new double[srcDim][capacity];
+     *     targets = new double[tgtDim][capacity];
+     *     }
      */
     private void allocate(final int tgtDim) {
         targets = new double[tgtDim][gridLength];
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
index 3db9e31e16..c063d92abc 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
@@ -546,16 +546,15 @@ public class LocalizationGridBuilder extends TransformBuilder {
      * and are almost constant when increasing row indices. In such case, the recommended direction is 1 for comparing each
      * value with the value in previous row, since that value should be closer than the value in previous column.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * for a grid of (<var>longitude</var>, <var>latitude</var>) values in decimal degrees where longitude values
      * vary (increase or decrease) with increasing column indices and latitude values vary (increase or decrease)
      * with increasing row indices, the the following method should be invoked for protecting the grid against
      * discontinuities on anti-meridian:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     grid.resolveWraparoundAxis(0, 1, 360);
-     * }
-     * </div>
+     *     }
      *
      * @param  dimension  the dimension to process.
      *                    This is 0 for longitude dimension in a (<var>longitudes</var>, <var>latitudes</var>) grid.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java
index 768058e244..ebea8bef36 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java
@@ -210,9 +210,9 @@ public final class AffineTransforms2D extends Static {
      * This operation is equivalent to the following code, except that it can reuse the
      * given {@code dest} rectangle and is potentially more efficient:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return transform.createTransformedShape(bounds).getBounds2D();
-     * }
+     *     }
      *
      * Note that if the given rectangle is an image bounds, then the given transform shall map the
      * <strong>upper-left corner</strong> of pixels (as in Java2D usage), not the center of pixels
@@ -259,9 +259,9 @@ public final class AffineTransforms2D extends Static {
      * This operation is equivalent to the following code, except that it can reuse the
      * given {@code dest} rectangle and is potentially more efficient:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return createInverse().createTransformedShape(bounds).getBounds2D();
-     * }
+     *     }
      *
      * @param  transform  the affine transform to use.
      * @param  bounds     the rectangle to transform, or {@code null}.
@@ -392,7 +392,7 @@ public final class AffineTransforms2D extends Static {
      * The example below choose to apply the sign on the <var>y</var> scale, but this is an arbitrary
      * (while common) choice:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     double scaleX0 = getScaleX0(transform);
      *     double scaleY0 = getScaleY0(transform);
      *     int    flip    = getFlip(transform);
@@ -400,14 +400,14 @@ public final class AffineTransforms2D extends Static {
      *         scaleY0 *= flip;
      *         // ... continue the process here.
      *     }
-     * }
+     *     }
      *
      * This method is similar to the following code, except that this method distinguishes
      * between "unflipped" and "unknown" states.
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     boolean flipped = (tr.getType() & TYPE_FLIP) != 0;
-     * }
+     *     }
      *
      * @param  transform  the affine transform to inspect.
      * @return -1 if an axis has been flipped, +1 if no flipping, or 0 if unknown.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
index 6ba7a811a9..5f0a039c0a 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
@@ -336,11 +336,11 @@ public final class Matrices extends Static {
      * envelope of size 300 × 500, and given {@linkplain Envelope#getLowerCorner() lower corner} translation
      * from (-20, -40) to (-10, -25), then the following method call:
      *
-     * {@preformat java
-     *   matrix = Matrices.createTransform(
-     *           new Envelope2D(null, -20, -40, 100, 200),
-     *           new Envelope2D(null, -10, -25, 300, 500));
-     * }
+     * {@snippet lang="java" :
+     *     matrix = Matrices.createTransform(
+     *             new Envelope2D(null, -20, -40, 100, 200),
+     *             new Envelope2D(null, -10, -25, 300, 500));
+     *     }
      *
      * will return the following square matrix. The transform of the lower corner is given as an example:
      *
@@ -413,11 +413,11 @@ public final class Matrices extends Static {
      * <h4>Example</h4>
      * The following method call:
      *
-     * {@preformat java
-     *   matrix = Matrices.createTransform(
-     *           new AxisDirection[] {AxisDirection.NORTH, AxisDirection.WEST},
-     *           new AxisDirection[] {AxisDirection.EAST, AxisDirection.NORTH});
-     * }
+     * {@snippet lang="java" :
+     *     matrix = Matrices.createTransform(
+     *             new AxisDirection[] {AxisDirection.NORTH, AxisDirection.WEST},
+     *             new AxisDirection[] {AxisDirection.EAST, AxisDirection.NORTH});
+     *     }
      *
      * will return the following square matrix, which can be used in coordinate conversions as below:
      *
@@ -476,11 +476,11 @@ public final class Matrices extends Static {
      * <div class="note"><b>Example:</b>
      * combining the examples documented in the above {@code createTransform(…)} methods, the following method call:
      *
-     * {@preformat java
-     *   matrix = Matrices.createTransform(
-     *           new Envelope2D(null, -40, +20, 200, 100), new AxisDirection[] {AxisDirection.NORTH, AxisDirection.WEST},
-     *           new Envelope2D(null, -10, -25, 300, 500), new AxisDirection[] {AxisDirection.EAST, AxisDirection.NORTH});
-     * }
+     * {@snippet lang="java" :
+     *     matrix = Matrices.createTransform(
+     *             new Envelope2D(null, -40, +20, 200, 100), new AxisDirection[] {AxisDirection.NORTH, AxisDirection.WEST},
+     *             new Envelope2D(null, -10, -25, 300, 500), new AxisDirection[] {AxisDirection.EAST, AxisDirection.NORTH});
+     *     }
      *
      * will return the following square matrix. The transform of a corner is given as an example.
      * Note that the input coordinate values are swapped because of the (<i>North</i>, <i>West</i>) axis directions,
@@ -537,9 +537,9 @@ public final class Matrices extends Static {
      * and discard the <var>z</var> values, then the indices of source coordinates to select are 1 for <var>y</var>,
      * 0 for <var>x</var> and 3 for <var>t</var>. One can use the following method call:
      *
-     * {@preformat java
-     *   matrix = Matrices.createDimensionSelect(4, new int[] {1, 0, 3});
-     * }
+     * {@snippet lang="java" :
+     *     matrix = Matrices.createDimensionSelect(4, new int[] {1, 0, 3});
+     *     }
      *
      * The above method call will create the following 4×5 matrix,
      * which can be used for converting coordinates as below:
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
index bd05331858..9fabeea73e 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
@@ -406,9 +406,9 @@ public abstract class MatrixSIS implements Matrix, LenientComparable, Cloneable,
      * Returns {@code true} if this matrix is an identity matrix.
      * This method is equivalent to the following code, except that it is potentially more efficient:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return Matrices.isIdentity(this, 0.0);
-     * }
+     *     }
      *
      * @return {@code true} if this matrix is an identity matrix.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Solver.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Solver.java
index cd497439ac..046155ae25 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Solver.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Solver.java
@@ -160,7 +160,7 @@ final class Solver implements Matrix {                          // Not Cloneable
      * <p>This method does <strong>not</strong> checks the matrix size.
      * Check for matrix size shall be performed by the caller like below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     final int size = X.getNumRow();
      *     if (X.getNumCol() != size) {
      *         throw new NoninvertibleMatrixException("Matrix must be square.");
@@ -168,7 +168,7 @@ final class Solver implements Matrix {                          // Not Cloneable
      *     if (Y.getNumRow() != size) {
      *         throw new MismatchedMatrixSizeException("Matrix row dimensions must agree.");
      *     }
-     * }
+     *     }
      *
      * @param  X          the matrix to invert, which must be square.
      * @param  Y          the desired result of {@code X} × <var>U</var>.
@@ -304,12 +304,12 @@ searchNaN:  for (int flatIndex = (size - 1) * size; --flatIndex >= 0;) {
      * <p>This method does <strong>not</strong> checks the matrix size.
      * It is caller's responsibility to ensure that the following hold:</p>
      *
-     * {@preformat java
-     *   X.getNumRow() == size;
-     *   X.getNumCol() == size;
-     *   Y.getNumRow() == size;
-     *   Y.getNumCol() == innerSize;
-     * }
+     * {@snippet lang="java" :
+     *     assert X.getNumRow() == size;
+     *     assert X.getNumCol() == size;
+     *     assert Y.getNumRow() == size;
+     *     assert Y.getNumCol() == innerSize;
+     *     }
      *
      * @param  LU         elements of the {@code X} matrix to invert, including error terms.
      * @param  Y          the desired result of {@code X} × <var>U</var>.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
index 9f4113fc0e..6ac4162cbc 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
@@ -129,15 +129,16 @@ public class LambertConicConformal extends ConformalProjection {
      * the normalization matrix which use that precision for "degrees to radians" conversion.
      * The goal is to have cleaner results after matrix inversions and multiplications.
      *
-     * <div class="note"><b>Tip:</b> how to verify the value:
-     * {@preformat java
+     * <h4>Tip</h4>
+     * How to verify the value:
+     *
+     * {@snippet lang="java" :
      *     BigDecimal a = new BigDecimal(BELGE_A.value);
      *     a = a.add     (new BigDecimal(BELGE_A.error));
      *     a = a.multiply(new BigDecimal("57.29577951308232087679815481410517"));
      *     a = a.multiply(new BigDecimal(60 * 60));
      *     System.out.println(a);
-     * }
-     * </div>
+     *     }
      */
     static Number belgeA() {
         return new DoubleDouble(-1.420431363598774E-4, -1.1777378450498224E-20);
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
index 88e25dc746..711a23bad8 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
@@ -510,9 +510,9 @@ public abstract class NormalizedProjection extends AbstractMathTransform2D imple
      * changes in axis order} are <strong>not</strong> managed by the returned transform.
      *
      * <p>The default implementation is as below:</p>
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return getContextualParameters().completeTransform(factory, this);
-     * }
+     *     }
      *
      * Subclasses can override this method if they wish to use alternative implementations under some circumstances.
      * For example, many subclasses will replace {@code this} by a specialized implementation if they detect that the
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
index 917a028f12..edd222a8bf 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
@@ -350,7 +350,7 @@ public abstract class AbstractMathTransform extends FormattableObject
      * derivative at that location. Invoking this method is conceptually equivalent to running
      * the following:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Matrix derivative = null;
      *     if (derivate) {
      *         double[] coordinates = Arrays.copyOfRange(srcPts, srcOff, srcOff + getSourceDimensions());
@@ -358,7 +358,7 @@ public abstract class AbstractMathTransform extends FormattableObject
      *     }
      *     this.transform(srcPts, srcOff, dstPts, dstOff, 1);                   // May overwrite srcPts.
      *     return derivative;
-     * }
+     *     }
      *
      * However, this method provides two advantages:
      *
@@ -941,9 +941,9 @@ public abstract class AbstractMathTransform extends FormattableObject
      * Compares the specified object with this math transform for strict equality.
      * This method is implemented as below (omitting assertions):
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return equals(other, ComparisonMode.STRICT);
-     * }
+     *     }
      *
      * @param  object  the object to compare with this transform.
      * @return {@code true} if the given object is a transform of the same class and using the same parameter values.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
index 132711b340..6c6c7ab617 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
@@ -617,9 +617,9 @@ public class ContextualParameters extends Parameters implements Serializable {
      * Before the call to {@link #completeTransform completeTransform(…)},
      * this method can be used for setting parameter values like below:
      *
-     * {@preformat java
-     *   parameter("Scale factor").setValue(0.9996);   // Scale factor of Universal Transverse Mercator (UTM) projections.
-     * }
+     * {@snippet lang="java" :
+     *     parameter("Scale factor").setValue(0.9996);   // Scale factor of Universal Transverse Mercator (UTM) projections.
+     *     }
      *
      * After the call to {@code completeTransform(…)}, the returned parameters are read-only.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
index f495dfc6cc..8e962271d6 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
@@ -304,13 +304,13 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math
      *   <li>All {@code OperationMethod} instances shall be thread-safe.</li>
      *   <li>The {@code Iterable} itself does not need to be thread-safe since all usages will be synchronized as below:
      *
-     *       {@preformat java
+     *       {@snippet lang="java" :
      *           synchronized (methods) {
      *               for (OperationMethod method : methods) {
      *                   // Use the method here.
      *               }
      *           }
-     *       }
+     *           }
      *   </li>
      * </ul>
      *
@@ -1164,12 +1164,12 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math
      * operation by calling {@link #getDefaultParameters(String)}, then to fill the parameter values.
      * Example:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     ParameterValueGroup group = factory.getDefaultParameters("Transverse_Mercator");
      *     group.parameter("semi_major").setValue(6378137.000);
      *     group.parameter("semi_minor").setValue(6356752.314);
      *     MathTransform mt = factory.createParameterizedTransform(group, null);
-     * }
+     *     }
      *
      * Sometimes the {@code "semi_major"} and {@code "semi_minor"} parameter values are not explicitly provided,
      * but rather inferred from the {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic
@@ -1624,10 +1624,10 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math
      *
      * The resulting transform will have the following dimensions:
      *
-     * {@preformat java
-     *     Source: firstAffectedCoordinate + subTransform.getSourceDimensions() + numTrailingCoordinates
-     *     Target: firstAffectedCoordinate + subTransform.getTargetDimensions() + numTrailingCoordinates
-     * }
+     * {@snippet lang="java" :
+     *     int sourceDim = firstAffectedCoordinate + subTransform.getSourceDimensions() + numTrailingCoordinates;
+     *     int targetDim = firstAffectedCoordinate + subTransform.getTargetDimensions() + numTrailingCoordinates;
+     *     }
      *
      * @param  firstAffectedCoordinate  the lowest index of the affected coordinates.
      * @param  subTransform             transform to use for affected coordinates.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DomainDefinition.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DomainDefinition.java
index 95c5091271..57bdd5eeb0 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DomainDefinition.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DomainDefinition.java
@@ -45,12 +45,12 @@ import org.apache.sis.geometry.GeneralEnvelope;
  * instance, unless that transform is a chain of concatenated transforms (this case is handled automatically
  * by Apache SIS). Usage example:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     AbstractMathTransform transform = …;
  *     transform.getDomain(new DomainDefinition()).ifPresent((domain) -> {
  *         // Do something here with the transform domain.
  *     });
- * }
+ *     }
  *
  * The {@link MathTransforms#getDomain(MathTransform)} convenience method can be used
  * when the default implementation is sufficient.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
index fd0bca751b..fc95be1eca 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
@@ -366,15 +366,15 @@ public class EllipsoidToCentricTransform extends AbstractMathTransform implement
 
     /**
      * Creates a transform from geographic to Cartesian geocentric coordinates (convenience method).
-     * Invoking this method is equivalent to the following:
+     * This method is equivalent to the following:
      *
-     * {@preformat java
-     *     createGeodeticConversion(factory,
+     * {@snippet lang="java" :
+     *     return createGeodeticConversion(factory,
      *             ellipsoid.getSemiMajorAxis(),
      *             ellipsoid.getSemiMinorAxis(),
      *             ellipsoid.getAxisUnit(),
      *             withHeight, TargetType.CARTESIAN);
-     * }
+     *     }
      *
      * The target type is assumed Cartesian because this is the most frequently used target.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
index 933dc4e480..2eae0cddd2 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
@@ -31,7 +31,7 @@ import org.apache.sis.util.ComparisonMode;
  *
  * <blockquote><var>y</var> = {@linkplain #scale}⋅{@linkplain #base}<sup><var>x</var></sup></blockquote>
  *
- * <div class="note"><b>Tip:</b>
+ * <h2>Tip</h2>
  * if a linear transform is applied before this exponential transform, then the equation can be rewritten as:
  * <var>scale</var>⋅<var>base</var><sup><var>a</var> + <var>b</var>⋅<var>x</var></sup> =
  * <var>scale</var>⋅<var>base</var><sup><var>a</var></sup>⋅(<var>base</var><sup><var>b</var></sup>)<sup><var>x</var></sup>
@@ -39,11 +39,10 @@ import org.apache.sis.util.ComparisonMode;
  * It is possible to find back the coefficients of the original linear transform by
  * pre-concatenating a logarithmic transform before the exponential one, as below:
  *
- * {@preformat java
- *   LinearTransform1D linear = MathTransforms.create(exponentialTransform,
- *           LogarithmicTransform1D.create(base, -Math.log(scale) / Math.log(base)));
- * }
- * </div>
+ * {@snippet lang="java" :
+ *     LinearTransform1D linear = MathTransforms.create(exponentialTransform,
+ *             LogarithmicTransform1D.create(base, -Math.log(scale) / Math.log(base)));
+ *     }
  *
  * <h2>Serialization</h2>
  * Serialized instances of this class are not guaranteed to be compatible with future SIS versions.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
index cb8b62351c..7c92fab53f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
@@ -405,15 +405,15 @@ public class InterpolatedGeocentricTransform extends DatumShiftTransform {
      * Computes the derivative by concatenating the "geographic to geocentric" and "geocentric to geographic" matrix,
      * with the {@linkplain #scale} factor between them.
      *
-     * <div class="note"><b>Note:</b>
+     * <h4>Note</h4>
      * we could improve a little bit the precision by computing the derivative in the interpolation grid:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     grid.derivativeInCell(grid.normalizedToGridX(λ), grid.normalizedToGridY(φ));
-     * }
+     *     }
      *
      * But this is a little bit complicated (need to convert to normalized units and divide by the grid
-     * cell size) for a very small difference. For now we neglect that part.</div>
+     * cell size) for a very small difference. For now we neglect that part.
      *
      * @param  m1  the derivative computed by the "geographic to geocentric" conversion.
      * @param  m2  the derivative computed by the "geocentric to geographic" conversion.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IterationStrategy.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IterationStrategy.java
index e750c54944..2b8f4f5922 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IterationStrategy.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IterationStrategy.java
@@ -31,9 +31,9 @@ package org.apache.sis.referencing.operation.transform;
  * The following code gives a skeleton for a {@code AbstractMathTransform} implementation
  * capable to transform an array of {@code double} coordinates:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     public class MyTransform extends AbstractMathTransform {
- *         &#64;Override
+ *         @Override
  *         public void transform(double[] srcPts, int srcOff,
  *                               double[] dstPts, int dstOff, int numPts)
  *         {
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java
index 498f66f09d..7ae2a8c250 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java
@@ -49,7 +49,7 @@ import org.opengis.referencing.operation.MathTransformFactory;
  * While not mandatory, we suggest to extend {@link org.apache.sis.referencing.operation.DefaultOperationMethod}.
  * Example:
  *
- * <div class="note">{@preformat java
+ * {@snippet lang="java" :
  *     public class MyProjectionProvider extends DefaultOperationMethod implements MathTransformProvider {
  *         public MyProjectionProvider() {
  *             super(Map.of(NAME_KEY, "My projection"),
@@ -58,7 +58,7 @@ import org.opengis.referencing.operation.MathTransformFactory;
  *                     parameters);
  *         }
  *
- *         &#64;Override
+ *         @Override
  *         public MathTransform createMathTransform(MathTransformFactory factory, ParameterValueGroup parameters) {
  *             double semiMajor = values.parameter("semi_major").doubleValue(Units.METRE);
  *             double semiMinor = values.parameter("semi_minor").doubleValue(Units.METRE);
@@ -66,14 +66,14 @@ import org.opengis.referencing.operation.MathTransformFactory;
  *             return new MyProjection(semiMajor, semiMinor, ...);
  *         }
  *     }
- * }</div>
+ * }
  *
  * Then the fully-qualified class name of that implementation should be listed in a file reachable on the classpath
  * with this exact name:
  *
- * {@preformat text
+ * {@snippet :
  *     META-INF/services/org.opengis.referencing.operation.OperationMethod
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys, IRD)
  * @version 0.6
@@ -90,11 +90,11 @@ public interface MathTransformProvider {
     /**
      * Creates a math transform from the specified group of parameter values.
      *
-     * <div class="note"><b>Implementation example:</b>
+     * <h4>Implementation example</h4>
      * The following example shows how parameter values can be extracted
      * before to instantiate the transform:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     public MathTransform createMathTransform(MathTransformFactory factory, ParameterValueGroup parameters) {
      *         double semiMajor = values.parameter("semi_major").doubleValue(Units.METRE);
      *         double semiMinor = values.parameter("semi_minor").doubleValue(Units.METRE);
@@ -102,7 +102,6 @@ public interface MathTransformProvider {
      *         return new MyProjection(semiMajor, semiMinor, ...);
      *     }
      * }
-     * </div>
      *
      * <h4>Purpose of the factory argument</h4>
      * Some math transforms may actually be implemented as a chain of operation steps, for example a
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
index 54b7530121..a1c6e2321f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
@@ -332,10 +332,10 @@ public final class MathTransforms extends Static {
      * Creates a transform which passes through a subset of coordinates to another transform.
      * This method returns a transform having the following dimensions:
      *
-     * {@preformat java
-     *     Source: firstAffectedCoordinate + subTransform.getSourceDimensions() + numTrailingCoordinates
-     *     Target: firstAffectedCoordinate + subTransform.getTargetDimensions() + numTrailingCoordinates
-     * }
+     * {@snippet lang="java" :
+     *     int sourceDim = firstAffectedCoordinate + subTransform.getSourceDimensions() + numTrailingCoordinates;
+     *     int targetDim = firstAffectedCoordinate + subTransform.getTargetDimensions() + numTrailingCoordinates;
+     *     }
      *
      * Affected coordinates will range from {@code firstAffectedCoordinate} inclusive to
      * {@code dimTarget - numTrailingCoordinates} exclusive.
@@ -684,12 +684,12 @@ public final class MathTransforms extends Static {
      * is returned. Invoking this method is equivalent to the following code, except that it may
      * execute faster with some {@code MathTransform} implementations:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     DirectPosition ptSrc = ...;
      *     DirectPosition ptDst = ...;
      *     Matrix matrixDst = derivative(ptSrc);
      *     ptDst = transform(ptSrc, ptDst);
-     * }
+     *     }
      *
      * @param  transform  the transform to use.
      * @param  srcPts     the array containing the source coordinate.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
index bca6072735..dcf82654a5 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
@@ -45,15 +45,16 @@ import static org.apache.sis.util.ArgumentChecks.*;
  * Transform which passes through a subset of coordinates to another transform.
  * This allows transforms to operate on a subset of coordinate values.
  *
- * <div class="note"><b>Example:</b> giving (<var>latitude</var>, <var>longitude</var>, <var>height</var>) coordinates,
- * {@code PassThroughTransform} can convert the height values from feet to meters without affecting the latitude and
- * longitude values. Such transform can be built as below:
+ * <h2>Example</h2>
+ * Giving (<var>latitude</var>, <var>longitude</var>, <var>height</var>) coordinates,
+ * {@code PassThroughTransform} can convert the height values from feet to meters
+ * without affecting the latitude and longitude values.
+ * Such transform can be built as below:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     MathTransform feetToMetres = MathTransforms.linear(0.3048, 0);       // One-dimensional conversion.
  *     MathTransform tr = MathTransforms.passThrough(2, feetToMetres, 0);   // Three-dimensional conversion.
- * }
- * </div>
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * {@code PassThroughTransform} is immutable and thread-safe if its {@linkplain #subTransform} is also
@@ -138,10 +139,10 @@ public class PassThroughTransform extends AbstractMathTransform implements Seria
      * Creates a transform which passes through a subset of coordinates to another transform.
      * This method returns a transform having the following dimensions:
      *
-     * {@preformat java
-     *     Source: firstAffectedCoordinate + subTransform.getSourceDimensions() + numTrailingCoordinates
-     *     Target: firstAffectedCoordinate + subTransform.getTargetDimensions() + numTrailingCoordinates
-     * }
+     * {@snippet lang="java" :
+     *     int sourceDim = firstAffectedCoordinate + subTransform.getSourceDimensions() + numTrailingCoordinates;
+     *     int targetDim = firstAffectedCoordinate + subTransform.getTargetDimensions() + numTrailingCoordinates;
+     *     }
      *
      * Affected coordinates will range from {@code firstAffectedCoordinate} inclusive to
      * {@code dimTarget - numTrailingCoordinates} exclusive.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java
index c209a8cfb2..c46681b4e9 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java
@@ -36,18 +36,18 @@ import org.apache.sis.util.ArraysExt;
  * Given an arbitrary {@link MathTransform}, this class tries to return a new math transform that operates
  * only on a given set of source or target dimensions.
  *
- * <div class="note"><b>Example:</b>
- * if the supplied {@code transform} has (<var>x</var>,<var>y</var>,<var>z</var>) inputs
+ * <h2>Example</h2>
+ * If the supplied {@code transform} has (<var>x</var>,<var>y</var>,<var>z</var>) inputs
  * and (<var>λ</var>,<var>φ</var>,<var>h</var>) outputs, then the following code:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     TransformSeparator s = new TransformSeparator(theTransform);
  *     s.addSourceDimensionRange(0, 2);
  *     MathTransform mt = s.separate();
- * }
+ *     }
  *
  * will return a transform with (<var>x</var>,<var>y</var>) inputs and (probably) (<var>λ</var>,<var>φ</var>) outputs.
- * The output dimensions can be verified with a call to {@link #getTargetDimensions()}.</div>
+ * The output dimensions can be verified with a call to {@link #getTargetDimensions()}.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/WraparoundTransform.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/WraparoundTransform.java
index abf51c7e2d..7ffb868641 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/WraparoundTransform.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/WraparoundTransform.java
@@ -300,9 +300,9 @@ public class WraparoundTransform extends AbstractMathTransform implements Serial
      * It provides a single method to override if a different wraparound strategy is desired.
      * The default implementation is:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return Math.IEEEremainder(x, period);
-     * }
+     *     }
      *
      * Subclasses may override this method for applying wraparound only under some conditions,
      * in order to reduce discontinuities.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java
index 2a78db869e..2411497392 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java
@@ -46,19 +46,19 @@
  * The following example projects a (<var>latitude</var>, <var>longitude</var>) coordinate to
  * a <cite>Universal Transverse Mercator</cite> projection in the zone of the coordinate:
  *
- * {@preformat java
- *   GeographicCRS source = CommonCRS.WGS84.geographic();
- *   ProjectedCRS  target = CommonCRS.WGS84.UTM(20, 30);                        // 20°N 30°E   (watch out axis order!)
- *   CoordinateOperation operation = CRS.findOperation(source, target, null);
- *   if (CRS.getLinearAccuracy(operation) > 100) {
- *       // If the accuracy is coarser than 100 metres (or any other threshold at application choice)
- *       // maybe the operation is not suitable. Decide here what to do (throw an exception, etc).
- *   }
- *   MathTransform mt = operation.getMathTransform();
- *   DirectPosition position = new DirectPosition2D(20, 30);                    // 20°N 30°E   (watch out axis order!)
- *   position = mt.transform(position, position);
- *   System.out.println(position);
- * }
+ * {@snippet lang="java" :
+ *     GeographicCRS source = CommonCRS.WGS84.geographic();
+ *     ProjectedCRS  target = CommonCRS.WGS84.UTM(20, 30);                        // 20°N 30°E   (watch out axis order!)
+ *     CoordinateOperation operation = CRS.findOperation(source, target, null);
+ *     if (CRS.getLinearAccuracy(operation) > 100) {
+ *         // If the accuracy is coarser than 100 metres (or any other threshold at application choice)
+ *         // maybe the operation is not suitable. Decide here what to do (throw an exception, etc).
+ *     }
+ *     MathTransform mt = operation.getMathTransform();
+ *     DirectPosition position = new DirectPosition2D(20, 30);                    // 20°N 30°E   (watch out axis order!)
+ *     position = mt.transform(position, position);
+ *     System.out.println(position);
+ *     }
  *
  * <h2>The EPSG database</h2>
  * The EPSG geodetic parameter dataset is a structured database required to:
@@ -85,10 +85,10 @@
  * of type <cite>geodetic datum</cite> is associated to code {@code EPSG:6326}.
  * This means that the EPSG object could be obtained by the following code:
  *
- * {@preformat java
- *   DatumAuthorityFactory factory = ...; // TODO: document how to obtain an EPSG factory.
- *   GeodeticDatum datum = factory.createGeodeticDatum("6326");
- * }
+ * {@snippet lang="java" :
+ *     DatumAuthorityFactory factory = ...;             // TODO: document how to obtain an EPSG factory.
+ *     GeodeticDatum datum = factory.createGeodeticDatum("6326");
+ *     }
  *
  * The EPSG objects can also be inspected online on the <a href="https://epsg.org/">EPSG repository</a> web site.
  *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
index 9433d0f367..089342224b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
@@ -99,8 +99,8 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   GEODCRS[“WGS 84”,
+     * {@snippet lang="wkt" :
+     *  GEODCRS[“WGS 84”,
      *    DATUM[“World Geodetic System 1984”,
      *      ELLIPSOID[“WGS 84”, 6378137, 298.257223563,
      *        LENGTHUNIT[“metre”,1.0]]],
@@ -108,7 +108,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *      AXIS[“(lat)”,north,ANGLEUNIT[“degree”,0.0174532925199433]],
      *      AXIS[“(lon)”,east,ANGLEUNIT[“degree”,0.0174532925199433]],
      *      AXIS[“ellipsoidal height (h)”,up,LENGTHUNIT[“metre”,1.0]]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -125,8 +125,8 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   GEODCRS[“S-95”,
+     * {@snippet lang="wkt" :
+     *  GEODCRS[“S-95”,
      *    DATUM[“Pulkovo 1995”,
      *      ELLIPSOID[“Krassowsky 1940”, 6378245, 298.3,
      *        LENGTHUNIT[“metre”,1.0]]],
@@ -135,7 +135,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *      AXIS[“longitude”,east,ORDER[2]],
      *      ANGLEUNIT[“degree”,0.0174532925199433],
      *    REMARK[“Система Геодеэических Координвт года 1995(СК-95)”]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -152,8 +152,8 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   GEODCRS[“NAD83”,
+     * {@snippet lang="wkt" :
+     *  GEODCRS[“NAD83”,
      *    DATUM[“North American Datum 1983”,
      *      ELLIPSOID[“GRS 1980”, 6378137, 298.257222101, LENGTHUNIT[“metre”,1.0]]],
      *    CS[ellipsoidal,2],
@@ -162,7 +162,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *      ANGLEUNIT[“degree”,0.017453292519943],
      *    ID[“EPSG”,4269],
      *    REMARK[“1986 realisation”]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -179,8 +179,8 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   GEODCRS[“NTF (Paris)”,
+     * {@snippet lang="wkt" :
+     *  GEODCRS[“NTF (Paris)”,
      *    DATUM[“Nouvelle Triangulation Francaise”,
      *      ELLIPSOID[“Clarke 1880 (IGN)”, 6378249.2, 293.4660213]],
      *    PRIMEM[“Paris”,2.5969213],
@@ -189,7 +189,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *      AXIS[“longitude”,east,ORDER[2]],
      *      ANGLEUNIT[“grad”,0.015707963267949],
      *    REMARK[“Nouvelle Triangulation Française”]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -206,8 +206,8 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   GEODETICCRS[“JGD2000”,
+     * {@snippet lang="wkt" :
+     *  GEODETICCRS[“JGD2000”,
      *    DATUM[“Japanese Geodetic Datum 2000”,
      *      ELLIPSOID[“GRS 1980”, 6378137, 298.257222101]],
      *    CS[Cartesian,3],
@@ -221,7 +221,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *    TIMEEXTENT[2002-04-01,2011-10-21],
      *    ID[“EPSG”,4946,URI[“urn:ogc:def:crs:EPSG::4946”]],
      *    REMARK[“注:JGD2000ジオセントリックは現在JGD2011に代わりました。”]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -253,8 +253,8 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   PROJCRS[“NAD27 / Texas South Central”,
+     * {@snippet lang="wkt" :
+     *  PROJCRS[“NAD27 / Texas South Central”,
      *    BASEGEODCRS[“NAD27”,
      *      DATUM[“North American Datum 1927”,
      *        ELLIPSOID[“Clarke 1866”, 20925832.164, 294.97869821,
@@ -278,7 +278,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *      AXIS[“(y)”,north],
      *      LENGTHUNIT[“US survey foot”,0.304800609601219],
      *    REMARK[“Fundamental point: Meade’s Ranch KS, latitude 39°13'26.686"N, longitude 98°32'30.506"W.”]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -337,12 +337,12 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis name and vertical datum type.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   VERTCRS[“NAVD88”,
+     * {@snippet lang="wkt" :
+     *  VERTCRS[“NAVD88”,
      *    VDATUM[“North American Vertical Datum 1988”],
      *    CS[vertical,1],
      *      AXIS[“gravity-related height (H)”,up],LENGTHUNIT[“metre”,1.0]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -362,11 +362,11 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis name.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   TIMECRS[“GPS Time”,
-     *     TDATUM[“Time origin”,TIMEORIGIN[1980-01-01T00:00:00.0Z]],
-     *     CS[temporal,1],AXIS[“time”,future],TIMEUNIT[“day”,86400.0]]
-     * }
+     * {@snippet lang="wkt" :
+     *  TIMECRS[“GPS Time”,
+     *    TDATUM[“Time origin”,TIMEORIGIN[1980-01-01T00:00:00.0Z]],
+     *    CS[temporal,1],AXIS[“time”,future],TIMEUNIT[“day”,86400.0]]
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -385,13 +385,13 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis name.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   PARAMETRICCRS[“WMO standard atmosphere layer 0”,
-     *     PDATUM[“Mean Sea Level”,ANCHOR[“1013.25 hPa at 15°C”]],
-     *     CS[parametric,1],
-     *     AXIS[“pressure (hPa)”,up],
-     *     PARAMETRICUNIT[“hPa”,100.0]]
-     * }
+     * {@snippet lang="wkt" :
+     *  PARAMETRICCRS[“WMO standard atmosphere layer 0”,
+     *    PDATUM[“Mean Sea Level”,ANCHOR[“1013.25 hPa at 15°C”]],
+     *    CS[parametric,1],
+     *    AXIS[“pressure (hPa)”,up],
+     *    PARAMETRICUNIT[“hPa”,100.0]]
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -410,15 +410,15 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   ENGINEERINGCRS[“Astra Minas Grid”,
+     * {@snippet lang="wkt" :
+     *  ENGINEERINGCRS[“Astra Minas Grid”,
      *    ENGINEERINGDATUM[“Astra Minas”],
      *    CS[Cartesian,2],
      *      AXIS[“northing (X)”,north,ORDER[1]],
      *      AXIS[“westing (Y)”,west,ORDER[2]],
      *      LENGTHUNIT[“metre”,1.0],
      *    ID[“EPSG”,5800]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -438,15 +438,15 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   ENGCRS[“A construction site CRS”,
+     * {@snippet lang="wkt" :
+     *  ENGCRS[“A construction site CRS”,
      *    EDATUM[“P1”,ANCHOR[“Peg in south corner”]],
      *    CS[Cartesian,2],
      *      AXIS[“site east”,southWest,ORDER[1]],
      *      AXIS[“site north”,southEast,ORDER[2]],
      *      LENGTHUNIT[“metre”,1.0],
      *    TIMEEXTENT[“date/time t1”,“date/time t2”]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -466,15 +466,15 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
-     *   ENGCRS[“A ship-centred CRS”,
+     * {@snippet lang="wkt" :
+     *  ENGCRS[“A ship-centred CRS”,
      *    EDATUM[“Ship reference point”,ANCHOR[“Centre of buoyancy”]],
      *    CS[Cartesian,3],
      *      AXIS[“(x)”,forward],
      *      AXIS[“(y)”,starboard],
      *      AXIS[“(z)”,down],
      *      LENGTHUNIT[“metre”,1.0]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -500,7 +500,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *  GEODCRS[“ETRS89 Lambert Azimuthal Equal Area CRS”,
      *    BASEGEODCRS[“WGS 84”,
      *      DATUM[“WGS 84”,
@@ -517,7 +517,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *      AXIS[“latitude”,north,ORDER[1]],
      *      AXIS[“longitude”,east,ORDER[2]],
      *      ANGLEUNIT[“degree”,0.0174532925199433]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -534,7 +534,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *  ENGCRS[“Topocentric example A”,
      *    BASEGEODCRS[“WGS 84”,
      *      DATUM[“WGS 84”,
@@ -552,7 +552,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *      AXIS[“Topocentric North (V)”,north,ORDER[2]],
      *      AXIS[“Topocentric height (W)”,up,ORDER[3]],
      *      LENGTHUNIT[“metre”,1.0]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -594,7 +594,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *  COMPOUNDCRS[“NAD83 + NAVD88”,
      *    GEODCRS[“NAD83”,
      *      DATUM[“North American Datum 1983”,
@@ -610,7 +610,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *        CS[vertical,1],
      *          AXIS[“gravity-related height (H)”,up],
      *          LENGTHUNIT[“metre”,1]]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -631,7 +631,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *  COMPOUNDCRS[“GPS position and time”,
      *    GEODCRS[“WGS 84”,
      *      DATUM[“World Geodetic System 1984”,
@@ -645,7 +645,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *      CS[temporal,1],
      *        AXIS[“time (T)”,future],
      *        TIMEUNIT[“day”,86400]]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
@@ -666,7 +666,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      * Completes the GeoAPI tests with a check of axis names.
      * The WKT parsed by this test is (except for quote characters):
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *  COMPOUNDCRS[“ICAO layer 0”,
      *    GEODETICCRS[“WGS 84”,
      *      DATUM[“World Geodetic System 1984”,
@@ -682,7 +682,7 @@ public final strictfp class WKTParserTest extends CRSParserTest {
      *          CS[parametric,1],
      *            AXIS[“pressure (P)”,unspecified],
      *            PARAMETRICUNIT[“hPa”,100]]]
-     * }
+     *  }
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java
index 7e6b4f481d..ec65ab78ce 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java
@@ -37,18 +37,18 @@ import static org.opengis.test.Assert.*;
  * This is the common class used by all tests that need a full EPSG geodetic dataset to be installed.
  * Use this class as below:
  *
- * {@preformat java
- *     &#64;BeforeClass
+ * {@snippet lang="java" :
+ *     @BeforeClass
  *     public static void createFactory() throws FactoryException {
  *         TestFactorySource.createFactory();
  *     }
  *
- *     &#64;AfterClass
+ *     @AfterClass
  *     public static void close() throws FactoryException {
  *         TestFactorySource.close();
  *     }
  *
- *     &#64;Test
+ *     @Test
  *     public void testFoo() {
  *         assumeNotNull(TestFactorySource.factory);
  *         // Test can happen now.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
index cbfb56a029..d43ef3c9d9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
@@ -92,9 +92,9 @@ public final strictfp class CoordinateOperationFinderTest extends MathTransformT
      * Tolerance threshold for strict comparisons of floating point numbers.
      * This constant can be used like below, where {@code expected} and {@code actual} are {@code double} values:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     assertEquals(expected, actual, STRICT);
-     * }
+     *     }
      */
     private static final double STRICT = 0;
 
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
index b498116bef..21cd60e843 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
@@ -81,9 +81,9 @@ public final strictfp class CoordinateOperationRegistryTest extends MathTransfor
      * Tolerance threshold for strict comparisons of floating point numbers.
      * This constant can be used like below, where {@code expected} and {@code actual} are {@code double} values:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     assertEquals(expected, actual, STRICT);
-     * }
+     *     }
      */
     private static final double STRICT = 0;
 
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
index 6b1a6b19af..2ea8af8213 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
@@ -70,9 +70,9 @@ public final strictfp class DefaultCoordinateOperationFactoryTest extends MathTr
      * Tolerance threshold for strict comparisons of floating point numbers.
      * This constant can be used like below, where {@code expected} and {@code actual} are {@code double} values:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     assertEquals(expected, actual, STRICT);
-     * }
+     *     }
      */
     private static final double STRICT = 0;
 
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/HardCodedConversions.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/HardCodedConversions.java
index 974dfbdf6a..5678c5f081 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/HardCodedConversions.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/HardCodedConversions.java
@@ -56,12 +56,12 @@ public final strictfp class HardCodedConversions {
      * A defining conversion for a <cite>Universal Transverse Mercator zone 9</cite> projection.
      * Pseudo Well-Known Text for the {@link org.opengis.referencing.operation.MathTransform}:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   Param_MT["Transverse Mercator",
      *       Parameter["Longitude of natural origin", -129, Unit["degree"]],
      *       Parameter["Scale factor at natural origin", 0.9996],
      *       Parameter["False easting", 500000, Unit["metre"]]]]
-     * }
+     *   }
      */
     public static final DefaultConversion UTM;
     static {
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
index b0bda449b0..c1b3631671 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
@@ -263,7 +263,7 @@ public final strictfp class AlbersEqualAreaTest extends MapProjectionTestCase {
      * in trigonometric functions. The range reduction must be performed explicitly in map projection code.
      *
      * <p>The math transform tested here is:</p>
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   Param_MT["Albers Equal Area",
      *     Parameter["semi_major", 6378206.4, Unit["metre"]],
      *     Parameter["semi_minor", 6356583.8, Unit["metre"]],
@@ -271,7 +271,7 @@ public final strictfp class AlbersEqualAreaTest extends MapProjectionTestCase {
      *     Parameter["Longitude of false origin", -154, Unit["degree"]],
      *     Parameter["Latitude of 1st standard parallel", 55, Unit["degree"]],
      *     Parameter["Latitude of 2nd standard parallel", 65, Unit["degree"]]]
-     * }
+     *   }
      *
      * @throws FactoryException if an error occurred while creating the map projection.
      * @throws TransformException if an error occurred while projecting a point.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PoleRotationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PoleRotationTest.java
index b0c50633df..0c003cff25 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PoleRotationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PoleRotationTest.java
@@ -244,10 +244,10 @@ public final strictfp class PoleRotationTest extends MathTransformTestCase {
      * {@code coords.txt} is a file containing input coordinates in (λ,φ)
      * order and the output is in (φ,λ) order.
      *
-     * {@preformat shell
+     * {@snippet lang="shell" :
      *   cs2cs -I -E -f %g "EPSG:4326" +to +type=crs +proj=ob_tran +o_proj=longlat +datum=WGS84 +no_defs \
      *         +o_lat_p=70 +o_lon_p=40 +lon_0=190 coords.txt
-     * }
+     *   }
      *
      * Note that a 180° offset must be added to the {@code +lon_0} parameter.
      *
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
index a911deb561..6d06bf989d 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
@@ -96,12 +96,12 @@ public class ConverterRegistry {
      * fetch the {@code ObjectConverter} instances from the {@code META-INF/services}
      * directories as below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     ClassLoader loader = getClass().getClassLoader();
      *     for (ObjectConverter<?,?> converter : ServiceLoader.load(ObjectConverter.class, loader)) {
      *         register(converter);
      *     }
-     * }
+     *     }
      */
     protected void initialize() {
     }
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
index d0569269f9..182ed6530a 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
@@ -133,11 +133,11 @@ final class FallbackConverter<S,T> extends SystemConverter<S,T> {
      * erasure, and should not need that information if we didn't made a mistake in this class.
      * Nevertheless for safety, callers are encouraged to verify themselves as below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Class<T> targetClass = ...;
      *     FallbackConverter<S, ? extends T> converter = merge(...);
      *     assert targetClass.isAssignableFrom(converter.getTargetClass()) : converter;
-     * }
+     *     }
      *
      * In the current implementation, the {@code primary} converter can be either an arbitrary
      * {@code ObjectConverter}, or a previously created {@code FallbackConverter}. However, the
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java
index 8dcd6cdbfb..30f405ce1b 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java
@@ -29,10 +29,10 @@ import org.apache.sis.math.FunctionProperty;
  * <p>Some predefined unique instances of {@code ObjectToString} are available
  * by the following pattern:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Class<S> sourceClass = ...;
  *     ObjectConverter<S,String> c = StringConverter.getInstance(sourceClass).inverse();
- * }
+ *     }
  *
  * <h2>Immutability and thread safety</h2>
  * This base class and all inner classes are immutable, and thus inherently thread-safe.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
index 97a3079ab5..d8c0990dab 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
@@ -97,12 +97,12 @@ public final class SystemRegistry extends ConverterRegistry {
      * <p>The default implementation is equivalent to the following code
      * (see the package javadoc for more information):</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     ClassLoader loader = getClass().getClassLoader();
      *     for (ObjectConverter<?,?> converter : ServiceLoader.load(ObjectConverter.class, loader)) {
      *         register(converter);
      *     }
-     * }
+     *     }
      */
     @Override
     protected void initialize() {
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/system/DaemonThread.java b/core/sis-utility/src/main/java/org/apache/sis/internal/system/DaemonThread.java
index 6f925ae0cc..06e879f95f 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/system/DaemonThread.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/system/DaemonThread.java
@@ -26,17 +26,17 @@ import java.util.ArrayList;
  * This class provides a {@link #isKillRequested()} flag which shall be tested by the subclasses.
  * It is okay to test this flag only when catching {@link InterruptedException}, as below:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     while (true) {
  *         try {
  *             someObject.wait();
  *         } catch (InterruptedException e) {
  *             if (isKillRequested()) {
- *                 break; // Exit the loop for stopping the thread.
+ *                 break;                       // Exit the loop for stopping the thread.
  *             }
  *         }
  *     }
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.3
@@ -67,7 +67,7 @@ abstract class DaemonThread extends Thread {
      * required in OSGi environment). Each module using {@code DaemonThread} shall maintain
      * its <strong>own</strong> list (don't use the list of another module), like below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     class MyInternalClass {
      *         static DaemonThread lastCreatedDaemon;
      *     }
@@ -81,7 +81,7 @@ abstract class DaemonThread extends Thread {
      *             }
      *         }
      *     }
-     * }
+     *     }
      *
      * See {@link ReferenceQueueConsumer} for a real example.
      *
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/system/OptionalDependency.java b/core/sis-utility/src/main/java/org/apache/sis/internal/system/OptionalDependency.java
index 19be39c31a..08e0c210da 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/system/OptionalDependency.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/system/OptionalDependency.java
@@ -57,8 +57,8 @@ public abstract class OptionalDependency extends SystemListener {
      * Invoked when the classpath is likely to have changed.
      * Subclasses must override like below:
      *
-     * {@preformat java
-     *     &#64;Override
+     * {@snippet lang="java" :
+     *     @Override
      *     protected final void classpathChanged() {
      *         synchronized (MyServices.class) {
      *             super.classpathChanged();
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java b/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java
index a9a5cdf033..e8e3add4c5 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java
@@ -33,19 +33,19 @@ import static java.util.logging.Logger.getLogger;
  *
  * Example:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     final class MyReference extends WeakReference<MyType> implements Disposable {
  *         MyReference(MyType referent) {
  *             super(referent, ReferenceQueueConsumer.QUEUE);
  *         }
  *
- *         &#64;Override
+ *         @Override
  *         public void dispose() {
  *             // Perform here some cleaning work that must be done when the referent has
  *             // been garbage-collected. Remember that get() returns null from this point.
  *         }
  *     }
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.3
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
index f2809bed5a..ac8a5b0162 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
@@ -42,9 +42,9 @@ import org.apache.sis.math.DecimalFunctions;
  * more compact storage and better performance. {@code DoubleDouble} can be converted to {@code BigDecimal} as
  * below:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     BigDecimal decimal = new BigDecimal(dd.value).add(new BigDecimal(dd.error));
- * }
+ *     }
  *
  * <h2>Impact of availability of FMA instructions</h2>
  * When allowed to use <cite>fused multiply-add</cite> (FMA) instruction added in JDK9
@@ -97,7 +97,7 @@ public final class DoubleDouble extends Number {
      * The split constant used as part of multiplication algorithms. The split algorithm is as below
      * (we have to inline it in multiplication methods because Java cannot return multi-values):
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     private void split(double a) {
      *         double t   = SPLIT * a;
      *         double ahi = t - (t - a);
@@ -428,10 +428,10 @@ public final class DoubleDouble extends Number {
      * Sets the {@link #value} and {@link #error} terms to values read from the given array.
      * This is a convenience method for a frequently used operation, implemented as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   value = array[index];
      *   error = array[index + errorOffset];
-     * }
+     *   }
      *
      * @param  array        the array from which to get the value and error.
      * @param  index        index of the value in the given array.
@@ -506,10 +506,10 @@ public final class DoubleDouble extends Number {
      * Stores the {@link #value} and {@link #error} terms in the given array.
      * This is a convenience method for a frequently used operation, implemented as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   array[index] = value;
      *   array[index + errorOffset] = error;
-     * }
+     *   }
      *
      * @param  array        the array where to store the value and error.
      * @param  index        index of the value in the given array.
@@ -551,9 +551,9 @@ public final class DoubleDouble extends Number {
      * Adds another double-double value to this {@code DoubleDouble}.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    add(other.value, other.error);
-     * }
+     * {@snippet lang="java" :
+     *   add(other.value, other.error);
+     *   }
      *
      * @param  other  the other value to add to this {@code DoubleDouble}.
      */
@@ -581,9 +581,9 @@ public final class DoubleDouble extends Number {
      * Adds a {@code double} value to this {@code DoubleDouble} with a default error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    add(otherValue, errorForWellKnownValue(otherValue));
-     * }
+     * {@snippet lang="java" :
+     *   add(otherValue, errorForWellKnownValue(otherValue));
+     *   }
      *
      * <b>Tip:</b> if the other value is known to be an integer or a power of 2, then invoking
      * <code>{@linkplain #add(double) add}(otherValue)</code> is more efficient.
@@ -610,9 +610,9 @@ public final class DoubleDouble extends Number {
      * Adds a {@code double} value to this {@code DoubleDouble} without error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    add(otherValue, 0);
-     * }
+     * {@snippet lang="java" :
+     *   add(otherValue, 0);
+     *   }
      *
      * @param  otherValue  the other value to add to this {@code DoubleDouble}.
      */
@@ -637,13 +637,13 @@ public final class DoubleDouble extends Number {
      * keeping in mind that the result of (a.value + b.value) has itself an error
      * which needs to be added to (a.error + b.error). In Java code:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   final double thisError = this.error;
      *   setToSum(value, otherValue);
      *   error += thisError;
      *   error += otherError;
      *   setToQuickSum(value, error);
-     * }
+     *   }
      *
      * @param  otherValue  the other value to add to this {@code DoubleDouble}.
      * @param  otherError  the error of the other value to add to this {@code DoubleDouble}.
@@ -675,9 +675,9 @@ public final class DoubleDouble extends Number {
      * Adds another double-double value to this {@code DoubleDouble}, reading the values from an array.
      * This is a convenience method for a frequently used operation, implemented as below:
      *
-     * {@preformat java
-     *    add(array[index], array[index + errorOffset]);
-     * }
+     * {@snippet lang="java" :
+     *   add(array[index], array[index + errorOffset]);
+     *   }
      *
      * @param  array        the array from which to get the value and error.
      * @param  index        index of the value in the given array.
@@ -691,9 +691,9 @@ public final class DoubleDouble extends Number {
      * Subtracts another double-double value from this {@code DoubleDouble}.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    subtract(other.value, other.error);
-     * }
+     * {@snippet lang="java" :
+     *   subtract(other.value, other.error);
+     *   }
      *
      * @param  other  the other value to subtract from this value.
      */
@@ -721,9 +721,9 @@ public final class DoubleDouble extends Number {
      * Subtracts a {@code double} from this {@code DoubleDouble} with a default error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    subtract(otherValue, errorForWellKnownValue(otherValue));
-     * }
+     * {@snippet lang="java" :
+     *   subtract(otherValue, errorForWellKnownValue(otherValue));
+     *   }
      *
      * <b>Tip:</b> if the other value is known to be an integer or a power of 2, then invoking
      * <code>{@linkplain #subtract(double) subtract}(otherValue)</code> is more efficient.
@@ -738,9 +738,9 @@ public final class DoubleDouble extends Number {
      * Subtracts a {@code double} from this {@code DoubleDouble} without error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    subtract(otherValue, 0);
-     * }
+     * {@snippet lang="java" :
+     *   subtract(otherValue, 0);
+     *   }
      *
      * @param  otherValue  the other value to subtract from this {@code DoubleDouble}.
      */
@@ -763,9 +763,9 @@ public final class DoubleDouble extends Number {
      * Subtracts another double-double value from this {@code DoubleDouble}, reading the values from an array.
      * This is a convenience method for a frequently used operation, implemented as below:
      *
-     * {@preformat java
-     *    subtract(array[index], array[index + errorOffset]);
-     * }
+     * {@snippet lang="java" :
+     *   subtract(array[index], array[index + errorOffset]);
+     *   }
      *
      * @param  array        the array from which to get the value and error.
      * @param  index        index of the value in the given array.
@@ -779,9 +779,9 @@ public final class DoubleDouble extends Number {
      * Multiplies this {@code DoubleDouble} by another double-double value.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    multiply(other.value, other.error);
-     * }
+     * {@snippet lang="java" :
+     *   multiply(other.value, other.error);
+     *   }
      *
      * @param  other  the other value to multiply by this value.
      */
@@ -809,9 +809,9 @@ public final class DoubleDouble extends Number {
      * Multiplies this {@code DoubleDouble} by a {@code double} with a default error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    multiply(otherValue, errorForWellKnownValue(otherValue));
-     * }
+     * {@snippet lang="java" :
+     *   multiply(otherValue, errorForWellKnownValue(otherValue));
+     *   }
      *
      * <b>Tip:</b> if the other value is known to be an integer or a power of 2, then invoking
      * <code>{@linkplain #multiply(double) multiply}(otherValue)</code> is more efficient.
@@ -826,9 +826,9 @@ public final class DoubleDouble extends Number {
      * Multiplies this {@code DoubleDouble} by a {@code double} without error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    multiply(otherValue, 0);
-     * }
+     * {@snippet lang="java" :
+     *   multiply(otherValue, 0);
+     *   }
      *
      * @param  otherValue  the other value to multiply by this {@code DoubleDouble}.
      */
@@ -855,14 +855,14 @@ public final class DoubleDouble extends Number {
      * product has itself an error. The last term (the product of errors) is ignored because presumed very small.
      * In Java code:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   final double thisValue = this.value;
      *   final double thisError = this.error;
      *   setToProduct(thisValue, otherValue);
      *   error += otherError * thisValue;
      *   error += otherValue * thisError;
      *   setToQuickSum(value, error);
-     * }
+     *   }
      *
      * @param  otherValue  the other value by which to multiply this {@code DoubleDouble}.
      * @param  otherError  the error of the other value by which to multiply this {@code DoubleDouble}.
@@ -880,9 +880,9 @@ public final class DoubleDouble extends Number {
      * Multiplies this {@code DoubleDouble} by another double-double value stored in the given array.
      * This is a convenience method for a frequently used operation, implemented as below:
      *
-     * {@preformat java
-     *    multiply(array[index], array[index + errorOffset]);
-     * }
+     * {@snippet lang="java" :
+     *   multiply(array[index], array[index + errorOffset]);
+     *   }
      *
      * @param  array        the array from which to get the value and error.
      * @param  index        index of the value in the given array.
@@ -896,9 +896,9 @@ public final class DoubleDouble extends Number {
      * Divides this {@code DoubleDouble} by another double-double value.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    divide(other.value, other.error);
-     * }
+     * {@snippet lang="java" :
+     *   divide(other.value, other.error);
+     *   }
      *
      * @param  other  the other value to by which to divide this value.
      */
@@ -926,9 +926,9 @@ public final class DoubleDouble extends Number {
      * Divides this {@code DoubleDouble} by a {@code double} with a default error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    divide(otherValue, errorForWellKnownValue(otherValue));
-     * }
+     * {@snippet lang="java" :
+     *   divide(otherValue, errorForWellKnownValue(otherValue));
+     *   }
      *
      * <b>Tip:</b> if the other value is known to be an integer or a power of 2, then invoking
      * <code>{@linkplain #divide(double) divide}(otherValue)</code> is more efficient.
@@ -943,9 +943,9 @@ public final class DoubleDouble extends Number {
      * Divides this {@code DoubleDouble} by a {@code double} without error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    divide(otherValue, 0);
-     * }
+     * {@snippet lang="java" :
+     *   divide(otherValue, 0);
+     *   }
      *
      * @param  otherValue  the other value by which to divide this {@code DoubleDouble}.
      */
@@ -977,9 +977,9 @@ public final class DoubleDouble extends Number {
      * Divides this {@code DoubleDouble} by another double-double value stored in the given array.
      * This is a convenience method for a frequently used operation, implemented as below:
      *
-     * {@preformat java
-     *    divide(array[index], array[index + errorOffset]);
-     * }
+     * {@snippet lang="java" :
+     *   divide(array[index], array[index + errorOffset]);
+     *   }
      *
      * @param  array        the array from which to get the value and error.
      * @param  index        index of the value in the given array.
@@ -993,9 +993,9 @@ public final class DoubleDouble extends Number {
      * Divides the given double-double value by this {@code DoubleDouble}.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    inverseDivide(other.value, other.error);
-     * }
+     * {@snippet lang="java" :
+     *   inverseDivide(other.value, other.error);
+     *   }
      *
      * @param  other  the other value to divide by this value.
      */
@@ -1023,9 +1023,9 @@ public final class DoubleDouble extends Number {
      * Divides the given {@code double} value by this {@code DoubleDouble} with a default error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    inverseDivide(numeratorValue, errorForWellKnownValue(numeratorValue));
-     * }
+     * {@snippet lang="java" :
+     *   inverseDivide(numeratorValue, errorForWellKnownValue(numeratorValue));
+     *   }
      *
      * <b>Tip:</b> if the other value is known to be an integer or a power of 2, then invoking
      * <code>{@linkplain #inverseDivide(double) inverseDivide}(otherValue)</code> is more efficient.
@@ -1040,9 +1040,9 @@ public final class DoubleDouble extends Number {
      * Divides the given {@code double} value by this {@code DoubleDouble} without error term.
      * This is a convenience method for:
      *
-     * {@preformat java
-     *    inverseDivide(numeratorValue, 0);
-     * }
+     * {@snippet lang="java" :
+     *   inverseDivide(numeratorValue, 0);
+     *   }
      *
      * @param  numeratorValue  the other value to divide by this {@code DoubleDouble}.
      */
@@ -1083,7 +1083,7 @@ public final class DoubleDouble extends Number {
          */
         final double productError = error;
         setToSum(numeratorValue, -value);
-        error -= productError;  // Complete the above subtraction
+        error -= productError;                      // Complete the above subtraction
         error += numeratorError;
         /*
          * Adds the 'remainder / b' term, using 'remainder / b.value' as an approximation
@@ -1097,9 +1097,9 @@ public final class DoubleDouble extends Number {
      * Divides the given double-double value by this {@code DoubleDouble}.
      * This is a convenience method for a frequently used operation, implemented as below:
      *
-     * {@preformat java
-     *    inverseDivide(array[index], array[index + errorOffset]);
-     * }
+     * {@snippet lang="java" :
+     *   inverseDivide(array[index], array[index + errorOffset]);
+     *   }
      *
      * @param  array        the array from which to get the value and error.
      * @param  index        index of the value in the given array.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/FinalFieldSetter.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/FinalFieldSetter.java
index 8116bd10ee..3540a50610 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/FinalFieldSetter.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/FinalFieldSetter.java
@@ -28,7 +28,7 @@ import org.apache.sis.internal.system.Modules;
  * The usage pattern is:
  *
  * <p><b>On deserialization:</b></p>
- * {@preformat java
+ * {@snippet lang="java" :
  *     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
  *         in.defaultReadObject();
  *         Object someValue = ...;
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
index 8886018831..ea83e16ea9 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
@@ -100,13 +100,13 @@ public final class Numerics extends Static {
      * detect the cases where two {@link org.apache.sis.referencing.operation.transform.LinearTransform}
      * are equal for practical purpose. This threshold can be used as below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Matrix m1 = ...;
      *     Matrix m2 = ...;
      *     if (Matrices.epsilonEqual(m1, m2, COMPARISON_THRESHOLD, true)) {
      *         // Consider that matrixes are equal.
      *     }
-     * }
+     *     }
      *
      * By extension, the same threshold value is used for comparing other floating point values.
      *
@@ -123,9 +123,9 @@ public final class Numerics extends Static {
      * {@code double}. For any real value, the following code evaluate to 0 if the given value is
      * positive:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Double.doubleToRawLongBits(value) & SIGN_BIT_MASK;
-     * }
+     *     }
      *
      * Note that this idiom differentiates positive zero from negative zero.
      * It should be used only when such difference matter.
@@ -511,9 +511,9 @@ public final class Numerics extends Static {
      * Converts a power of 2 to a power of 10, rounded toward negative infinity.
      * This method is equivalent to the following code, but using only integer arithmetic:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return (int) Math.floor(exp2 * LOG10_2);
-     * }
+     *     }
      *
      * This method is valid only for arguments in the [-2620 … 2620] range, which is more than enough
      * for the range of {@code double} exponents. We do not put this method in public API because it
@@ -552,9 +552,9 @@ public final class Numerics extends Static {
      * where <var>n</var> is {@link Math#getExponent(double)} - {@value #SIGNIFICAND_SIZE}.
      * For any non-NaN values (including infinity), the following relationship holds:
      *
-     * {@preformat java
-     *    assert Math.scalb(getSignificand(value), Math.getExponent(value) - SIGNIFICAND_SIZE) == Math.abs(value);
-     * }
+     * {@snippet lang="java" :
+     *     assert Math.scalb(getSignificand(value), Math.getExponent(value) - SIGNIFICAND_SIZE) == Math.abs(value);
+     *     }
      *
      * For negative values, this method behaves as if the value was positive.
      *
@@ -582,9 +582,9 @@ public final class Numerics extends Static {
      * <var>n</var> is {@link Math#getExponent(float)} - {@value #SIGNIFICAND_SIZE_OF_FLOAT}.
      * For any non-NaN positive values (including infinity), the following relationship holds:
      *
-     * {@preformat java
-     *    assert Math.scalb(getSignificand(value), Math.getExponent(value) - SIGNIFICAND_SIZE_OF_FLOAT) == value;
-     * }
+     * {@snippet lang="java" :
+     *     assert Math.scalb(getSignificand(value), Math.getExponent(value) - SIGNIFICAND_SIZE_OF_FLOAT) == value;
+     *     }
      *
      * For negative values, this method behaves as if the value was positive.
      *
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/Strings.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/Strings.java
index a47e22ef63..a57fb071ce 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/Strings.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/Strings.java
@@ -88,11 +88,11 @@ public final class Strings extends Static {
      * (maybe the developer really wanted no-break spaces). To preserve no-break spaces, the
      * following can be used instead:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     if (text != null && !(text = text.trim()).isEmpty()) {
      *         // Use text here.
      *     }
-     * }
+     *     }
      *
      * @param  text  the text to trim, or {@code null}.
      * @return the trimmed text, or {@code null} if the given text was null or blank.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/UnmodifiableArrayList.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/UnmodifiableArrayList.java
index b3805b975e..0052d186af 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/UnmodifiableArrayList.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/UnmodifiableArrayList.java
@@ -29,15 +29,15 @@ import org.apache.sis.util.collection.CheckedContainer;
 /**
  * An unmodifiable view of an array. Invoking
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     List<?> list = UnmodifiableArrayList.wrap(array);
- * }
+ *     }
  *
  * is equivalent to
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     List<?> list = Collections.unmodifiableList(Arrays.asList(array));
- * }
+ *     }
  *
  * except that this class uses one less level of indirection (which may be significant since
  * unmodifiable lists are extensively used in SIS) and implements the {@link CheckedContainer}
diff --git a/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java b/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
index 5852bc3ca1..ddb7fc8459 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
@@ -43,7 +43,7 @@ import static org.apache.sis.util.Characters.isLineOrParagraphSeparator;
  *
  * <p>For example, the following code:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     TableAppender table = new TableAppender(System.out);
  *     table.nextLine('═');
  *     table.append("English\tFrench\tr.e.d.\n");
@@ -54,7 +54,7 @@ import static org.apache.sis.util.Characters.isLineOrParagraphSeparator;
  *          .append("Mars\tMars\t0.532\n");
  *     table.nextLine('═');
  *     table.flush();
- * }
+ *     }
  *
  * produces the following output:
  *
diff --git a/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java b/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java
index ef8fd2296a..46a4f3c957 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java
@@ -44,21 +44,21 @@ import org.apache.sis.util.resources.Errors;
  * Subclasses can use those fields like below:
  *
  * <p><b>Formatting table without border:</b></p>
- * {@preformat java
+ * {@snippet lang="java" :
  *     TableAppender table = new TableAppender(out, "");
  *     // ... do some work, then add a column separator:
  *     table.append(beforeFill);
  *     table.nextColumn(fillCharacter);
  *     table.append(columnSeparator);
- * }
+ *     }
  *
  * <p><b>Formatting table with a border:</b></p>
- * {@preformat java
+ * {@snippet lang="java" :
  *     TableAppender table = new TableAppender(out, columnSeparator);
  *     // ... do some work, then add a column separator:
  *     table.append(beforeFill);
  *     table.nextColumn(fillCharacter);
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.3
diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java b/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
index 9c2332aec2..cc02704c42 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
@@ -132,9 +132,9 @@ public final class DecimalFunctions extends Static {
      * This method is equivalent to the following code, except that it is potentially faster since the
      * actual implementation avoid to format and parse the value:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   return Double.parseDouble(Float.toString(value));
-     * }
+     *   }
      *
      * @param  value  the {@code float} value to convert as a {@code double}.
      * @return the given value as a {@code double} with the extra decimal fraction digits set to zero.
@@ -186,17 +186,17 @@ public final class DecimalFunctions extends Static {
      * equivalent to the following code except that it is potentially faster since the actual implementation
      * avoids the creation of {@link java.math.BigDecimal} objects:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   BigDecimal base2  = new BigDecimal(value);     // Exact same value as stored in IEEE 754 format.
      *   BigDecimal base10 = BigDecimal.valueOf(value); // Exact same value as shown by println(value).
      *   return base10.subtract(base2).doubleValue();
-     * }
+     *   }
      *
      * Computing {@code value + deltaForDoubleToDecimal(value)} has no effect since the absolute value of the
      * returned delta is always smaller than <code>{@linkplain Math#ulp(double) Math.ulp}(value) / 2</code>.
      * To see an effect, a type with more precision than the {@code double} type is necessary.
      *
-     * <div class="note"><b>Use case:</b>
+     * <h4>Use case</h4>
      * Many international standards define values in base 10. For example, the conversion factor from inches
      * to centimetres is defined as exactly 2.54 cm/inch. This is by an internationally accepted definition
      * since 1959, not an approximation. But the 2.54 value cannot be represented exactly in the IEEE 754
@@ -205,7 +205,6 @@ public final class DecimalFunctions extends Static {
      * (e.g. in non-linear equations where errors can grow exponentially), this method can be useful.
      * Other examples of values defined in base 10 are conversions from feet to metres and
      * map projection parameters defined by national mapping agencies.
-     * </div>
      *
      * <h4>Domain of validity</h4>
      * The current implementation cannot compute delta for {@code abs(value) < 3E-8} approximately,
@@ -515,18 +514,17 @@ public final class DecimalFunctions extends Static {
      *   <tr><td>0.123</td>    <td>0.123456</td>    <td>false</td>  <td>{@code approximate} and {@code accurate} cannot be interchanged.</td></tr>
      * </table>
      *
-     * <div class="note"><b>Use case:</b>
+     * <h4>Use case</h4>
      * this method is useful when {@code approximate} is a number parsed by {@link Double#parseDouble(String)}
      * and the data producer may have rounded too many fraction digits when formatting the numbers.
      * In some cases we can suspect what the real value may be and want to ensure that a replacement
      * would not contradict the provided value. This happen for example in Well Known Text format,
      * where the following element is sometimes written with the conversion factor rounded:
      *
-     * {@preformat wkt
+     * {@snippet lang="wkt" :
      *   AngleUnit["degree", 0.017453292519943295]      // Expected
      *   AngleUnit["degree", 0.01745329252]             // Given by some providers
-     * }
-     * </div>
+     *   }
      *
      * @param  accurate     the most accurate number.
      * @param  approximate  the number which may have missing decimal fraction digits.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java b/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
index 09fe2d2dc9..dd526d0446 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
@@ -82,9 +82,9 @@ public final class MathFunctions extends Static {
      * The logarithm of 2 in base 10, which is approximated by {@value}.
      * This constant is useful for converting a power of 2 to a power of 10 as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   double exp10 = exp2 * LOG10_2;
-     * }
+     *   }
      *
      * @see Math#log10(double)
      * @see #getExponent(double)
@@ -509,9 +509,9 @@ public final class MathFunctions extends Static {
      * This method returns {@code false} for the negative zero ({@code -0.0}).
      * This method is equivalent to the following code, but potentially faster:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   return (value == 0) && isPositive(value);
-     * }
+     *   }
      *
      * @param  value  the value to test.
      * @return {@code true} if the given value is +0.0 (not -0.0).
@@ -554,9 +554,9 @@ public final class MathFunctions extends Static {
      * This method returns {@code false} for the positive zero ({@code +0.0}).
      * This method is equivalent to the following code, but potentially faster:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   return (value == 0) && isNegative(value);
-     * }
+     *   }
      *
      * @param  value  the value to test.
      * @return {@code true} if the given value is -0.0 (not +0.0).
diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java b/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
index 22624541e8..4c4a9ce4ca 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
@@ -65,18 +65,18 @@ import static java.lang.Double.doubleToLongBits;
  * The following examples assume that a <var>y</var>=<var>f</var>(<var>x</var>) function
  * is defined. A simple usage is:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Statistics stats = new Statistics("y");
  *     for (int i=0; i<numberOfValues; i++) {
  *         stats.accept(f(i));
  *     }
  *     System.out.println(stats);
- * }
+ *     }
  *
  * Following example computes the statistics on the first and second derivatives
  * in addition to the statistics on the sample values:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     final double x₀ = ...; // Put here the x value at i=0
  *     final double Δx = ...; // Put here the interval between x values
  *     Statistics stats = Statistics.forSeries("y", "∂y/∂x", "∂²y/∂x²");
@@ -85,7 +85,7 @@ import static java.lang.Double.doubleToLongBits;
  *     }
  *     stats.differences().scale(1/Δx);
  *     System.out.println(stats);
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (MPO, IRD, Geomatys)
  * @version 1.2
@@ -239,9 +239,9 @@ public class Statistics implements DoubleConsumer, LongConsumer, Cloneable, Seri
      * interval. In order to get the discrete derivatives, the following method needs to be invoked
      * <em>after</em> all sample values have been added:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     statistics.differences().scale(1/Δx);
-     * }
+     *     }
      *
      * The maximal "derivative" order is determined by the length of the {@code differenceNames} array:
      *
@@ -545,12 +545,12 @@ public class Statistics implements DoubleConsumer, LongConsumer, Cloneable, Seri
      * where Δ<var>x</var> is the constant interval between the <var>x</var> values of the
      * <var>y</var>=<var>f</var>(<var>x</var>) function:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Statistics derivative = statistics.differences();
      *     derivative.scale(1/Δx); // Shall be invoked only once.
      *     Statistics secondDerivative = derivative.differences();
      *     // Do not invoke scale(1/Δx) again.
-     * }
+     *     }
      *
      * This method returns a non-null value only if this {@code Statistics} instance has been created by a
      * call to the {@link #forSeries forSeries(…)} method with a non-empty {@code differenceNames} array.
@@ -680,9 +680,9 @@ public class Statistics implements DoubleConsumer, LongConsumer, Cloneable, Seri
          * {@link #delta} statistics. This constructor allows chaining different kind of
          * statistics objects. For example, one could write:
          *
-         * {@preformat java
+         * {@snippet lang="java" :
          *     new Statistics.Delta(new Statistics.Delta());
-         * }
+         *     }
          *
          * which would compute statistics of sample values, statistics of difference between
          * consecutive sample values, and statistics of difference of difference between
diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java b/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
index ef37c021f1..71ff8d91f9 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
@@ -54,11 +54,11 @@ import static org.apache.sis.util.ArgumentChecks.ensureValidIndex;
  * Vectors can be a view over a subsection of the given array, or can provide a view of the elements in reverse order,
  * <i>etc</i>. The example below creates a view over a subsection:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     float[] array = new float[100];
  *     Vector v = Vector.create(array, false).subList(20, 40)
  *     // At this point, v.doubleValue(0) is equivalent to (double) array[20].
- * }
+ *     }
  *
  * <h2>Usage</h2>
  * The methods that are most often used after {@code Vector} creation are {@link #size()} and {@link #doubleValue(int)}
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractUnit.java b/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractUnit.java
index b623ade23b..3ed2b7a2ed 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractUnit.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractUnit.java
@@ -338,9 +338,9 @@ abstract class AbstractUnit<Q extends Quantity<Q>> implements Unit<Q>, LenientCo
      * Indicates if this unit is compatible with the given unit.
      * This implementation delegates to:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   return getDimension().equals(that.getDimension());
-     * }
+     *   }
      *
      * @param  that the other unit to compare for compatibility.
      * @return {@code true} if the given unit is compatible with this unit.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java b/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
index 2055557906..1e26f4622e 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
@@ -1292,7 +1292,7 @@ public class AngleFormat extends Format implements Localized {
      * Formats an angle, latitude or longitude value as an attributed character iterator.
      * Callers can iterate and queries the attribute values as in the following example:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     AttributedCharacterIterator it = angleFormat.formatToCharacterIterator(myAngle);
      *     for (char c=it.first(); c!=AttributedCharacterIterator.DONE; c=c.next()) {
      *         // 'c' is a character from the formatted string.
@@ -1301,7 +1301,7 @@ public class AngleFormat extends Format implements Localized {
      *             // This field extends from it.getRunStart(MINUTES) to it.getRunLimit(MINUTES).
      *         }
      *     }
-     * }
+     *     }
      *
      * Alternatively, if the current {@linkplain AttributedCharacterIterator#getIndex() iterator
      * index} is before the start of the minutes field, then the starting position of that field
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/DerivedScalar.java b/core/sis-utility/src/main/java/org/apache/sis/measure/DerivedScalar.java
index 28cfc438b0..2e9768cb2b 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/DerivedScalar.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/DerivedScalar.java
@@ -99,10 +99,10 @@ class DerivedScalar<Q extends Quantity<Q>> extends Scalar<Q> {
      * The unit of measurement shall be the same than the system unit of this quantity.
      * Implementation in subclasses should be like below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     assert newUnit == getSystemUnit() : newUnit;
      *     return new MyDerivedScalar(this, newValue);
-     * }
+     *     }
      */
     @Override
     Quantity<Q> create(double newValue, Unit<Q> newUnit) {
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/IdentityConverter.java b/core/sis-utility/src/main/java/org/apache/sis/measure/IdentityConverter.java
index 0170433aef..ed35f93ea8 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/IdentityConverter.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/IdentityConverter.java
@@ -27,9 +27,7 @@ import org.apache.sis.util.LenientComparable;
  * instead of using the more generic {@link LinearConverter} class because we want to avoid performing
  * any arithmetic operation in the {@link #convert(double)} method, in order to preserve negative zero:
  *
- * {@preformat java
- *     convert(-0d) ≡ -0d
- * }
+ * <pre class="math">convert(-0d) ≡ -0d</pre>
  *
  * When the value is used in a map projection parameter, its sign can have implications in the chain of
  * concatenated transforms. The final result is numerically equivalent, but intermediate steps may differ
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java b/core/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java
index 5a96e06aaa..098c45b675 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java
@@ -682,7 +682,7 @@ public class RangeFormat extends Format implements Localized {
      * Formats a range as an attributed character iterator.
      * Callers can iterate and queries the attribute values as in the following example:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     AttributedCharacterIterator it = rangeFormat.formatToCharacterIterator(myRange);
      *     for (char c=it.first(); c!=AttributedCharacterIterator.DONE; c=c.next()) {
      *         // 'c' is a character from the formatted string.
@@ -691,7 +691,7 @@ public class RangeFormat extends Format implements Localized {
      *             // This field extends from it.getRunStart(MIN_VALUE) to it.getRunLimit(MIN_VALUE).
      *         }
      *     }
-     * }
+     *     }
      *
      * Alternatively, if the current {@linkplain AttributedCharacterIterator#getIndex() iterator
      * index} is before the start of the minimum value field, then the starting position of that
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java b/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java
index 7d0dd9d534..175c21fbc3 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java
@@ -403,9 +403,9 @@ final class SystemUnit<Q extends Quantity<Q>> extends AbstractUnit<Q> implements
      *
      * <p>The most important alternate unit in Apache SIS is {@link Units#RADIAN}, defined as below:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   Unit<Angle> RADIAN = ONE.alternate("rad").asType(Angle.class);
-     * }
+     *   }
      *
      * @param  symbol  the new symbol for the alternate unit.
      * @return the alternate unit.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java b/core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java
index 7c36ce3087..6baf609684 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java
@@ -28,8 +28,8 @@ import java.lang.annotation.RetentionPolicy;
  * When used with JavaBeans, this annotation shall be applied on the getter method
  * as in the following example:
  *
- * {@preformat java
- *     &#64;ValueRange(minimum=0, maximum=100)
+ * {@snippet lang="java" :
+ *     @ValueRange(minimum=0, maximum=100)
  *     public double getCloudCoverPercentage() {
  *         // Method implementation here...
  *     }
@@ -42,8 +42,8 @@ import java.lang.annotation.RetentionPolicy;
  * zero makes no sense. Note also that the {@code maximum} value is not explicitly
  * provided, in which case it defaults to infinity.
  *
- * {@preformat java
- *     &#64;@ValueRange(minimum=0, isMinIncluded=false)
+ * {@snippet lang="java" :
+ *     @ValueRange(minimum=0, isMinIncluded=false)
  *     public double getSpatialResolution() {
  *         // Method implementation here...
  *     }
@@ -54,14 +54,14 @@ import java.lang.annotation.RetentionPolicy;
  * uses a convenience constructor for this purpose. Note that the {@code Double} type could
  * by inferred from {@link java.lang.reflect.Method#getReturnType()}.
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Method myMethod = ...;
  *     ValueRange annotation = myMethod.getAnnotation(ValueRange.class);
  *     if (annotation != null) {
  *         NumberRange<Double> range = new NumberRange(Double.class, annotation);
  *         // Use the range here.
  *     }
- * }
+ *     }
  *
  * The {@link org.apache.sis.metadata.AbstractMetadata} class uses this annotation for inferring
  * {@link org.opengis.parameter.ParameterDescriptor} from metadata interfaces and implementation
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/package-info.java b/core/sis-utility/src/main/java/org/apache/sis/measure/package-info.java
index 662ee16193..18849c00dc 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/package-info.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/package-info.java
@@ -67,22 +67,22 @@
  * those arithmetic operations are automatically inferred.
  * For example, this line of code:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *   System.out.println( Units.PASCAL.multiply(1000) );
- * }
+ *   }
  *
  * prints <cite>"kPa"</cite>, i.e. the kilo prefix has been automatically applied
  * (SI prefixes are applied on SI units only, not on other systems).
  * Other example:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *   Force  f = Quantities.create(4, Units.NEWTON);
  *   Length d = Quantities.create(6, Units.MILLIMETRE);
  *   Time   t = Quantities.create(3, Units.SECOND);
  *   Quantity<?> e = f.multiply(d).divide(t);
  *   System.out.println(e);
  *   System.out.println("Instance of Power: " + (e instanceof Power));
- * }
+ *   }
  *
  * prints <cite>"8 mW"</cite> and <cite>"Instance of Power: true"</cite>,
  * i.e. Apache SIS detects that the result of N⋅m∕s is Watt,
diff --git a/core/sis-utility/src/main/java/org/apache/sis/setup/About.java b/core/sis-utility/src/main/java/org/apache/sis/setup/About.java
index 021675162d..d25f8d4112 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/setup/About.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/setup/About.java
@@ -171,9 +171,9 @@ public enum About {
      *
      * <p>This convenience method is equivalent to the following code:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return configuration(EnumSet.allOf(About.class), null, null);
-     * }
+     *     }
      *
      * @return configuration information, as a tree for grouping some configuration by sections.
      */
diff --git a/core/sis-utility/src/main/java/org/apache/sis/setup/Configuration.java b/core/sis-utility/src/main/java/org/apache/sis/setup/Configuration.java
index 83bbe41c6b..b33151258c 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/setup/Configuration.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/setup/Configuration.java
@@ -102,7 +102,7 @@ public final class Configuration {
      * Data source specified by JNDI has precedence over data source specified by this method in order to let users
      * control their data source. The following example shows how to setup a connection to a PostgreSQL database:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     import org.postgresql.ds.PGSimpleDataSource;
      *
      *     class MyClass {
@@ -124,7 +124,7 @@ public final class Configuration {
      *             Configuration.current().setDatabase(MyClass::createDataSource);
      *         }
      *     }
-     * }
+     *     }
      *
      * This method can be invoked only before the first attempt to {@linkplain #getDatabase() get the database}.
      * If the {@link DataSource} has already be obtained, then this method throws {@link IllegalStateException}.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java b/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
index 6554d6bd86..dcfe462ef0 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
@@ -52,7 +52,7 @@ import static java.util.logging.Logger.getLogger;
  * Developers who wish to define their own options can define static constants in a subclass,
  * as in the following example:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     public final class MyOptionKey<T> extends OptionKey<T> {
  *         public static final OptionKey<String> MY_OPTION = new MyOptionKey<>("MY_OPTION", String.class);
  *
@@ -60,7 +60,7 @@ import static java.util.logging.Logger.getLogger;
  *             super(name, type);
  *         }
  *     }
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
@@ -260,12 +260,12 @@ public class OptionKey<T> implements Serializable {
      * Returns the option value in the given map for this key, or {@code null} if none.
      * This is a convenience method for implementers, which can be used as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     public <T> T getOption(final OptionKey<T> key) {
      *         ArgumentChecks.ensureNonNull("key", key);
      *         return key.getValueFrom(options);
      *     }
-     * }
+     *     }
      *
      * @param  options  the map where to search for the value, or {@code null} if not yet created.
      * @return the current value in the map for the this option, or {@code null} if none.
@@ -278,12 +278,12 @@ public class OptionKey<T> implements Serializable {
      * Sets a value for this option key in the given map, or in a new map if the given map is {@code null}.
      * This is a convenience method for implementers, which can be used as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     public <T> void setOption(final OptionKey<T> key, final T value) {
      *         ArgumentChecks.ensureNonNull("key", key);
      *         options = key.setValueInto(options, value);
      *     }
-     * }
+     *     }
      *
      * @param  options  the map where to set the value, or {@code null} if not yet created.
      * @param  value    the new value for the given option, or {@code null} for removing the value.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java b/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
index a508c9caee..a300eceb4e 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
@@ -1198,10 +1198,10 @@ public final class ArraysExt extends Static {
      * <p>Callers can obtain an array of appropriate length using the following idiom.
      * Note that this idiom will create a new array only if necessary:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     T[] array = ...;
      *     array = resize(array, removeDuplicated(array));
-     * }
+     *     }
      *
      * <div class="note"><b>API note:</b>
      * This method return type is not an array in order to make obvious that the given array will be modified in-place.
@@ -1886,13 +1886,13 @@ public final class ArraysExt extends Static {
      * but only if all casts are lossless. If any cast causes data loss, then this method returns {@code null}.
      * This method is equivalent to the following code, but potentially more efficient:
      *
-     * {@preformat java
-     *    if (isSinglePrecision(data)) {
-     *        return copyAsFloat(data);
-     *    } else {
-     *        return null;
-     *    }
-     * }
+     * {@snippet lang="java" :
+     *     if (isSinglePrecision(data)) {
+     *         return copyAsFloat(data);
+     *     } else {
+     *         return null;
+     *     }
+     *     }
      *
      * @param  data  the array to copy, or {@code null}.
      * @return a copy of the given array with values casted to the {@code float} type, or
@@ -2239,10 +2239,10 @@ public final class ArraysExt extends Static {
      * Callers are encouraged to place the following assertions before calls to this method,
      * using the {@link #isSorted(int[], boolean)} and {@link Arrays#toString(int[])} methods:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   assert isSorted(array1, true) : toString(array1);
      *   assert isSorted(array2, true) : toString(array2);
-     * }
+     *   }
      *
      * @param  array1  the first array, or {@code null}.
      * @param  array2  the second array, or {@code null}.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java b/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
index 43678075cd..6c81efd067 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
@@ -287,9 +287,9 @@ public final class CharSequences extends Static {
      * except that this method works on arbitrary {@link CharSequence} objects instead of
      * {@link String}s only, and that the upper limit can be specified:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return text.indexOf(part, fromIndex);
-     * }
+     *     }
      *
      * There is no restriction on the value of {@code fromIndex}. If negative or greater
      * than {@code toIndex}, then the behavior of this method is as if the search started
@@ -1002,9 +1002,9 @@ search:     for (; fromIndex <= toIndex; fromIndex++) {
      * except that the {@link CharSequence#subSequence(int, int) subSequence} method is
      * invoked only once instead of two times:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     text = trimWhitespaces(text.subSequence(lower, upper));
-     * }
+     *     }
      *
      * @param  text   the text from which to remove leading and trailing white spaces.
      * @param  lower  index of the first character to consider for inclusion in the sub-sequence.
@@ -1620,9 +1620,9 @@ cmp:    while (ia < lga) {
      * In particular, spaces and punctuation characters like {@code '_'} and {@code '-'} are
      * ignored:</p>
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     assert equalsFiltered("WGS84", "WGS_84", Characters.Filter.LETTERS_AND_DIGITS, true) == true;
-     * }
+     *     }
      *
      * @param  s1          the first characters sequence to compare, or {@code null}.
      * @param  s2          the second characters sequence to compare, or {@code null}.
@@ -1767,9 +1767,9 @@ cmp:    while (ia < lga) {
      * except that this method works on arbitrary {@link CharSequence} objects instead of
      * {@link String}s only:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return text.regionMatches(offset, part, 0, part.length());
-     * }
+     *     }
      *
      * This method does not thrown {@code IndexOutOfBoundsException}. Instead, if
      * {@code fromIndex < 0} or {@code fromIndex + part.length() > text.length()},
@@ -1807,9 +1807,9 @@ cmp:    while (ia < lga) {
      * except that this method works on arbitrary {@link CharSequence} objects instead of
      * {@link String}s only:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return text.regionMatches(ignoreCase, offset, part, 0, part.length());
-     * }
+     *     }
      *
      * This method does not thrown {@code IndexOutOfBoundsException}. Instead, if
      * {@code fromIndex < 0} or {@code fromIndex + part.length() > text.length()},
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java b/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java
index e41f8bec63..867ad48983 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java
@@ -325,10 +325,10 @@ public final class Classes extends Static {
      * This method is also useful for fetching the class of an object known only by its bound
      * type. As of Java 6, the usual pattern:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Number n = 0;
      *     Class<? extends Number> c = n.getClass();
-     * }
+     *     }
      *
      * doesn't seem to work if {@link Number} is replaced by a parameterized type {@code T}.
      *
@@ -666,17 +666,16 @@ next:       for (final Class<?> candidate : candidates) {
      * Only interfaces assignable to {@code baseInterface} are compared.
      * Declaration order does not matter.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * in ISO 19111, different interfaces exist for different coordinate system (CS) geometries
      * ({@code CartesianCS}, {@code PolarCS}, etc.). One can check if two implementations have
      * the same geometry with the following code:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     if (implementSameInterfaces(cs1, cs2, CoordinateSystem.class)) {
      *         // The two Coordinate Systems are of the same kind.
      *     }
-     * }
-     * </div>
+     *     }
      *
      * @param  object1  the first object to check for interfaces.
      * @param  object2  the second object to check for interfaces.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java b/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
index 80b90f2cc6..0c89dd0f85 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
@@ -162,9 +162,9 @@ public enum ComparisonMode {
      * objects are not equal and assertions are enabled. The exception message and stack trace help
      * to locate which attributes are not equal. This mode is typically used in assertions like below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     assert Utilities.deepEquals(object1, object2, ComparisonMode.DEBUG);
-     * }
+     *     }
      *
      * Note that a comparison in {@code DEBUG} mode may still return {@code false} without
      * throwing an exception, since not all corner cases are tested. The exception is only
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java b/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
index 14f1cf6a29..68fdf67c01 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
@@ -150,11 +150,11 @@ public interface LenientComparable {
      * Returns {@code true} if this object is strictly equals to the given object.
      * This method is usually implemented as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     public boolean equals(Object other) {
      *         return equals(other, ComparisonMode.STRICT);
      *     }
-     * }
+     *     }
      *
      * Implementers shall ensure that the following conditions hold. Unless the {@code equals}
      * behavior is clearly documented in the interface javadoc (as for example in the Java
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java b/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java
index 2a1187fc21..772235c652 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java
@@ -41,10 +41,10 @@ import static org.apache.sis.util.collection.Containers.hashMapCapacity;
  * invoked on the {@link #ALL} or {@link #SIS} instance in order to specify the scope.
  * Examples:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Locales[] lc1 = Locales.ALL.getAvailableLanguages();  // All languages installed on the JavaVM.
  *     Locales[] lc2 = Locales.SIS.getAvailableLanguages();  // Only the languages known to Apache SIS.
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Cullen Rombach (Image Matters)
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java b/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
index 228149b097..fd69c86fad 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
@@ -300,13 +300,12 @@ public final class Numbers extends Static {
      * <p>If one of the given argument is null, then this method returns the non-null argument.
      * If both arguments are null, then this method returns {@code null}.</p>
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * in the following code, {@code type} is set to {@code Long.class}:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Class<?> type = widestClass(Short.class, Long.class);
-     * }
-     * </div>
+     *     }
      *
      * @param  c1  the first number type, or {@code null}.
      * @param  c2  the second number type, or {@code null}.
@@ -361,13 +360,12 @@ public final class Numbers extends Static {
      * <p>If one of the given argument is null, then this method returns the non-null argument.
      * If both arguments are null, then this method returns {@code null}.</p>
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * in the following code, {@code type} is set to {@code Short.class}:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Class<?> type = widestClass(Short.class, Long.class);
-     * }
-     * </div>
+     *     }
      *
      * @param  c1  the first number type, or {@code null}.
      * @param  c2  the second number type, or {@code null}.
@@ -446,9 +444,9 @@ public final class Numbers extends Static {
      * Returns the given number wrapped in the smallest class capable to hold the specified value.
      * This method is equivalent to the following code, in a slightly more efficient way:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return cast(value, narrowestClass(value));
-     * }
+     *     }
      *
      * @param  value  the value to be wrapped in a finer (if possible) {@link Number}.
      * @return the narrowest type capable to hold the given value.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java b/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
index 6fa36f72c7..2a637ec0be 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
@@ -154,11 +154,11 @@ public interface ObjectConverter<S,T> extends Function<S,T> {
      * Returns a converter capable to convert instances of <var>T</var> back to instances of <var>S</var>.
      * Before to invoke this method, callers can verify if this converter is invertible as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     if (converter.properties().contains(FunctionProperty.INVERTIBLE)) {
      *         // Call to converter.inverse() is allowed here.
      *     }
-     * }
+     *     }
      *
      * @return a converter for converting instances of <var>T</var> back to instances of <var>S</var>.
      * @throws UnsupportedOperationException if this converter is not invertible.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverters.java b/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverters.java
index 06a898eaf9..de4506eb60 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverters.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverters.java
@@ -41,12 +41,12 @@ import org.apache.sis.internal.converter.SystemRegistry;
  *   <li>{@link #derivedValues(Map, Class, ObjectConverter)}</li>
  * </ul>
  *
- * <div class="note"><b>Example:</b>
+ * <h2>Example</h2>
  * the following code converts instances in a collection from type {@code S} to type {@code T},
  * where the types are unknown at compile-time. Note that the converter is obtained only once
  * before to be applied to every elements in the loop.
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     Class<S> sourceType = ...
  *     Class<T> targetType = ...
  *     Collection<S> sources = ...;
@@ -55,8 +55,7 @@ import org.apache.sis.internal.converter.SystemRegistry;
  *     for (S source : sources) {
  *         targets.add(converter.apply(source));
  *     }
- * }
- * </div>
+ *     }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 0.3
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/ResourceInternationalString.java b/core/sis-utility/src/main/java/org/apache/sis/util/ResourceInternationalString.java
index dd664adc7e..1e5fb6899b 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/ResourceInternationalString.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/ResourceInternationalString.java
@@ -34,25 +34,22 @@ import java.util.MissingResourceException;
  * See the {@link ResourceBundle#getBundle(String, Locale, ClassLoader) ResourceBundle.getBundle(…)}
  * Javadoc for more information.
  *
- * <div class="note"><b>Example:</b>
+ * <h2>Example</h2>
  * if a file named "{@code MyResources.properties}" exists in {@code org.mypackage}
  * and contains the following line:
  *
- * {@preformat text
- *     MyKey = some value
- * }
+ * <pre class="text">MyKey = some value</pre>
  *
  * Then an international string for {@code "some value"} can be created using the following code:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     InternationalString value = new ResourceInternationalString("org.mypackage.MyResources", "MyKey");
- * }
+ *     }
  *
  * The {@code "some value"} string will be localized if the required properties files exist, for
  * example "{@code MyResources_fr.properties}" for French or "{@code MyResources_it.properties}"
  * for Italian, <i>etc</i>.
  * If needed, users can gain more control by overriding the {@link #getBundle(Locale)} method.
- * </div>
  *
  * <h2>Class loaders</h2>
  * Developers can specify explicitly the {@link ClassLoader} to use be overriding the
@@ -128,8 +125,8 @@ public class ResourceInternationalString extends AbstractInternationalString imp
      * For example, the code below works well if {@code MyResource} is a class defined
      * in the same module than the one that contain the resources to load:
      *
-     * {@preformat java
-     *     &#64;Override
+     * {@snippet lang="java" :
+     *     @Override
      *     protected ResourceBundle getBundle(final Locale locale) {
      *         return ResourceBundle.getBundle(resources, locale, MyResource.class.getClassLoader());
      *     }
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java b/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java
index bf58b3a137..2cae0d81ca 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java
@@ -63,9 +63,9 @@ public final class Utilities extends Static {
      * <h4>Implementation note</h4>
      * This is a convenience method for the following method call:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return deepEquals(object1, object2, ComparisonMode.IGNORE_METADATA);
-     * }
+     *     }
      *
      * @param  object1  the first object to compare (may be null).
      * @param  object2  the second object to compare (may be null).
@@ -97,9 +97,9 @@ public final class Utilities extends Static {
      * <h4>Implementation note</h4>
      * This is a convenience method for the following method call:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return deepEquals(object1, object2, ComparisonMode.APPROXIMATE);
-     * }
+     *     }
      *
      * @param  object1  the first object to compare (may be null).
      * @param  object2  the second object to compare (may be null).
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
index 41747868f1..24056800aa 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
@@ -31,7 +31,7 @@ import org.apache.sis.util.Exceptions;
  * for re-throwing the cause as in the example below. This allows client code to behave as if a
  * {@link java.util.Collection} interface was allowed to declare checked exceptions.</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     void myMethod() throws IOException {
  *         Collection c = ...;
  *         try {
@@ -105,7 +105,7 @@ public class BackingStoreException extends RuntimeException {
      *
      * This method should be used as in the example below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     void myMethod() throws IOException {
      *         Collection c = ...;
      *         try {
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
index 072539a513..60dbc08214 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
@@ -54,13 +54,15 @@ import org.apache.sis.internal.system.ReferenceQueueConsumer;
  * The easiest way to use this class is to invoke {@link #computeIfAbsent computeIfAbsent(…)}
  * or {@link #getOrCreate getOrCreate(…)} with lambda functions as below:
  *
- * {@preformat java
- *     private final Cache<String,MyObject> cache = new Cache<String,MyObject>();
+ * {@snippet lang="java" :
+ *     class MyClass {
+ *         private final Cache<String,MyObject> cache = new Cache<String,MyObject>();
  *
- *     public MyObject getMyObject(String key) {
- *         return cache.computeIfAbsent(key, (k) -> createMyObject(k));
+ *         public MyObject getMyObject(String key) {
+ *             return cache.computeIfAbsent(key, (k) -> createMyObject(k));
+ *         }
+ *     }
  *     }
- * }
  *
  * Alternatively, one can handle explicitly the locks.
  * This alternative sometimes provides more flexibility, for example in exception handling.
@@ -80,7 +82,7 @@ import org.apache.sis.internal.system.ReferenceQueueConsumer;
  * be inside the {@code finally} block of a {@code try} block beginning immediately after the call
  * to {@link #lock lock(…)}, no matter what the result of the computation is (including {@code null}).
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     private final Cache<String,MyObject> cache = new Cache<String,MyObject>();
  *
  *     public MyObject getMyObject(final String key) throws MyCheckedException {
@@ -277,11 +279,15 @@ public class Cache<K,V> extends AbstractMap<K,V> implements ConcurrentMap<K,V> {
      * If a value already exists in the cache, then it is returned immediately.
      * Otherwise the {@code creator.call()} method is invoked and its result is saved in this cache for future reuse.
      *
-     * <div class="note"><b>Example:</b>
+     * <p>This method is similar to {@link #computeIfAbsent(Object, Function)} except that it can propagate checked exceptions.
+     * If the {@code creator} function does not throw any checked exception,
+     * then invoking {@code computeIfAbsent(…)} is simpler.</p>
+     *
+     * <h4>Example</h4>
      * the following example shows how this method can be used.
      * In particular, it shows how to propagate {@code MyCheckedException}:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     private final Cache<String,MyObject> cache = new Cache<String,MyObject>();
      *
      *     public MyObject getMyObject(final String key) throws MyCheckedException {
@@ -298,11 +304,6 @@ public class Cache<K,V> extends AbstractMap<K,V> implements ConcurrentMap<K,V> {
      *         }
      *     }
      * }
-     * </div>
-     *
-     * This method is similar to {@link #computeIfAbsent(Object, Function)} except that it can propagate
-     * checked exceptions. If the {@code creator} function does not throw any checked exception, then
-     * invoking {@code computeIfAbsent(…)} is simpler.
      *
      * @param  key      the key for which to get the cached or created value.
      * @param  creator  a method for creating a value, to be invoked only if no value are cached for the given key.
@@ -335,20 +336,19 @@ public class Cache<K,V> extends AbstractMap<K,V> implements ConcurrentMap<K,V> {
      * Otherwise the {@code creator.apply(Object)} method is invoked and its result
      * is saved in this cache for future reuse.
      *
-     * <div class="note"><b>Example:</b>
+     * <p>This method is similar to {@link #getOrCreate(Object, Callable)}, but without checked exceptions.</p>
+     *
+     * <h4>Example</h4>
      * below is the same code than {@link #getOrCreate(Object, Callable)} example,
      * but without the need for any checked exception handling:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     private final Cache<String,MyObject> cache = new Cache<String,MyObject>();
      *
      *     public MyObject getMyObject(final String key) {
      *         return cache.computeIfAbsent(key, (k) -> createMyObject(k));
      *     }
      * }
-     * </div>
-     *
-     * This method is similar to {@link #getOrCreate(Object, Callable)}, but without checked exceptions.
      *
      * @param  key      the key for which to get the cached or created value.
      * @param  creator  a method for creating a value, to be invoked only if no value are cached for the given key.
@@ -854,14 +854,14 @@ public class Cache<K,V> extends AbstractMap<K,V> implements ConcurrentMap<K,V> {
      * with a {@link Handler#putAndUnlock(Object) putAndUnlock} call in {@code try} … {@code catch}
      * blocks as in the example below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Cache.Handler handler = cache.lock();
      *     try {
      *         // Compute the result...
      *     } finally {
      *         handler.putAndUnlock(result);
      *     }
-     * }
+     *     }
      *
      * @param  key  the key for the entry to lock.
      * @return a handler to use for unlocking and storing the result.
@@ -972,7 +972,7 @@ public class Cache<K,V> extends AbstractMap<K,V> implements ConcurrentMap<K,V> {
      * The handler returned by {@link Cache#lock}, to be used for unlocking and storing the result.
      * This handler should be used as below (the {@code try} … {@code finally} statements are important):
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     Value V = null;
      *     Cache.Handler<V> handler = cache.lock(key);
      *     try {
@@ -983,7 +983,7 @@ public class Cache<K,V> extends AbstractMap<K,V> implements ConcurrentMap<K,V> {
      *     } finally {
      *         handler.putAndUnlock(value);
      *     }
-     * }
+     *     }
      *
      * See the {@link Cache} javadoc for a more complete example.
      *
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedContainer.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedContainer.java
index 8459383a94..08f6efc4fb 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedContainer.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedContainer.java
@@ -27,9 +27,9 @@ import java.util.Collection;
  * If a class implements both {@code CheckedContainer} and {@code Collection},
  * then the parameterized type shall be the same type. Example:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     class MyList<E> extends AbstractList<E> implements CheckedContainer<E> { ... }
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 0.3
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
index 544d3a0ce8..edfe2039c3 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
@@ -45,10 +45,10 @@ import org.apache.sis.internal.util.CheckedArrayList;
  * The following example creates a set of {@link org.opengis.referencing.cs.AxisDirection}s
  * for a (<var>x</var>,<var>y</var>,<var>z</var>) coordinate system:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *   CodeListSet<AxisDirection> codes = new CodeListSet<>(AxisDirection.class);
  *   Collections.addAll(codes, AxisDirection.EAST, AxisDirection.NORTH, AxisDirection.UP),
- * }
+ *   }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.4
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
index d926ec6a3f..17db3316ac 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
@@ -40,7 +40,7 @@ import static org.apache.sis.util.collection.Containers.hashMapCapacity;
  *
  * Example:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     public class CityLocation {
  *         public static final TableColumn<String> CITY_NAME  = new TableColumn<>(String.class, "City name");
  *         public static final TableColumn<Float>  LATITUDE   = new TableColumn<>(Float.class,  "Latitude");
@@ -55,7 +55,7 @@ import static org.apache.sis.util.collection.Containers.hashMapCapacity;
  *             return table;
  *         }
  *     }
- * }
+ *     }
  *
  * The {@code setRoot(…)} method accepts arbitrary {@link TreeTable.Node} implementations.
  * However, it is likely to be safer and more memory efficient when used together with the
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
index f7ac505d37..81b9e2b9f1 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
@@ -142,9 +142,9 @@ class DerivedSet<S,E> extends SetOfUnknownSize<E> implements CheckedContainer<E>
      * This method first checks if the given element is non-null,
      * then delegates to the {@link #storage} set like below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     return storage.add(inverse.apply(element));
-     * }
+     *     }
      *
      * @param  element element whose presence in this set is to be ensured.
      * @return {@code true} if the set changed as a result of the call.
@@ -213,9 +213,9 @@ class DerivedSet<S,E> extends SetOfUnknownSize<E> implements CheckedContainer<E>
          * This method first checks if the given element is an instance of {@link #getElementType()},
          * then delegates to the {@link #storage} set like below:
          *
-         * {@preformat java
+         * {@snippet lang="java" :
          *     return storage.contains(inverse.apply(element));
-         * }
+         *     }
          *
          * @param  element  object to be checked for containment in this set.
          * @return {@code true} if this set contains the specified element.
@@ -231,9 +231,9 @@ class DerivedSet<S,E> extends SetOfUnknownSize<E> implements CheckedContainer<E>
          * This method first checks if the given element is an instance of {@link #getElementType},
          * then delegates to the {@link #storage} set like below:
          *
-         * {@preformat java
+         * {@snippet lang="java" :
          *     return storage.remove(inverse.apply(element));
-         * }
+         *     }
          *
          * @param  element  element to be removed from this set, if present.
          * @return {@code true} if the set contained the specified element.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
index b1e07b8de9..cb1fac3036 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
@@ -919,11 +919,11 @@ public class RangeSet<E extends Comparable<? super E>> extends AbstractSet<Range
      * The default implementation is equivalent to the following pseudo-code
      * (omitting argument checks):
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   return intersect(new Range<E>(elementType,
      *           lower.minValue,  lower.isMinIncluded,
      *           upper.minValue, !upper.isMinIncluded));
-     * }
+     *   }
      *
      * <div class="note"><b>API note:</b>
      * This method takes the minimal value of the {@code upper} argument instead
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
index e72d46b5f4..d8d4f4bdf2 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.SimpleInternationalString;
  * for a particular column. {@code TableColumn}s are used for fetching values from nodes
  * as in the following example:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     public class CityLocation {
  *         public static final ColumnTable<String> CITY_NAME = new ColumnTable<>(String.class, "City name");
  *         public static final ColumnTable<Float>  LATITUDE  = new ColumnTable<>(Float.class,  "Latitude");
@@ -48,7 +48,7 @@ import org.apache.sis.util.SimpleInternationalString;
  *             longitude = myNode.getValue(LONGITUDE);
  *         }
  *     }
- * }
+ *     }
  *
  * <h2>Identity comparisons and serialization</h2>
  * This base class relies on <cite>identity comparisons</cite> instead of defining the
@@ -63,7 +63,7 @@ import org.apache.sis.util.SimpleInternationalString;
  * Developers who need serialization support for their own instances have to resolve them in
  * their own subclass. The following example is one possible way to achieve that goal:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     public class CityLocation {
  *         public static final ColumnTable<String> CITY_NAME = new Column<>("CITY_NAME", String.class, "City name");
  *         public static final ColumnTable<Float>  LATITUDE  = new Column<>("LATITUDE",  Float.class,  "Latitude");
@@ -86,7 +86,7 @@ import org.apache.sis.util.SimpleInternationalString;
  *             }
  *         }
  *     }
- * }
+ *     }
  *
  * The constants defined in this class use a similar approach for providing serialization support.
  *
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
index 0c47f5cbcc..ba38ea6f5b 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
@@ -49,12 +49,12 @@ import java.util.List;
  * {@code TreeTable} instance. Using directly those static constants provides type
  * safety, as in the following example:</p>
  *
- * {@preformat java
- *     TreeTable table = ...; // Put here a TreeTable instance.
+ * {@snippet lang="java" :
+ *     TreeTable table = ...;                   // Put here a TreeTable instance.
  *     TreeTable.Node node = table.getRoot();
  *     CharSequence   name = node.getValue(TableColumn.NAME);
  *     Class<?>       type = node.getValue(TableColumn.TYPE);
- * }
+ *     }
  *
  * In the above example, the type of value returned by the {@link Node#getValue(TableColumn)}
  * method is determined by the column constant. However, this approach is possible only when
@@ -154,10 +154,10 @@ public interface TreeTable {
          * i.e. any modification to the returned collection are reflected immediately in the tree.
          * This allows addition or removal of child nodes as below:
          *
-         * {@preformat java
+         * {@snippet lang="java" :
          *     TreeTable.Node newNode = new ...; // Create a new node here.
          *     parent.getChildren().add(newNode);
-         * }
+         *     }
          *
          * The collection is often a {@link List}, but not necessarily. For some implementations like the
          * {@linkplain org.apache.sis.metadata.AbstractMetadata#asTreeTable() metadata tree table view},
@@ -292,8 +292,8 @@ public interface TreeTable {
          * implementations having a content fully determined by the wrapped {@linkplain #getUserObject() user
          * object} need only the following implementation:</p>
          *
-         * {@preformat java
-         *     &#64;Override
+         * {@snippet lang="java" :
+         *     @Override
          *     public boolean equals(Object obj) {
          *         return (obj instanceof MyNode) && ((MyNode) obj).getUserObject() == getUserObject();
          *     }
@@ -319,13 +319,13 @@ public interface TreeTable {
          * {@linkplain #getChildren() children}) is fully generated from the {@linkplain #getUserObject() user
          * object}, then the {@code equals(…)} and {@code hashCode()} methods may be implemented like below:
          *
-         * {@preformat java
-         *     &#64;Override
+         * {@snippet lang="java" :
+         *     @Override
          *     public boolean equals(Object obj) {
          *         return (obj instanceof MyNode) && ((MyNode) obj).getUserObject() == getUserObject();
          *     }
          *
-         *     &#64;Override
+         *     @Override
          *     public int hashCode() {
          *         return System.identityHashCode(getUserObject());
          *     }
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
index 50dba9bd63..efca6912eb 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
@@ -72,7 +72,8 @@ import org.apache.sis.util.ArgumentChecks;
  * has no value (for avoiding data lost when the node is discarded) and use the system file
  * separator as name separator:
  *
- * {@preformat java
+ * {@snippet lang="java" :
+ * class MyClass {
  *     final TableColumn columnToProtect = TableColumn.VALUE;
  *     final TableColumn columnToConcatenate = TableColumn.NAME;
  *
@@ -97,6 +98,7 @@ import org.apache.sis.util.ArgumentChecks;
  *         return node;
  *     }
  * }
+ * }
  *
  * @author  Martin Desruisseaux
  * @version 0.3
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
index d4812775c9..8cdec3448f 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
@@ -50,14 +50,16 @@ import static org.apache.sis.util.collection.WeakEntry.*;
  * This is similar in spirit to the {@link String#intern()} method. The following example shows
  * a convenient way to use {@code WeakHashSet} as an internal pool of immutable objects:
  *
- * {@preformat java
- *     private final WeakHashSet<Foo> pool = new WeakHashSet<Foo>(Foo.class);
+ * {@snippet lang="java" :
+ *     class MyClass {
+ *         private final WeakHashSet<Foo> pool = new WeakHashSet<Foo>(Foo.class);
  *
- *     public Foo create(String definition) {
- *         Foo created = new Foo(definition);
- *         return pool.unique(created);
+ *         public Foo create(String definition) {
+ *             Foo created = new Foo(definition);
+ *             return pool.unique(created);
+ *         }
+ *     }
  *     }
- * }
  *
  * Thus, {@code WeakHashSet} can be used inside a factory to prevent creating duplicate immutable objects.
  *
@@ -261,7 +263,7 @@ public class WeakHashSet<E> extends AbstractSet<E> implements CheckedContainer<E
      * {@code WeakHashSet}. Otherwise, adds {@code element} to this {@code WeakHashSet}.
      * This method is functionally equivalents to the following code:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     if (element != null) {
      *         T current = get(element);
      *         if (current != null) {
@@ -271,7 +273,7 @@ public class WeakHashSet<E> extends AbstractSet<E> implements CheckedContainer<E
      *         }
      *     }
      *     return element;
-     * }
+     *     }
      *
      * @param  <T>      the type of the element to get. Can be {@code null}.
      * @param  element  the element to get or to add in the set if not already presents,
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
index 531e0f47e1..07028b28e3 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
@@ -47,7 +47,7 @@ import static org.apache.sis.util.collection.WeakEntry.*;
  * <p>This class is convenient for avoiding the creation of duplicated elements, as in the
  * example below:</p>
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     K key = ...
  *     V value;
  *     synchronized (map) {
@@ -57,7 +57,7 @@ import static org.apache.sis.util.collection.WeakEntry.*;
  *             map.put(key, value);
  *         }
  *     }
- * }
+ *     }
  *
  * In the above example, the calculation of a new value needs to be fast because it is performed inside a synchronized
  * statement blocking all other access to the map. This is okay if that particular {@code WeakValueHashMap} instance
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java b/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
index 80d256013f..e530f25e37 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
@@ -546,11 +546,11 @@ public class IndexedResourceBundle extends ResourceBundle implements Localized {
      * formatted using {@link MessageFormat}. Calling this method is approximately equivalent to
      * calling:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     String pattern = getString(key);
      *     Format f = new MessageFormat(pattern);
      *     return f.format(arg0);
-     * }
+     *     }
      *
      * If {@code arg0} is not already an array, it will be placed into an array of length 1. Using
      * {@link MessageFormat}, all occurrences of "{0}", "{1}", "{2}" in the resource string will be
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java b/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
index 45f8b5c295..1941fff83d 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
@@ -51,24 +51,24 @@
  * provide a {@code getResources(Locale)} static method.
  * It can be used for fetching localized strings as below:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     String text = TheBundle.getResources(locale).getString(key, optionalArguments);
- * }
+ *     }
  *
  * For convenience, all {@code IndexedResourceBundle} subclasses provide also various {@code format(int, …)} static
  * methods for fetching localized texts in the {@linkplain java.util.Locale#getDefault() system default locale}:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     text = TheBundle.format(key, optionalArguments);         // Uses the default locale.
- * }
+ *     }
  *
  * If the locale is not known at method invocation time, {@code formatInternational(int, …)} static methods
  * returns a localizable string which can be localized later:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     InternationalString i18n = TheBundle.formatInternational(key, optionalArguments);
  *     String text = i18n.toString(locale);                             // Localize now.
- * }
+ *     }
  *
  * If optional arguments are present, then the following types are handled in a special way
  * (non exhaustive list):
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java b/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
index 9b5cbc8181..2b81f8f9ba 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
@@ -42,9 +42,9 @@ public abstract class AppenderTestCase extends TestCase {
     /**
      * The appender to test. Subclasses should initialize this field as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *   appender = MyAppender(appender);
-     * }
+     *   }
      */
     Appendable appender;
 
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java b/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java
index 0ed8601674..d291387868 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java
@@ -34,27 +34,27 @@ import static org.junit.Assert.*;
  * Watches the logs sent to the given logger.
  * For using, create a rule in the JUnit test class like below:
  *
- * {@preformat java
- *     &#64;Rule
+ * {@snippet lang="java" :
+ *     @Rule
  *     public final LoggingWatcher loggings = new LoggingWatcher(Logger.getLogger(Loggers.XML));
- * }
+ *     }
  *
  * Recommended but not mandatory, ensure that there is no unexpected logging in any tests:
  *
- * {@preformat java
- *     &#64;After
+ * {@snippet lang="java" :
+ *     @After
  *     public void assertNoUnexpectedLog() {
  *         loggings.assertNoUnexpectedLog();
  *     }
- * }
+ *     }
  *
  * In tests that are expected to emit warnings, add the following lines:
  *
- * {@preformat java
+ * {@snippet lang="java" :
  *     // Do the test here.
  *     loggings.assertNextLogContains("Some keywords", "that are expected", "to be found in the message");
  *     loggings.assertNoUnexpectedLog();
- * }
+ *     }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java b/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
index 4210d71598..3be8aad442 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
@@ -59,11 +59,11 @@ public abstract strictfp class TestCase {
      * A flag for code that are pending future SIS development before to be enabled.
      * This flag is always set to {@code false}. It shall be used as below:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     if (PENDING_FUTURE_SIS_VERSION) {
      *         // Do some stuff here.
      *     }
-     * }
+     *     }
      *
      * The intent is to make easier to identify test cases that fail with the current version
      * of SIS (e.g. because of unsupported operations), but should pass in a future version.
@@ -80,9 +80,9 @@ public abstract strictfp class TestCase {
      * Tolerance threshold for strict comparisons of floating point numbers.
      * This constant can be used like below, where {@code expected} and {@code actual} are {@code double} values:
      *
-     * {@preformat java
+     * {@snippet lang="java" :
      *     assertEquals(expected, actual, STRICT);
-     * }
+     *     }
      */
     protected static final double STRICT = 0;
 
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java b/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
index afd784b2ee..8b1526a25e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
@@ -174,8 +174,8 @@ public abstract strictfp class TestSuite {
      *
      * Subclasses shall invoke this method as below:
      *
-     * {@preformat java
-     *    &#64;BeforeClass
+     * {@snippet lang="java" :
+     *    @BeforeClass
      *    public static void verifyTestList() {
      *        assertNoMissingTest(MyTestSuite.class);
      *        verifyTestList(MyTestSuite.class);
diff --git a/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/Constraints.java b/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/Constraints.java
index 1f89733b56..106915e11e 100644
--- a/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/Constraints.java
+++ b/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/Constraints.java
@@ -31,7 +31,7 @@ import org.apache.sis.metadata.iso.constraint.DefaultConstraints;
  *
  * <p>The following schema fragment specifies the expected content contained within this class.</p>
  *
- * {@preformat xml
+ * {@snippet lang="xml" :
  *   <complexType name="FRA_Constraints_Type">
  *     <complexContent>
  *       <extension base="{http://www.isotc211.org/2005/gmd}MD_Constraints_Type">
@@ -41,7 +41,7 @@ import org.apache.sis.metadata.iso.constraint.DefaultConstraints;
  *       </extension>
  *     </complexContent>
... 987 lines suppressed ...


[sis] 04/06: Removal of all `@module` tag, to be replaced by Jigsaw modularization.

Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 161f81817008c4ae85ab19433ebe399d4011e7bf
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Dec 28 16:37:00 2022 +0100

    Removal of all `@module` tag, to be replaced by Jigsaw modularization.
    
    Shell command used:
    
        find -name "*.java" -exec sed -i '/\*\s*@module/d' '{}' \;
    
    verification:
    
        git diff -U0 | sort -u | grep "module"
    
    https://issues.apache.org/jira/browse/SIS-565
---
 .../src/main/java/org/apache/sis/console/AboutCommand.java            | 1 -
 .../sis-console/src/main/java/org/apache/sis/console/CRSCommand.java  | 1 -
 .../sis-console/src/main/java/org/apache/sis/console/Command.java     | 1 -
 .../src/main/java/org/apache/sis/console/CommandRunner.java           | 1 -
 .../src/main/java/org/apache/sis/console/FormattedOutputCommand.java  | 1 -
 .../sis-console/src/main/java/org/apache/sis/console/HelpCommand.java | 1 -
 .../src/main/java/org/apache/sis/console/IdentifierCommand.java       | 1 -
 .../src/main/java/org/apache/sis/console/InvalidCommandException.java | 1 -
 .../src/main/java/org/apache/sis/console/InvalidOptionException.java  | 1 -
 .../src/main/java/org/apache/sis/console/MetadataCommand.java         | 1 -
 .../src/main/java/org/apache/sis/console/MimeTypeCommand.java         | 1 -
 .../sis-console/src/main/java/org/apache/sis/console/Option.java      | 1 -
 .../src/main/java/org/apache/sis/console/OutputFormat.java            | 1 -
 .../src/main/java/org/apache/sis/console/ResourcesDownloader.java     | 1 -
 .../src/main/java/org/apache/sis/console/TransformCommand.java        | 1 -
 .../src/main/java/org/apache/sis/console/package-info.java            | 1 -
 .../src/test/java/org/apache/sis/console/AboutCommandTest.java        | 1 -
 .../src/test/java/org/apache/sis/console/CRSCommandTest.java          | 1 -
 .../src/test/java/org/apache/sis/console/CommandRunnerTest.java       | 1 -
 .../src/test/java/org/apache/sis/console/HelpCommandTest.java         | 1 -
 .../src/test/java/org/apache/sis/console/MetadataCommandTest.java     | 1 -
 .../src/test/java/org/apache/sis/console/MimeTypeCommandTest.java     | 1 -
 .../src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java     | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/gui/AboutDialog.java      | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/gui/DataViewer.java       | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/gui/SystemMonitor.java    | 1 -
 application/sis-javafx/src/main/java/org/apache/sis/gui/Widget.java   | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/BandRangeTable.java     | 1 -
 .../main/java/org/apache/sis/gui/coverage/BandSelectionListener.java  | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/CellFormat.java         | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/CoverageCanvas.java     | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/CoverageControls.java   | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java   | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/CoverageStyling.java    | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/GridCell.java           | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/GridControls.java       | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/GridError.java          | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridRow.java | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/GridRowSkin.java        | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/GridSliceSelector.java  | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/GridTile.java           | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/GridTileCache.java      | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/GridView.java           | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java       | 1 -
 .../main/java/org/apache/sis/gui/coverage/ImagePropertyExplorer.java  | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/ImageRequest.java       | 1 -
 .../main/java/org/apache/sis/gui/coverage/InterpolationConverter.java | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/IsolineRenderer.java    | 1 -
 .../java/org/apache/sis/gui/coverage/MultiResolutionImageLoader.java  | 1 -
 .../main/java/org/apache/sis/gui/coverage/PropertyPaneCreator.java    | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/Stretching.java         | 1 -
 .../main/java/org/apache/sis/gui/coverage/StyledRenderingData.java    | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java    | 1 -
 .../src/main/java/org/apache/sis/gui/coverage/package-info.java       | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/ExpandableList.java      | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java     | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/FeatureList.java         | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java       | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/FeatureTable.java        | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/LogViewer.java           | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/PathAction.java          | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/ResourceCell.java        | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/ResourceExplorer.java    | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/ResourceItem.java        | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/ResourceTree.java        | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/RootResource.java        | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/TreeViewType.java        | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/WindowHandler.java       | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/WindowManager.java       | 1 -
 .../src/main/java/org/apache/sis/gui/dataset/package-info.java        | 1 -
 .../src/main/java/org/apache/sis/gui/map/GestureFollower.java         | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java    | 2 --
 .../sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvasAWT.java | 2 --
 .../sis-javafx/src/main/java/org/apache/sis/gui/map/MapMenu.java      | 1 -
 .../src/main/java/org/apache/sis/gui/map/OperationFinder.java         | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java    | 1 -
 .../src/main/java/org/apache/sis/gui/map/ValuesFormatter.java         | 1 -
 .../src/main/java/org/apache/sis/gui/map/ValuesFromCoverage.java      | 1 -
 .../src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java       | 2 --
 .../sis-javafx/src/main/java/org/apache/sis/gui/map/package-info.java | 1 -
 .../src/main/java/org/apache/sis/gui/metadata/IdentificationInfo.java | 1 -
 .../src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java    | 1 -
 .../src/main/java/org/apache/sis/gui/metadata/MetadataTree.java       | 1 -
 .../src/main/java/org/apache/sis/gui/metadata/RepresentationInfo.java | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/gui/metadata/Section.java | 1 -
 .../main/java/org/apache/sis/gui/metadata/StandardMetadataTree.java   | 1 -
 .../src/main/java/org/apache/sis/gui/metadata/VerboseFormats.java     | 1 -
 .../src/main/java/org/apache/sis/gui/metadata/package-info.java       | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/gui/package-info.java     | 1 -
 .../src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java  | 1 -
 .../src/main/java/org/apache/sis/gui/referencing/CRSChooser.java      | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/gui/referencing/Code.java | 1 -
 .../src/main/java/org/apache/sis/gui/referencing/CodeFilter.java      | 1 -
 .../src/main/java/org/apache/sis/gui/referencing/MenuSync.java        | 1 -
 .../java/org/apache/sis/gui/referencing/ObjectStringConverter.java    | 1 -
 .../java/org/apache/sis/gui/referencing/PositionableProjection.java   | 1 -
 .../java/org/apache/sis/gui/referencing/RecentReferenceSystems.java   | 1 -
 .../src/main/java/org/apache/sis/gui/referencing/Utils.java           | 1 -
 .../src/main/java/org/apache/sis/gui/referencing/WKTPane.java         | 1 -
 .../src/main/java/org/apache/sis/gui/referencing/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/internal/gui/BackgroundThreads.java  | 1 -
 .../src/main/java/org/apache/sis/internal/gui/ColorName.java          | 1 -
 .../src/main/java/org/apache/sis/internal/gui/DataFormats.java        | 1 -
 .../src/main/java/org/apache/sis/internal/gui/DataStoreOpener.java    | 1 -
 .../src/main/java/org/apache/sis/internal/gui/ExceptionReporter.java  | 1 -
 .../main/java/org/apache/sis/internal/gui/FixedHeaderColumnSize.java  | 1 -
 .../src/main/java/org/apache/sis/internal/gui/GUIUtilities.java       | 1 -
 .../main/java/org/apache/sis/internal/gui/IdentityValueFactory.java   | 1 -
 .../src/main/java/org/apache/sis/internal/gui/ImageConverter.java     | 1 -
 .../java/org/apache/sis/internal/gui/ImmutableObjectProperty.java     | 1 -
 .../src/main/java/org/apache/sis/internal/gui/LogHandler.java         | 1 -
 .../src/main/java/org/apache/sis/internal/gui/MouseDrags.java         | 1 -
 .../main/java/org/apache/sis/internal/gui/NonNullObjectProperty.java  | 1 -
 .../main/java/org/apache/sis/internal/gui/OptionalDataDownloader.java | 1 -
 .../src/main/java/org/apache/sis/internal/gui/PrivateAccess.java      | 1 -
 .../main/java/org/apache/sis/internal/gui/PropertyValueFormats.java   | 1 -
 .../main/java/org/apache/sis/internal/gui/PropertyValueFormatter.java | 1 -
 .../src/main/java/org/apache/sis/internal/gui/PropertyView.java       | 1 -
 .../src/main/java/org/apache/sis/internal/gui/RecentChoices.java      | 1 -
 .../src/main/java/org/apache/sis/internal/gui/Resources.java          | 1 -
 .../sis-javafx/src/main/java/org/apache/sis/internal/gui/Styles.java  | 1 -
 .../src/main/java/org/apache/sis/internal/gui/ToolbarButton.java      | 1 -
 .../src/main/java/org/apache/sis/internal/gui/control/ColorCell.java  | 1 -
 .../java/org/apache/sis/internal/gui/control/ColorColumnHandler.java  | 1 -
 .../src/main/java/org/apache/sis/internal/gui/control/ColorRamp.java  | 1 -
 .../java/org/apache/sis/internal/gui/control/FormatApplicator.java    | 1 -
 .../java/org/apache/sis/internal/gui/control/FormatTableCell.java     | 1 -
 .../main/java/org/apache/sis/internal/gui/control/SyncWindowList.java | 1 -
 .../main/java/org/apache/sis/internal/gui/control/TabularWidget.java  | 1 -
 .../java/org/apache/sis/internal/gui/control/ValueColorMapper.java    | 1 -
 .../main/java/org/apache/sis/internal/gui/control/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/internal/gui/io/FileAccessItem.java  | 1 -
 .../src/main/java/org/apache/sis/internal/gui/io/FileAccessView.java  | 1 -
 .../src/main/java/org/apache/sis/internal/gui/io/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/internal/gui/package-info.java       | 1 -
 .../src/main/java/org/apache/sis/internal/setup/FXFinder.java         | 1 -
 .../src/main/java/org/apache/sis/internal/setup/Inflater.java         | 1 -
 .../src/main/java/org/apache/sis/internal/setup/Wizard.java           | 1 -
 .../src/main/java/org/apache/sis/internal/setup/WizardPage.java       | 1 -
 .../src/main/java/org/apache/sis/internal/setup/package-info.java     | 1 -
 .../src/test/java/org/apache/sis/gui/coverage/CoverageCanvasApp.java  | 1 -
 .../src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java | 1 -
 .../test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java   | 1 -
 .../src/test/java/org/apache/sis/gui/coverage/GridViewApp.java        | 1 -
 .../src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java   | 1 -
 .../src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java   | 1 -
 .../java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java | 1 -
 .../src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java | 1 -
 .../src/main/java/org/apache/sis/openoffice/AnglePattern.java         | 1 -
 .../src/main/java/org/apache/sis/openoffice/CacheKey.java             | 1 -
 .../src/main/java/org/apache/sis/openoffice/CalcAddins.java           | 1 -
 .../src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java | 1 -
 .../src/main/java/org/apache/sis/openoffice/Registration.java         | 1 -
 .../src/main/java/org/apache/sis/openoffice/Transformer.java          | 1 -
 .../src/main/java/org/apache/sis/openoffice/XReferencing.java         | 1 -
 .../src/main/java/org/apache/sis/openoffice/package-info.java         | 1 -
 .../test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java | 1 -
 .../src/test/java/org/apache/sis/openoffice/TransformerTest.java      | 1 -
 .../src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java  | 1 -
 .../src/main/java/org/apache/sis/services/OSGiActivator.java          | 1 -
 .../src/main/java/org/apache/sis/services/ServletListener.java        | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/internal/Resources.java    | 2 --
 .../src/main/java/org/apache/sis/cloud/aws/internal/package-info.java | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java        | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java  | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java   | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java        | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/FileService.java        | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java            | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java     | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java   | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java       | 1 -
 .../src/main/java/org/apache/sis/cloud/aws/s3/package-info.java       | 1 -
 .../test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java   | 1 -
 .../src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java | 1 -
 .../src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java        | 1 -
 .../src/main/java/org/apache/sis/internal/book/Characters.java        | 1 -
 .../src/main/java/org/apache/sis/internal/book/CodeColorizer.java     | 1 -
 .../src/main/java/org/apache/sis/internal/doclet/Doclet.java          | 1 -
 .../src/main/java/org/apache/sis/internal/doclet/Include.java         | 1 -
 .../src/main/java/org/apache/sis/internal/doclet/Module.java          | 1 -
 .../src/main/java/org/apache/sis/internal/doclet/Preformat.java       | 1 -
 .../src/main/java/org/apache/sis/internal/doclet/Rewriter.java        | 1 -
 .../src/main/java/org/apache/sis/internal/doclet/Taglet.java          | 1 -
 .../src/main/java/org/apache/sis/internal/doclet/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/internal/maven/Assembler.java        | 1 -
 .../src/main/java/org/apache/sis/internal/maven/Filenames.java        | 1 -
 .../src/main/java/org/apache/sis/internal/maven/JarCollector.java     | 1 -
 .../src/main/java/org/apache/sis/internal/maven/package-info.java     | 1 -
 .../src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java       | 1 -
 .../src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java          | 1 -
 .../src/main/java/org/apache/sis/internal/unopkg/package-info.java    | 1 -
 .../java/org/apache/sis/util/resources/IndexedResourceCompiler.java   | 1 -
 .../java/org/apache/sis/util/resources/ResourceCompilerException.java | 1 -
 .../main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java | 1 -
 .../java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java  | 1 -
 core/sis-cql/src/main/java/org/apache/sis/cql/CQL.java                | 1 -
 core/sis-cql/src/main/java/org/apache/sis/cql/CQLException.java       | 1 -
 core/sis-cql/src/main/java/org/apache/sis/cql/FilterToCQLVisitor.java | 1 -
 core/sis-cql/src/main/java/org/apache/sis/internal/cql/AntlrCQL.java  | 1 -
 core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java        | 1 -
 core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java       | 1 -
 .../src/test/java/org/apache/sis/cql/ExpressionReadingTest.java       | 1 -
 .../src/test/java/org/apache/sis/cql/ExpressionWritingTest.java       | 1 -
 core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java  | 1 -
 core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java  | 1 -
 .../src/main/java/org/apache/sis/coverage/BandedCoverage.java         | 2 --
 core/sis-feature/src/main/java/org/apache/sis/coverage/Category.java  | 1 -
 .../src/main/java/org/apache/sis/coverage/CategoryList.java           | 1 -
 .../src/main/java/org/apache/sis/coverage/ConvertedCategory.java      | 1 -
 .../src/main/java/org/apache/sis/coverage/ConvertedRange.java         | 1 -
 .../java/org/apache/sis/coverage/IllegalSampleDimensionException.java | 1 -
 .../org/apache/sis/coverage/MismatchedCoverageRangeException.java     | 1 -
 .../src/main/java/org/apache/sis/coverage/RegionOfInterest.java       | 1 -
 .../src/main/java/org/apache/sis/coverage/SampleDimension.java        | 2 --
 .../src/main/java/org/apache/sis/coverage/SampleRangeFormat.java      | 1 -
 .../java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java   | 1 -
 core/sis-feature/src/main/java/org/apache/sis/coverage/ToNaN.java     | 1 -
 .../main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java  | 1 -
 .../main/java/org/apache/sis/coverage/grid/ConvertedGridCoverage.java | 1 -
 .../java/org/apache/sis/coverage/grid/CoordinateOperationFinder.java  | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/DefaultEvaluator.java  | 1 -
 .../main/java/org/apache/sis/coverage/grid/DerivedGridCoverage.java   | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/DimensionReducer.java  | 1 -
 .../java/org/apache/sis/coverage/grid/DisjointExtentException.java    | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/DomainLinearizer.java  | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/EvaluatorWrapper.java  | 1 -
 .../java/org/apache/sis/coverage/grid/FractionalGridCoordinates.java  | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/GridClippingMode.java  | 1 -
 .../main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java   | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/GridCoverage.java      | 2 --
 .../src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java    | 1 -
 .../main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java   | 1 -
 .../main/java/org/apache/sis/coverage/grid/GridCoverageProcessor.java | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/GridDerivation.java    | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/GridExtent.java        | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/GridExtentCRS.java     | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/GridGeometry.java      | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/GridOrientation.java   | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java  | 1 -
 .../org/apache/sis/coverage/grid/IllegalGridGeometryException.java    | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java     | 1 -
 .../org/apache/sis/coverage/grid/IncompleteGridGeometryException.java | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java  | 1 -
 .../main/java/org/apache/sis/coverage/grid/ResampledGridCoverage.java | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/ReshapedImage.java     | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/SliceGeometry.java     | 1 -
 .../java/org/apache/sis/coverage/grid/TranslatedGridCoverage.java     | 1 -
 .../src/main/java/org/apache/sis/coverage/grid/package-info.java      | 1 -
 .../src/main/java/org/apache/sis/coverage/package-info.java           | 1 -
 .../src/main/java/org/apache/sis/feature/AbstractAssociation.java     | 1 -
 .../src/main/java/org/apache/sis/feature/AbstractAttribute.java       | 1 -
 .../src/main/java/org/apache/sis/feature/AbstractFeature.java         | 1 -
 .../src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java  | 1 -
 .../src/main/java/org/apache/sis/feature/AbstractOperation.java       | 1 -
 .../src/main/java/org/apache/sis/feature/AssociationView.java         | 1 -
 .../src/main/java/org/apache/sis/feature/AttributeView.java           | 1 -
 .../src/main/java/org/apache/sis/feature/CharacteristicMap.java       | 1 -
 .../src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java   | 1 -
 .../src/main/java/org/apache/sis/feature/CommonParentFinder.java      | 1 -
 .../src/main/java/org/apache/sis/feature/DefaultAssociationRole.java  | 1 -
 .../src/main/java/org/apache/sis/feature/DefaultAttributeType.java    | 1 -
 .../src/main/java/org/apache/sis/feature/DefaultFeatureType.java      | 1 -
 .../src/main/java/org/apache/sis/feature/DenseFeature.java            | 1 -
 .../src/main/java/org/apache/sis/feature/EnvelopeOperation.java       | 1 -
 .../src/main/java/org/apache/sis/feature/FeatureFormat.java           | 1 -
 .../main/java/org/apache/sis/feature/FeatureOperationException.java   | 1 -
 .../src/main/java/org/apache/sis/feature/FeatureOperations.java       | 1 -
 core/sis-feature/src/main/java/org/apache/sis/feature/Features.java   | 1 -
 core/sis-feature/src/main/java/org/apache/sis/feature/Field.java      | 1 -
 core/sis-feature/src/main/java/org/apache/sis/feature/FieldType.java  | 1 -
 .../src/main/java/org/apache/sis/feature/FoliationRepresentation.java | 1 -
 .../src/main/java/org/apache/sis/feature/InvalidFeatureException.java | 1 -
 .../src/main/java/org/apache/sis/feature/LinkOperation.java           | 1 -
 .../src/main/java/org/apache/sis/feature/MultiValuedAssociation.java  | 1 -
 .../src/main/java/org/apache/sis/feature/MultiValuedAttribute.java    | 1 -
 .../src/main/java/org/apache/sis/feature/NamedFeatureType.java        | 1 -
 .../src/main/java/org/apache/sis/feature/PropertySingleton.java       | 1 -
 .../src/main/java/org/apache/sis/feature/PropertyView.java            | 1 -
 .../src/main/java/org/apache/sis/feature/SingletonAssociation.java    | 1 -
 .../src/main/java/org/apache/sis/feature/SingletonAttribute.java      | 1 -
 .../src/main/java/org/apache/sis/feature/SparseFeature.java           | 1 -
 .../src/main/java/org/apache/sis/feature/StringJoinOperation.java     | 1 -
 core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java  | 1 -
 .../java/org/apache/sis/feature/builder/AssociationRoleBuilder.java   | 1 -
 .../src/main/java/org/apache/sis/feature/builder/AttributeRole.java   | 1 -
 .../java/org/apache/sis/feature/builder/AttributeTypeBuilder.java     | 1 -
 .../org/apache/sis/feature/builder/CharacteristicTypeBuilder.java     | 1 -
 .../main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java  | 1 -
 .../main/java/org/apache/sis/feature/builder/OperationWrapper.java    | 1 -
 .../main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java | 1 -
 .../src/main/java/org/apache/sis/feature/builder/RemoveOnlyList.java  | 1 -
 .../src/main/java/org/apache/sis/feature/builder/TypeBuilder.java     | 1 -
 .../src/main/java/org/apache/sis/feature/builder/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/feature/package-info.java            | 1 -
 .../src/main/java/org/apache/sis/filter/ArithmeticFunction.java       | 1 -
 .../src/main/java/org/apache/sis/filter/AssociationValue.java         | 1 -
 .../src/main/java/org/apache/sis/filter/BinaryFunction.java           | 1 -
 .../src/main/java/org/apache/sis/filter/BinaryGeometryFilter.java     | 1 -
 .../src/main/java/org/apache/sis/filter/BinarySpatialFilter.java      | 1 -
 .../sis-feature/src/main/java/org/apache/sis/filter/Capabilities.java | 1 -
 .../src/main/java/org/apache/sis/filter/ComparisonFilter.java         | 1 -
 .../src/main/java/org/apache/sis/filter/ConvertFunction.java          | 1 -
 .../src/main/java/org/apache/sis/filter/DefaultFilterFactory.java     | 1 -
 .../src/main/java/org/apache/sis/filter/DefaultSortProperty.java      | 1 -
 .../src/main/java/org/apache/sis/filter/DistanceFilter.java           | 1 -
 core/sis-feature/src/main/java/org/apache/sis/filter/FilterNode.java  | 1 -
 .../src/main/java/org/apache/sis/filter/IdentifierFilter.java         | 1 -
 .../src/main/java/org/apache/sis/filter/LeafExpression.java           | 1 -
 core/sis-feature/src/main/java/org/apache/sis/filter/LikeFilter.java  | 1 -
 .../src/main/java/org/apache/sis/filter/LogicalFilter.java            | 1 -
 .../sis-feature/src/main/java/org/apache/sis/filter/Optimization.java | 1 -
 .../src/main/java/org/apache/sis/filter/PropertyValue.java            | 1 -
 .../src/main/java/org/apache/sis/filter/TemporalFilter.java           | 1 -
 .../src/main/java/org/apache/sis/filter/UnaryFunction.java            | 1 -
 core/sis-feature/src/main/java/org/apache/sis/filter/XPath.java       | 1 -
 .../sis-feature/src/main/java/org/apache/sis/filter/package-info.java | 1 -
 .../src/main/java/org/apache/sis/image/AnnotatedImage.java            | 1 -
 .../src/main/java/org/apache/sis/image/BandSelectImage.java           | 1 -
 .../src/main/java/org/apache/sis/image/BandedIterator.java            | 1 -
 .../src/main/java/org/apache/sis/image/BandedSampleConverter.java     | 1 -
 .../sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java | 1 -
 .../sis-feature/src/main/java/org/apache/sis/image/ComputedTiles.java | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/DataType.java     | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/ErrorAction.java  | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/ErrorHandler.java | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/ImageAdapter.java | 1 -
 .../sis-feature/src/main/java/org/apache/sis/image/ImageCombiner.java | 1 -
 .../src/main/java/org/apache/sis/image/ImageProcessor.java            | 1 -
 .../sis-feature/src/main/java/org/apache/sis/image/Interpolation.java | 1 -
 .../src/main/java/org/apache/sis/image/LanczosInterpolation.java      | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/MaskImage.java    | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/MaskedImage.java  | 1 -
 .../sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java | 2 --
 core/sis-feature/src/main/java/org/apache/sis/image/PlanarImage.java  | 1 -
 .../main/java/org/apache/sis/image/PositionalConsistencyImage.java    | 1 -
 .../src/main/java/org/apache/sis/image/PrefetchedImage.java           | 1 -
 .../src/main/java/org/apache/sis/image/RecoloredImage.java            | 1 -
 .../src/main/java/org/apache/sis/image/ResampledImage.java            | 1 -
 .../src/main/java/org/apache/sis/image/ResamplingGrid.java            | 1 -
 .../src/main/java/org/apache/sis/image/SourceAlignedImage.java        | 1 -
 .../src/main/java/org/apache/sis/image/StatisticsCalculator.java      | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/TileCache.java    | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/TransferType.java | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/Transferer.java   | 1 -
 .../sis-feature/src/main/java/org/apache/sis/image/Visualization.java | 1 -
 .../src/main/java/org/apache/sis/image/WritablePixelIterator.java     | 1 -
 core/sis-feature/src/main/java/org/apache/sis/image/package-info.java | 1 -
 .../src/main/java/org/apache/sis/index/tree/NodeIterator.java         | 1 -
 .../src/main/java/org/apache/sis/index/tree/PointTree.java            | 1 -
 .../src/main/java/org/apache/sis/index/tree/PointTreeNode.java        | 1 -
 .../src/main/java/org/apache/sis/index/tree/QuadTreeNode.java         | 1 -
 .../src/main/java/org/apache/sis/index/tree/package-info.java         | 1 -
 .../main/java/org/apache/sis/internal/coverage/CoverageCombiner.java  | 1 -
 .../main/java/org/apache/sis/internal/coverage/SampleDimensions.java  | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/BatchComputedImage.java | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java  | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/ColorModelType.java     | 1 -
 .../src/main/java/org/apache/sis/internal/coverage/j2d/Colorizer.java | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/ColorsForRange.java     | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/DeferredProperty.java   | 1 -
 .../main/java/org/apache/sis/internal/coverage/j2d/FillValues.java    | 1 -
 .../main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java   | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/ImageUtilities.java     | 1 -
 .../apache/sis/internal/coverage/j2d/MultiBandsIndexColorModel.java   | 1 -
 .../main/java/org/apache/sis/internal/coverage/j2d/RasterFactory.java | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/SampleModelFactory.java | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/ScaledColorModel.java   | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/ScaledColorSpace.java   | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/TileErrorHandler.java   | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/TileOpExecutor.java     | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/TilePlaceholder.java    | 1 -
 .../main/java/org/apache/sis/internal/coverage/j2d/TiledImage.java    | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/WritableTiledImage.java | 1 -
 .../main/java/org/apache/sis/internal/coverage/j2d/WriteSupport.java  | 1 -
 .../main/java/org/apache/sis/internal/coverage/j2d/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/internal/coverage/package-info.java  | 1 -
 .../main/java/org/apache/sis/internal/feature/AbstractGeometry.java   | 1 -
 .../java/org/apache/sis/internal/feature/AttributeConvention.java     | 1 -
 .../main/java/org/apache/sis/internal/feature/FeatureExpression.java  | 1 -
 .../main/java/org/apache/sis/internal/feature/FeatureUtilities.java   | 1 -
 .../src/main/java/org/apache/sis/internal/feature/Geometries.java     | 1 -
 .../main/java/org/apache/sis/internal/feature/GeometryFactories.java  | 1 -
 .../src/main/java/org/apache/sis/internal/feature/GeometryType.java   | 1 -
 .../main/java/org/apache/sis/internal/feature/GeometryWithCRS.java    | 1 -
 .../main/java/org/apache/sis/internal/feature/GeometryWrapper.java    | 1 -
 .../src/main/java/org/apache/sis/internal/feature/InstantList.java    | 1 -
 .../src/main/java/org/apache/sis/internal/feature/MovingFeatures.java | 1 -
 .../src/main/java/org/apache/sis/internal/feature/Resources.java      | 2 --
 .../java/org/apache/sis/internal/feature/SpatialOperationContext.java | 1 -
 .../src/main/java/org/apache/sis/internal/feature/esri/Factory.java   | 1 -
 .../src/main/java/org/apache/sis/internal/feature/esri/Wrapper.java   | 1 -
 .../main/java/org/apache/sis/internal/feature/esri/package-info.java  | 1 -
 .../org/apache/sis/internal/feature/j2d/DecimatedPathIterator.java    | 1 -
 .../main/java/org/apache/sis/internal/feature/j2d/DecimatedShape.java | 1 -
 .../src/main/java/org/apache/sis/internal/feature/j2d/EmptyShape.java | 1 -
 .../src/main/java/org/apache/sis/internal/feature/j2d/Factory.java    | 1 -
 .../src/main/java/org/apache/sis/internal/feature/j2d/FlatShape.java  | 1 -
 .../main/java/org/apache/sis/internal/feature/j2d/MultiPolylines.java | 1 -
 .../main/java/org/apache/sis/internal/feature/j2d/PathBuilder.java    | 1 -
 .../main/java/org/apache/sis/internal/feature/j2d/PointWrapper.java   | 1 -
 .../src/main/java/org/apache/sis/internal/feature/j2d/Polygon.java    | 1 -
 .../src/main/java/org/apache/sis/internal/feature/j2d/Polyline.java   | 1 -
 .../java/org/apache/sis/internal/feature/j2d/ShapeProperties.java     | 1 -
 .../main/java/org/apache/sis/internal/feature/j2d/ShapeWrapper.java   | 1 -
 .../src/main/java/org/apache/sis/internal/feature/j2d/Wrapper.java    | 1 -
 .../main/java/org/apache/sis/internal/feature/j2d/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/internal/feature/jts/Factory.java    | 1 -
 .../java/org/apache/sis/internal/feature/jts/FilteringContext.java    | 1 -
 .../apache/sis/internal/feature/jts/GeometryCoordinateTransform.java  | 1 -
 .../java/org/apache/sis/internal/feature/jts/GeometryTransform.java   | 1 -
 .../src/main/java/org/apache/sis/internal/feature/jts/JTS.java        | 1 -
 .../org/apache/sis/internal/feature/jts/PackedCoordinateSequence.java | 1 -
 .../sis/internal/feature/jts/PackedCoordinateSequenceFactory.java     | 1 -
 .../java/org/apache/sis/internal/feature/jts/PathIteratorAdapter.java | 1 -
 .../main/java/org/apache/sis/internal/feature/jts/ShapeAdapter.java   | 1 -
 .../main/java/org/apache/sis/internal/feature/jts/ShapeConverter.java | 1 -
 .../src/main/java/org/apache/sis/internal/feature/jts/Wrapper.java    | 1 -
 .../main/java/org/apache/sis/internal/feature/jts/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/internal/feature/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/internal/filter/FunctionNames.java   | 1 -
 .../main/java/org/apache/sis/internal/filter/FunctionRegister.java    | 1 -
 .../main/java/org/apache/sis/internal/filter/GeometryConverter.java   | 1 -
 .../src/main/java/org/apache/sis/internal/filter/Node.java            | 1 -
 .../main/java/org/apache/sis/internal/filter/SortByComparator.java    | 1 -
 .../src/main/java/org/apache/sis/internal/filter/Visitor.java         | 1 -
 .../src/main/java/org/apache/sis/internal/filter/package-info.java    | 1 -
 .../java/org/apache/sis/internal/filter/sqlmm/FunctionWithSRID.java   | 1 -
 .../org/apache/sis/internal/filter/sqlmm/GeometryConstructor.java     | 1 -
 .../java/org/apache/sis/internal/filter/sqlmm/GeometryParser.java     | 1 -
 .../main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java   | 1 -
 .../src/main/java/org/apache/sis/internal/filter/sqlmm/Registry.java  | 1 -
 .../src/main/java/org/apache/sis/internal/filter/sqlmm/SQLMM.java     | 1 -
 .../main/java/org/apache/sis/internal/filter/sqlmm/ST_FromBinary.java | 1 -
 .../main/java/org/apache/sis/internal/filter/sqlmm/ST_FromText.java   | 1 -
 .../src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Point.java  | 1 -
 .../main/java/org/apache/sis/internal/filter/sqlmm/ST_Transform.java  | 1 -
 .../java/org/apache/sis/internal/filter/sqlmm/SpatialFunction.java    | 1 -
 .../main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java | 1 -
 .../main/java/org/apache/sis/internal/filter/sqlmm/package-info.java  | 1 -
 .../java/org/apache/sis/internal/processing/image/CompoundFuture.java | 1 -
 .../java/org/apache/sis/internal/processing/image/TiledProcess.java   | 1 -
 .../java/org/apache/sis/internal/processing/image/package-info.java   | 1 -
 .../java/org/apache/sis/internal/processing/isoline/Fragments.java    | 1 -
 .../java/org/apache/sis/internal/processing/isoline/Isolines.java     | 1 -
 .../main/java/org/apache/sis/internal/processing/isoline/Joiner.java  | 1 -
 .../java/org/apache/sis/internal/processing/isoline/Parallelized.java | 1 -
 .../org/apache/sis/internal/processing/isoline/PolylineBuffer.java    | 1 -
 .../org/apache/sis/internal/processing/isoline/PolylineStage.java     | 1 -
 .../main/java/org/apache/sis/internal/processing/isoline/Result.java  | 1 -
 .../main/java/org/apache/sis/internal/processing/isoline/Tracer.java  | 1 -
 .../java/org/apache/sis/internal/processing/isoline/package-info.java | 1 -
 .../src/test/java/org/apache/sis/coverage/CategoryListTest.java       | 1 -
 .../src/test/java/org/apache/sis/coverage/CategoryTest.java           | 1 -
 .../src/test/java/org/apache/sis/coverage/SampleDimensionTest.java    | 1 -
 .../src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java  | 1 -
 .../java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java   | 1 -
 .../java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java  | 1 -
 .../org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java   | 1 -
 .../test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java    | 1 -
 .../test/java/org/apache/sis/coverage/grid/GridDerivationTest.java    | 1 -
 .../src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java    | 1 -
 .../src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java  | 1 -
 .../test/java/org/apache/sis/coverage/grid/GridOrientationTest.java   | 1 -
 .../test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java  | 1 -
 .../java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java  | 1 -
 .../src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java | 1 -
 .../java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java | 1 -
 .../src/test/java/org/apache/sis/feature/AbstractFeatureTest.java     | 1 -
 .../src/test/java/org/apache/sis/feature/AbstractOperationTest.java   | 1 -
 .../src/test/java/org/apache/sis/feature/CharacteristicMapTest.java   | 1 -
 .../test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java   | 1 -
 .../src/test/java/org/apache/sis/feature/CustomAttribute.java         | 1 -
 .../test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java  | 1 -
 .../test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java    | 1 -
 .../src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java  | 1 -
 .../src/test/java/org/apache/sis/feature/DenseFeatureTest.java        | 1 -
 .../src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java   | 1 -
 .../src/test/java/org/apache/sis/feature/FeatureFormatTest.java       | 1 -
 .../src/test/java/org/apache/sis/feature/FeatureOperationsTest.java   | 1 -
 .../src/test/java/org/apache/sis/feature/FeatureTestCase.java         | 1 -
 .../src/test/java/org/apache/sis/feature/FeaturesTest.java            | 1 -
 .../src/test/java/org/apache/sis/feature/LinkOperationTest.java       | 1 -
 .../test/java/org/apache/sis/feature/MultiValuedAttributeTest.java    | 1 -
 .../sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java | 1 -
 .../src/test/java/org/apache/sis/feature/PropertySingletonTest.java   | 1 -
 .../test/java/org/apache/sis/feature/SingletonAssociationTest.java    | 1 -
 .../src/test/java/org/apache/sis/feature/SingletonAttributeTest.java  | 1 -
 .../src/test/java/org/apache/sis/feature/SparseFeatureTest.java       | 1 -
 .../src/test/java/org/apache/sis/feature/StringJoinOperationTest.java | 1 -
 .../org/apache/sis/feature/builder/AssociationRoleBuilderTest.java    | 1 -
 .../java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java | 1 -
 .../org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java | 1 -
 .../java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java   | 1 -
 .../src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java   | 1 -
 .../test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java  | 1 -
 .../java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java | 1 -
 .../java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java  | 1 -
 .../org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java    | 1 -
 .../src/test/java/org/apache/sis/filter/CapabilitiesTest.java         | 1 -
 .../src/test/java/org/apache/sis/filter/ComparisonFilterTest.java     | 1 -
 .../src/test/java/org/apache/sis/filter/IdentifierFilterTest.java     | 1 -
 .../src/test/java/org/apache/sis/filter/LeafExpressionTest.java       | 1 -
 .../src/test/java/org/apache/sis/filter/LikeFilterTest.java           | 1 -
 .../src/test/java/org/apache/sis/filter/LogicalFilterTest.java        | 1 -
 .../src/test/java/org/apache/sis/filter/PeriodLiteral.java            | 1 -
 .../src/test/java/org/apache/sis/filter/TemporalFilterTest.java       | 1 -
 core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java   | 1 -
 .../src/test/java/org/apache/sis/image/BandSelectImageTest.java       | 1 -
 .../src/test/java/org/apache/sis/image/BandedSampleConverterTest.java | 1 -
 .../src/test/java/org/apache/sis/image/ComputedImageTest.java         | 1 -
 core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java | 1 -
 .../src/test/java/org/apache/sis/image/ImageCombinerTest.java         | 1 -
 .../src/test/java/org/apache/sis/image/ImageProcessorTest.java        | 1 -
 .../sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java | 1 -
 .../src/test/java/org/apache/sis/image/MaskedImageTest.java           | 1 -
 .../src/test/java/org/apache/sis/image/PixelIteratorTest.java         | 1 -
 .../src/test/java/org/apache/sis/image/PlanarImageTest.java           | 1 -
 .../src/test/java/org/apache/sis/image/ResamplingGridTest.java        | 1 -
 .../src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java  | 1 -
 core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java   | 1 -
 .../src/test/java/org/apache/sis/image/TiledImageMock.java            | 1 -
 .../src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java    | 1 -
 .../src/test/java/org/apache/sis/index/tree/PointTreeTest.java        | 1 -
 .../test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java    | 1 -
 .../java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java | 1 -
 .../org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java  | 1 -
 .../org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java    | 1 -
 .../java/org/apache/sis/internal/feature/AttributeConventionTest.java | 1 -
 .../test/java/org/apache/sis/internal/feature/GeometriesTestCase.java | 1 -
 .../test/java/org/apache/sis/internal/feature/GeometryTypeTest.java   | 1 -
 .../test/java/org/apache/sis/internal/feature/esri/FactoryTest.java   | 1 -
 .../test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java    | 1 -
 .../test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java  | 1 -
 .../java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java | 1 -
 .../test/java/org/apache/sis/internal/feature/jts/FactoryTest.java    | 1 -
 .../src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java    | 1 -
 .../java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java    | 1 -
 .../java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java  | 1 -
 .../test/java/org/apache/sis/internal/filter/FunctionNamesTest.java   | 1 -
 .../java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java   | 1 -
 .../org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java  | 1 -
 .../org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java   | 1 -
 .../apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java    | 1 -
 .../src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java | 1 -
 .../java/org/apache/sis/internal/processing/isoline/IsolinesTest.java | 1 -
 .../java/org/apache/sis/internal/processing/isoline/StepsViewer.java  | 1 -
 core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java | 1 -
 .../src/test/java/org/apache/sis/test/feature/FeatureComparator.java  | 1 -
 .../src/test/java/org/apache/sis/test/feature/package-info.java       | 1 -
 .../src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java     | 1 -
 .../main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/Context.java           | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java  | 2 --
 .../main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java     | 1 -
 .../java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/cat/package-info.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java | 1 -
 .../org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java      | 1 -
 .../java/org/apache/sis/internal/jaxb/code/DQM_ValueStructure.java    | 1 -
 .../apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java    | 1 -
 .../org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java     | 1 -
 .../java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java | 1 -
 .../org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java  | 1 -
 .../org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java   | 1 -
 .../org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java | 1 -
 .../org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java    | 1 -
 .../apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java     | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java     | 1 -
 .../org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java | 1 -
 .../sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java      | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java     | 1 -
 .../main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java  | 1 -
 .../apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java  | 1 -
 .../apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/code/package-info.java | 1 -
 .../java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java     | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/gco/GO_MultiplicityRange.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java       | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_Record.java     | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_RecordType.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_Temporal.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/GO_URL.java        | 1 -
 .../java/org/apache/sis/internal/jaxb/gco/GO_UnlimitedInteger.java    | 1 -
 .../org/apache/sis/internal/jaxb/gco/InternationalStringAdapter.java  | 1 -
 .../apache/sis/internal/jaxb/gco/InternationalStringConverter.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/Multiplicity.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gco/MultiplicityRange.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/NameValue.java     | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gco/UnlimitedInteger.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gcx/Anchor.java        | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java      | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/gcx/MimeFileTypeAdapter.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gcx/package-info.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/geometry/GM_Object.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/geometry/ObjectFactory.java     | 1 -
 .../main/java/org/apache/sis/internal/jaxb/geometry/package-info.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java     | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java       | 1 -
 .../java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gmi/package-info.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java       | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gml/MeasureList.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gml/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/gts/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/lan/Country.java       | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/lan/LanguageCode.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAdapter.java | 2 --
 .../main/java/org/apache/sis/internal/jaxb/lan/LocaleAndCharset.java  | 1 -
 .../org/apache/sis/internal/jaxb/lan/LocalisedCharacterString.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/lan/OtherLocales.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/lan/PT_Locale.java     | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/lan/TextGroup.java     | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/lan/package-info.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Party.java | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java | 1 -
 .../org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/DQM_BasicMeasure.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/DQM_Description.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/DQM_Measure.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/DQM_Parameter.java     | 1 -
 .../org/apache/sis/internal/jaxb/metadata/DQM_SourceReference.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java   | 1 -
 .../org/apache/sis/internal/jaxb/metadata/DQ_EvaluationMethod.java    | 1 -
 .../org/apache/sis/internal/jaxb/metadata/DQ_MeasureReference.java    | 1 -
 .../org/apache/sis/internal/jaxb/metadata/DQ_PositionalAccuracy.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java    | 1 -
 .../internal/jaxb/metadata/DQ_StandaloneQualityReportInformation.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java    | 1 -
 .../org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java | 1 -
 .../org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java   | 1 -
 .../org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java     | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java    | 1 -
 .../apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java    | 1 -
 .../sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java   | 1 -
 .../org/apache/sis/internal/jaxb/metadata/MD_AssociatedResource.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_AttributeGroup.java | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java    | 1 -
 .../org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java  | 1 -
 .../org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java  | 1 -
 .../apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java    | 1 -
 .../sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java     | 1 -
 .../org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java     | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java    | 1 -
 .../org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java     | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java  | 1 -
 .../apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java  | 1 -
 .../sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java  | 1 -
 .../sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java  | 1 -
 .../apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java     | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java | 1 -
 .../org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java    | 1 -
 .../apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java   | 1 -
 .../apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java    | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java | 1 -
 .../apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java  | 1 -
 .../org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Event.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GCP.java   | 1 -
 .../apache/sis/internal/jaxb/metadata/MI_GeolocationInformation.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MI_Instrument.java     | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/MI_Objective.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/MI_Operation.java | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Plan.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/MI_Platform.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MI_PlatformPass.java   | 1 -
 .../apache/sis/internal/jaxb/metadata/MI_RangeElementDescription.java | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MI_RequestedDate.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/MI_Requirement.java    | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java  | 1 -
 .../org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java     | 1 -
 .../org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java     | 1 -
 .../apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java  | 1 -
 .../org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java   | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/metadata/package-info.java | 1 -
 .../java/org/apache/sis/internal/jaxb/metadata/replace/Parameter.java | 1 -
 .../apache/sis/internal/jaxb/metadata/replace/QualityParameter.java   | 1 -
 .../org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java  | 1 -
 .../sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java   | 1 -
 .../org/apache/sis/internal/jaxb/metadata/replace/SensorType.java     | 1 -
 .../apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java   | 1 -
 .../org/apache/sis/internal/jaxb/metadata/replace/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/package-info.java      | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/AxisNames.java     | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/Dependencies.java  | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java   | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/Identifiers.java   | 1 -
 .../java/org/apache/sis/internal/metadata/ImplementationHelper.java   | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/Merger.java        | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/NameMeaning.java   | 1 -
 .../main/java/org/apache/sis/internal/metadata/NameToIdentifier.java  | 1 -
 .../main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java   | 1 -
 .../java/org/apache/sis/internal/metadata/ReferencingServices.java    | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/Resources.java     | 2 --
 .../java/org/apache/sis/internal/metadata/ServicesForUtility.java     | 1 -
 .../java/org/apache/sis/internal/metadata/TransformationAccuracy.java | 1 -
 .../java/org/apache/sis/internal/metadata/legacy/DateToTemporal.java  | 1 -
 .../apache/sis/internal/metadata/legacy/LegacyPropertyAdapter.java    | 1 -
 .../main/java/org/apache/sis/internal/metadata/legacy/MediumName.java | 1 -
 .../java/org/apache/sis/internal/metadata/legacy/TemporalToDate.java  | 1 -
 .../java/org/apache/sis/internal/metadata/legacy/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java   | 1 -
 .../main/java/org/apache/sis/internal/metadata/sql/Initializer.java   | 1 -
 .../java/org/apache/sis/internal/metadata/sql/LocalDataSource.java    | 1 -
 .../main/java/org/apache/sis/internal/metadata/sql/Reflection.java    | 1 -
 .../main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java    | 1 -
 .../main/java/org/apache/sis/internal/metadata/sql/SQLUtilities.java  | 1 -
 .../main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java  | 1 -
 .../src/main/java/org/apache/sis/internal/metadata/sql/Syntax.java    | 1 -
 .../main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java    | 1 -
 .../main/java/org/apache/sis/internal/metadata/sql/package-info.java  | 1 -
 .../main/java/org/apache/sis/internal/simple/CitationConstant.java    | 1 -
 .../main/java/org/apache/sis/internal/simple/SimpleAttributeType.java | 1 -
 .../src/main/java/org/apache/sis/internal/simple/SimpleCitation.java  | 1 -
 .../src/main/java/org/apache/sis/internal/simple/SimpleDuration.java  | 1 -
 .../src/main/java/org/apache/sis/internal/simple/SimpleExtent.java    | 1 -
 .../src/main/java/org/apache/sis/internal/simple/SimpleFormat.java    | 1 -
 .../java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java   | 1 -
 .../main/java/org/apache/sis/internal/simple/SimpleIdentifier.java    | 1 -
 .../src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java  | 1 -
 .../src/main/java/org/apache/sis/internal/simple/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/internal/xml/LegacyNamespaces.java   | 1 -
 .../main/java/org/apache/sis/internal/xml/StreamWriterDelegate.java   | 1 -
 .../src/main/java/org/apache/sis/internal/xml/XmlUtilities.java       | 1 -
 .../src/main/java/org/apache/sis/internal/xml/package-info.java       | 1 -
 .../src/main/java/org/apache/sis/metadata/AbstractMetadata.java       | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/metadata/CacheKey.java | 1 -
 .../src/main/java/org/apache/sis/metadata/DomainRange.java            | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/metadata/HashCode.java | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/metadata/IndexMap.java | 1 -
 .../src/main/java/org/apache/sis/metadata/InformationMap.java         | 1 -
 .../main/java/org/apache/sis/metadata/InvalidMetadataException.java   | 1 -
 .../src/main/java/org/apache/sis/metadata/KeyNamePolicy.java          | 1 -
 .../src/main/java/org/apache/sis/metadata/MetadataCopier.java         | 1 -
 .../src/main/java/org/apache/sis/metadata/MetadataFormat.java         | 1 -
 .../src/main/java/org/apache/sis/metadata/MetadataStandard.java       | 1 -
 .../src/main/java/org/apache/sis/metadata/MetadataVisitor.java        | 1 -
 .../main/java/org/apache/sis/metadata/MetadataVisitorException.java   | 1 -
 .../src/main/java/org/apache/sis/metadata/ModifiableMetadata.java     | 2 --
 core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java  | 1 -
 .../src/main/java/org/apache/sis/metadata/ObjectPair.java             | 1 -
 .../src/main/java/org/apache/sis/metadata/PropertyAccessor.java       | 1 -
 .../src/main/java/org/apache/sis/metadata/PropertyComparator.java     | 1 -
 .../src/main/java/org/apache/sis/metadata/PropertyInformation.java    | 1 -
 .../src/main/java/org/apache/sis/metadata/PropertyMap.java            | 3 ---
 core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java   | 1 -
 .../src/main/java/org/apache/sis/metadata/SpecialCases.java           | 1 -
 .../src/main/java/org/apache/sis/metadata/StandardImplementation.java | 1 -
 .../src/main/java/org/apache/sis/metadata/StateChanger.java           | 1 -
 .../src/main/java/org/apache/sis/metadata/TitleProperty.java          | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java | 1 -
 .../src/main/java/org/apache/sis/metadata/TreeNodeChildren.java       | 1 -
 .../src/main/java/org/apache/sis/metadata/TreeTableView.java          | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java  | 1 -
 .../src/main/java/org/apache/sis/metadata/TypeValuePolicy.java        | 1 -
 .../java/org/apache/sis/metadata/UnmodifiableMetadataException.java   | 1 -
 .../src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java   | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java | 4 ----
 .../apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java  | 1 -
 .../apache/sis/metadata/iso/DefaultExtendedElementInformation.java    | 1 -
 .../src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java  | 1 -
 .../src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java    | 1 -
 .../apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java  | 1 -
 .../main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java   | 1 -
 .../apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java   | 1 -
 .../src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java        | 1 -
 .../main/java/org/apache/sis/metadata/iso/MetadataScopeAdapter.java   | 1 -
 .../sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java   | 1 -
 .../sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java      | 1 -
 .../java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java    | 1 -
 .../org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java    | 1 -
 .../org/apache/sis/metadata/iso/acquisition/DefaultObjective.java     | 1 -
 .../org/apache/sis/metadata/iso/acquisition/DefaultOperation.java     | 1 -
 .../java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java     | 1 -
 .../java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java | 1 -
 .../org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java  | 1 -
 .../org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java | 1 -
 .../org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java   | 1 -
 .../java/org/apache/sis/metadata/iso/acquisition/package-info.java    | 1 -
 .../main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java | 1 -
 .../src/main/java/org/apache/sis/metadata/iso/citation/Citations.java | 1 -
 .../java/org/apache/sis/metadata/iso/citation/DefaultAddress.java     | 1 -
 .../java/org/apache/sis/metadata/iso/citation/DefaultCitation.java    | 1 -
 .../org/apache/sis/metadata/iso/citation/DefaultCitationDate.java     | 1 -
 .../java/org/apache/sis/metadata/iso/citation/DefaultContact.java     | 1 -
 .../java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java  | 1 -
 .../org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java   | 1 -
 .../org/apache/sis/metadata/iso/citation/DefaultOrganisation.java     | 1 -
 .../org/apache/sis/metadata/iso/citation/DefaultResponsibility.java   | 1 -
 .../org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java | 1 -
 .../main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java | 1 -
 .../java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java   | 1 -
 .../java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java   | 1 -
 .../main/java/org/apache/sis/metadata/iso/citation/package-info.java  | 1 -
 .../org/apache/sis/metadata/iso/constraint/DefaultConstraints.java    | 1 -
 .../apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java   | 1 -
 .../org/apache/sis/metadata/iso/constraint/DefaultReleasability.java  | 1 -
 .../sis/metadata/iso/constraint/DefaultSecurityConstraints.java       | 1 -
 .../java/org/apache/sis/metadata/iso/constraint/package-info.java     | 1 -
 .../apache/sis/metadata/iso/content/AbstractContentInformation.java   | 1 -
 .../org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java    | 1 -
 .../main/java/org/apache/sis/metadata/iso/content/DefaultBand.java    | 1 -
 .../apache/sis/metadata/iso/content/DefaultCoverageDescription.java   | 1 -
 .../sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java  | 1 -
 .../org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java   | 1 -
 .../org/apache/sis/metadata/iso/content/DefaultImageDescription.java  | 1 -
 .../org/apache/sis/metadata/iso/content/DefaultRangeDimension.java    | 1 -
 .../sis/metadata/iso/content/DefaultRangeElementDescription.java      | 1 -
 .../org/apache/sis/metadata/iso/content/DefaultSampleDimension.java   | 1 -
 .../main/java/org/apache/sis/metadata/iso/content/package-info.java   | 1 -
 .../org/apache/sis/metadata/iso/distribution/DefaultDataFile.java     | 1 -
 .../sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java  | 1 -
 .../org/apache/sis/metadata/iso/distribution/DefaultDistribution.java | 1 -
 .../org/apache/sis/metadata/iso/distribution/DefaultDistributor.java  | 1 -
 .../java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java  | 1 -
 .../java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java  | 1 -
 .../sis/metadata/iso/distribution/DefaultStandardOrderProcess.java    | 1 -
 .../java/org/apache/sis/metadata/iso/distribution/package-info.java   | 1 -
 .../org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java  | 1 -
 .../org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java    | 1 -
 .../main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java   | 1 -
 .../apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java  | 1 -
 .../apache/sis/metadata/iso/extent/DefaultGeographicDescription.java  | 1 -
 .../apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java  | 1 -
 .../org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java     | 1 -
 .../org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java     | 1 -
 .../src/main/java/org/apache/sis/metadata/iso/extent/Extents.java     | 1 -
 .../main/java/org/apache/sis/metadata/iso/extent/package-info.java    | 1 -
 .../sis/metadata/iso/identification/AbstractIdentification.java       | 1 -
 .../sis/metadata/iso/identification/DefaultAggregateInformation.java  | 1 -
 .../sis/metadata/iso/identification/DefaultAssociatedResource.java    | 1 -
 .../apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java  | 1 -
 .../sis/metadata/iso/identification/DefaultCoupledResource.java       | 1 -
 .../sis/metadata/iso/identification/DefaultDataIdentification.java    | 1 -
 .../apache/sis/metadata/iso/identification/DefaultKeywordClass.java   | 1 -
 .../org/apache/sis/metadata/iso/identification/DefaultKeywords.java   | 1 -
 .../metadata/iso/identification/DefaultOperationChainMetadata.java    | 1 -
 .../sis/metadata/iso/identification/DefaultOperationMetadata.java     | 1 -
 .../metadata/iso/identification/DefaultRepresentativeFraction.java    | 1 -
 .../org/apache/sis/metadata/iso/identification/DefaultResolution.java | 1 -
 .../sis/metadata/iso/identification/DefaultServiceIdentification.java | 1 -
 .../java/org/apache/sis/metadata/iso/identification/DefaultUsage.java | 1 -
 .../org/apache/sis/metadata/iso/identification/OperationName.java     | 1 -
 .../java/org/apache/sis/metadata/iso/identification/package-info.java | 1 -
 .../java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java    | 1 -
 .../main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java | 1 -
 .../org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java | 1 -
 .../java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java  | 1 -
 .../org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java | 1 -
 .../java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java   | 1 -
 .../main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java  | 1 -
 .../main/java/org/apache/sis/metadata/iso/lineage/package-info.java   | 1 -
 .../sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java   | 1 -
 .../java/org/apache/sis/metadata/iso/maintenance/DefaultScope.java    | 1 -
 .../apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java  | 1 -
 .../java/org/apache/sis/metadata/iso/maintenance/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/metadata/iso/package-info.java       | 1 -
 .../org/apache/sis/metadata/iso/quality/AbstractCompleteness.java     | 1 -
 .../org/apache/sis/metadata/iso/quality/AbstractDataEvaluation.java   | 1 -
 .../java/org/apache/sis/metadata/iso/quality/AbstractElement.java     | 1 -
 .../apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java   | 1 -
 .../java/org/apache/sis/metadata/iso/quality/AbstractMetaquality.java | 1 -
 .../apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java   | 1 -
 .../main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java | 1 -
 .../org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java | 1 -
 .../org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java  | 1 -
 .../org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java | 1 -
 .../iso/quality/DefaultAbsoluteExternalPositionalAccuracy.java        | 1 -
 .../sis/metadata/iso/quality/DefaultAccuracyOfATimeMeasurement.java   | 1 -
 .../apache/sis/metadata/iso/quality/DefaultAggregationDerivation.java | 1 -
 .../java/org/apache/sis/metadata/iso/quality/DefaultBasicMeasure.java | 1 -
 .../sis/metadata/iso/quality/DefaultCompletenessCommission.java       | 1 -
 .../apache/sis/metadata/iso/quality/DefaultCompletenessOmission.java  | 1 -
 .../apache/sis/metadata/iso/quality/DefaultConceptualConsistency.java | 1 -
 .../java/org/apache/sis/metadata/iso/quality/DefaultConfidence.java   | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java    | 1 -
 .../java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java  | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultDescriptiveResult.java | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultDomainConsistency.java | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java  | 1 -
 .../sis/metadata/iso/quality/DefaultEvaluationReportInformation.java  | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultFormatConsistency.java | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultFullInspection.java    | 1 -
 .../metadata/iso/quality/DefaultGriddedDataPositionalAccuracy.java    | 1 -
 .../java/org/apache/sis/metadata/iso/quality/DefaultHomogeneity.java  | 1 -
 .../apache/sis/metadata/iso/quality/DefaultIndirectEvaluation.java    | 1 -
 .../apache/sis/metadata/iso/quality/DefaultMeasureDescription.java    | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java  | 1 -
 .../metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java | 1 -
 .../iso/quality/DefaultNonQuantitativeAttributeCorrectness.java       | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultQualityMeasure.java    | 1 -
 .../metadata/iso/quality/DefaultQuantitativeAttributeAccuracy.java    | 1 -
 .../apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java    | 1 -
 .../iso/quality/DefaultRelativeInternalPositionalAccuracy.java        | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultRepresentativity.java  | 1 -
 .../apache/sis/metadata/iso/quality/DefaultSampleBasedInspection.java | 1 -
 .../main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java   | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultSourceReference.java   | 1 -
 .../apache/sis/metadata/iso/quality/DefaultTemporalConsistency.java   | 1 -
 .../org/apache/sis/metadata/iso/quality/DefaultTemporalValidity.java  | 1 -
 .../iso/quality/DefaultThematicClassificationCorrectness.java         | 1 -
 .../sis/metadata/iso/quality/DefaultTopologicalConsistency.java       | 1 -
 .../java/org/apache/sis/metadata/iso/quality/DefaultUsability.java    | 1 -
 .../main/java/org/apache/sis/metadata/iso/quality/ISOMetadata.java    | 1 -
 .../main/java/org/apache/sis/metadata/iso/quality/package-info.java   | 1 -
 .../sis/metadata/iso/spatial/AbstractGeolocationInformation.java      | 1 -
 .../sis/metadata/iso/spatial/AbstractSpatialRepresentation.java       | 1 -
 .../java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java    | 1 -
 .../src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java | 1 -
 .../org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java     | 1 -
 .../org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java  | 1 -
 .../java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java | 1 -
 .../org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java  | 1 -
 .../sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java    | 1 -
 .../sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java  | 1 -
 .../main/java/org/apache/sis/metadata/iso/spatial/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/metadata/package-info.java           | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/CacheKey.java           | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/CachedStatement.java    | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/Dispatcher.java         | 1 -
 .../main/java/org/apache/sis/metadata/sql/IdentifierGenerator.java    | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/Installer.java          | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/LookupInfo.java         | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/MetadataFallback.java   | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/MetadataProxy.java      | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/MetadataSource.java     | 1 -
 .../main/java/org/apache/sis/metadata/sql/MetadataStoreException.java | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java     | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/TableHierarchy.java     | 1 -
 .../src/main/java/org/apache/sis/metadata/sql/package-info.java       | 1 -
 .../src/main/java/org/apache/sis/util/iso/AbstractFactory.java        | 1 -
 .../src/main/java/org/apache/sis/util/iso/AbstractName.java           | 2 --
 .../src/main/java/org/apache/sis/util/iso/DefaultLocalName.java       | 1 -
 .../src/main/java/org/apache/sis/util/iso/DefaultMemberName.java      | 1 -
 .../src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java     | 1 -
 .../src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java       | 1 -
 .../src/main/java/org/apache/sis/util/iso/DefaultRecord.java          | 1 -
 .../src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java    | 1 -
 .../src/main/java/org/apache/sis/util/iso/DefaultRecordType.java      | 1 -
 .../src/main/java/org/apache/sis/util/iso/DefaultScopedName.java      | 1 -
 .../src/main/java/org/apache/sis/util/iso/DefaultTypeName.java        | 1 -
 .../src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java        | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/util/iso/Names.java    | 1 -
 .../src/main/java/org/apache/sis/util/iso/RecordDefinition.java       | 1 -
 .../sis-metadata/src/main/java/org/apache/sis/util/iso/TypeNames.java | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java    | 3 ---
 .../src/main/java/org/apache/sis/util/iso/package-info.java           | 1 -
 .../src/main/java/org/apache/sis/xml/IdentifiedObject.java            | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifierMap.java | 1 -
 .../src/main/java/org/apache/sis/xml/IdentifierSpace.java             | 1 -
 .../sis-metadata/src/main/java/org/apache/sis/xml/Implementation.java | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/InputFactory.java  | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/LegacyCodes.java   | 1 -
 .../sis-metadata/src/main/java/org/apache/sis/xml/MarshalContext.java | 1 -
 .../sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/Namespaces.java    | 1 -
 .../src/main/java/org/apache/sis/xml/NilInternationalString.java      | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/NilObject.java     | 1 -
 .../src/main/java/org/apache/sis/xml/NilObjectHandler.java            | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/NilReason.java     | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/OutputFactory.java | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/Pooled.java        | 1 -
 .../src/main/java/org/apache/sis/xml/PooledMarshaller.java            | 1 -
 .../sis-metadata/src/main/java/org/apache/sis/xml/PooledTemplate.java | 1 -
 .../src/main/java/org/apache/sis/xml/PooledUnmarshaller.java          | 1 -
 .../src/main/java/org/apache/sis/xml/ReferenceResolver.java           | 1 -
 .../src/main/java/org/apache/sis/xml/TransformVersion.java            | 1 -
 .../src/main/java/org/apache/sis/xml/TransformedEvent.java            | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java   | 1 -
 .../src/main/java/org/apache/sis/xml/TransformingNamespaces.java      | 1 -
 .../src/main/java/org/apache/sis/xml/TransformingReader.java          | 1 -
 .../src/main/java/org/apache/sis/xml/TransformingWriter.java          | 1 -
 .../sis-metadata/src/main/java/org/apache/sis/xml/ValueConverter.java | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/XLink.java         | 4 ----
 core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java           | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/XPointer.java      | 1 -
 core/sis-metadata/src/main/java/org/apache/sis/xml/package-info.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java   | 1 -
 .../org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java     | 1 -
 .../org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java     | 1 -
 .../test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java    | 1 -
 .../test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java  | 1 -
 .../test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java  | 1 -
 .../test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java  | 1 -
 .../test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java | 1 -
 .../src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java   | 1 -
 .../test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java    | 1 -
 .../org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java     | 1 -
 .../test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java  | 1 -
 .../test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java  | 1 -
 .../src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java | 1 -
 .../sis/internal/jaxb/metadata/replace/QualityParameterTest.java      | 1 -
 .../sis/internal/jaxb/metadata/replace/ServiceParameterTest.java      | 1 -
 .../src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java | 1 -
 .../test/java/org/apache/sis/internal/metadata/IdentifiersTest.java   | 1 -
 .../org/apache/sis/internal/metadata/ImplementationHelperTest.java    | 1 -
 .../src/test/java/org/apache/sis/internal/metadata/MergerTest.java    | 1 -
 .../test/java/org/apache/sis/internal/metadata/NameMeaningTest.java   | 1 -
 .../java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java   | 1 -
 .../java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java   | 1 -
 .../java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java     | 1 -
 .../java/org/apache/sis/internal/simple/SimpleIdentifierTest.java     | 1 -
 .../java/org/apache/sis/internal/test/DocumentComparatorTest.java     | 1 -
 .../src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java   | 1 -
 .../src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java   | 1 -
 .../src/test/java/org/apache/sis/metadata/HashCodeTest.java           | 1 -
 .../src/test/java/org/apache/sis/metadata/InformationMapTest.java     | 1 -
 .../src/test/java/org/apache/sis/metadata/MetadataCopierTest.java     | 1 -
 .../src/test/java/org/apache/sis/metadata/MetadataStandardTest.java   | 1 -
 .../src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java | 1 -
 .../src/test/java/org/apache/sis/metadata/NameMapTest.java            | 1 -
 .../src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java   | 1 -
 .../test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java   | 1 -
 .../test/java/org/apache/sis/metadata/PropertyInformationTest.java    | 1 -
 .../src/test/java/org/apache/sis/metadata/PrunerTest.java             | 1 -
 .../src/test/java/org/apache/sis/metadata/SpecialCasesTest.java       | 1 -
 .../src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java   | 1 -
 .../src/test/java/org/apache/sis/metadata/TreeNodeTest.java           | 1 -
 .../src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java    | 1 -
 .../src/test/java/org/apache/sis/metadata/TreeTableViewTest.java      | 1 -
 .../src/test/java/org/apache/sis/metadata/TypeMapTest.java            | 1 -
 .../src/test/java/org/apache/sis/metadata/ValueMapTest.java           | 1 -
 .../src/test/java/org/apache/sis/metadata/iso/APIVerifier.java        | 1 -
 .../src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java    | 1 -
 .../src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java | 1 -
 .../test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java  | 1 -
 .../test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java    | 1 -
 .../src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java    | 1 -
 .../test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java | 1 -
 .../org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java | 1 -
 .../org/apache/sis/metadata/iso/citation/DefaultCitationTest.java     | 1 -
 .../java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java | 1 -
 .../apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java   | 1 -
 .../java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java | 1 -
 .../sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java      | 1 -
 .../java/org/apache/sis/metadata/iso/content/DefaultBandTest.java     | 1 -
 .../java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java    | 1 -
 .../sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java     | 1 -
 .../src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 1 -
 .../sis/metadata/iso/identification/DefaultBrowseGraphicTest.java     | 1 -
 .../sis/metadata/iso/identification/DefaultCoupledResourceTest.java   | 1 -
 .../metadata/iso/identification/DefaultDataIdentificationTest.java    | 1 -
 .../apache/sis/metadata/iso/identification/DefaultKeywordsTest.java   | 1 -
 .../iso/identification/DefaultRepresentativeFractionTest.java         | 1 -
 .../apache/sis/metadata/iso/identification/DefaultResolutionTest.java | 1 -
 .../metadata/iso/identification/DefaultServiceIdentificationTest.java | 1 -
 .../java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java  | 1 -
 .../org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java   | 1 -
 .../sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java     | 1 -
 .../java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java | 1 -
 .../sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java      | 1 -
 .../apache/sis/metadata/iso/quality/DefaultDomainConsistencyTest.java | 1 -
 .../apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java  | 1 -
 .../sis/metadata/iso/quality/DefaultQuantitativeResultTest.java       | 1 -
 .../test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java  | 1 -
 .../org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java  | 1 -
 .../java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java     | 1 -
 .../java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java    | 1 -
 .../src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java | 1 -
 .../src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java | 1 -
 .../test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java   | 1 -
 .../src/test/java/org/apache/sis/metadata/xml/TestUsingFile.java      | 1 -
 .../src/test/java/org/apache/sis/test/MetadataAssert.java             | 1 -
 .../test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java  | 1 -
 .../src/test/java/org/apache/sis/test/mock/FeatureAttributeMock.java  | 1 -
 .../src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java  | 1 -
 .../src/test/java/org/apache/sis/test/mock/MetadataMock.java          | 1 -
 .../src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java       | 1 -
 .../src/test/java/org/apache/sis/test/mock/package-info.java          | 1 -
 .../src/test/java/org/apache/sis/test/sql/TestDatabase.java           | 1 -
 .../src/test/java/org/apache/sis/test/sql/package-info.java           | 1 -
 .../src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java    | 1 -
 .../test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java | 1 -
 .../src/test/java/org/apache/sis/test/xml/DocumentComparator.java     | 1 -
 .../src/test/java/org/apache/sis/test/xml/InfiniteSet.java            | 1 -
 .../src/test/java/org/apache/sis/test/xml/PackageVerifier.java        | 1 -
 .../src/test/java/org/apache/sis/test/xml/SchemaCompliance.java       | 1 -
 core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java | 1 -
 .../src/test/java/org/apache/sis/test/xml/package-info.java           | 1 -
 .../src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java   | 1 -
 .../src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java | 1 -
 .../test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java    | 1 -
 .../src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java      | 1 -
 .../src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java  | 1 -
 .../src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java  | 1 -
 .../src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java    | 1 -
 .../sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java | 1 -
 .../test/java/org/apache/sis/util/iso/SerializableRecordSchema.java   | 1 -
 .../src/test/java/org/apache/sis/util/iso/TypeNamesTest.java          | 1 -
 .../sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java | 1 -
 .../test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java    | 1 -
 .../src/test/java/org/apache/sis/xml/LegacyCodesTest.java             | 1 -
 .../src/test/java/org/apache/sis/xml/MarshallerPoolTest.java          | 1 -
 .../sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java | 1 -
 .../src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java    | 1 -
 core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java | 1 -
 .../src/test/java/org/apache/sis/xml/ReferenceResolverMock.java       | 1 -
 .../src/test/java/org/apache/sis/xml/TransformerTest.java             | 1 -
 .../src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java  | 1 -
 .../src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java         | 1 -
 .../src/test/java/org/apache/sis/xml/ValueConverterTest.java          | 1 -
 .../src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java        | 1 -
 core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java     | 1 -
 core/sis-metadata/src/test/java/org/apache/sis/xml/XPointerTest.java  | 1 -
 .../main/java/org/apache/sis/internal/map/ExceptionPresentation.java  | 1 -
 .../src/main/java/org/apache/sis/internal/map/Presentation.java       | 1 -
 .../main/java/org/apache/sis/internal/map/PropertyNameCollector.java  | 1 -
 .../src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java | 1 -
 .../src/main/java/org/apache/sis/internal/map/SEPortrayer.java        | 1 -
 .../src/main/java/org/apache/sis/internal/map/SEPresentation.java     | 1 -
 .../src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java   | 1 -
 .../sis/internal/map/coverage/MultiResolutionCoverageLoader.java      | 1 -
 .../main/java/org/apache/sis/internal/map/coverage/RenderingData.java | 1 -
 .../org/apache/sis/internal/map/coverage/RenderingWorkaround.java     | 1 -
 .../main/java/org/apache/sis/internal/map/coverage/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/internal/map/package-info.java       | 1 -
 core/sis-portrayal/src/main/java/org/apache/sis/portrayal/Canvas.java | 1 -
 .../src/main/java/org/apache/sis/portrayal/CanvasContext.java         | 1 -
 .../src/main/java/org/apache/sis/portrayal/CanvasExtent.java          | 1 -
 .../src/main/java/org/apache/sis/portrayal/CanvasFollower.java        | 1 -
 .../sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java | 1 -
 .../src/main/java/org/apache/sis/portrayal/MapLayer.java              | 1 -
 .../src/main/java/org/apache/sis/portrayal/MapLayers.java             | 1 -
 .../src/main/java/org/apache/sis/portrayal/Observable.java            | 1 -
 .../src/main/java/org/apache/sis/portrayal/PlanarCanvas.java          | 1 -
 .../src/main/java/org/apache/sis/portrayal/RenderException.java       | 1 -
 .../src/main/java/org/apache/sis/portrayal/TransformChangeEvent.java  | 1 -
 .../src/main/java/org/apache/sis/portrayal/package-info.java          | 1 -
 .../sis/internal/map/coverage/MultiResolutionCoverageLoaderTest.java  | 1 -
 .../src/test/java/org/apache/sis/test/suite/PortrayalTestSuite.java   | 1 -
 .../src/main/java/org/apache/sis/internal/gazetteer/Resources.java    | 2 --
 .../java/org/apache/sis/referencing/gazetteer/AbstractLocation.java   | 1 -
 .../org/apache/sis/referencing/gazetteer/AbstractLocationType.java    | 1 -
 .../java/org/apache/sis/referencing/gazetteer/FinalLocationType.java  | 1 -
 .../java/org/apache/sis/referencing/gazetteer/GazetteerException.java | 1 -
 .../java/org/apache/sis/referencing/gazetteer/GazetteerFactory.java   | 1 -
 .../org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java  | 2 --
 .../java/org/apache/sis/referencing/gazetteer/LocationFormat.java     | 1 -
 .../apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java | 4 ----
 .../org/apache/sis/referencing/gazetteer/ModifiableLocationType.java  | 1 -
 .../apache/sis/referencing/gazetteer/ReferenceVerifyException.java    | 1 -
 .../apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java    | 2 --
 .../java/org/apache/sis/referencing/gazetteer/SimpleLocation.java     | 2 --
 .../main/java/org/apache/sis/referencing/gazetteer/package-info.java  | 1 -
 .../org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java    | 1 -
 .../apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java  | 1 -
 .../java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java | 1 -
 .../java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java   | 1 -
 .../java/org/apache/sis/referencing/gazetteer/LocationViewer.java     | 1 -
 .../sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java    | 1 -
 .../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java       | 1 -
 .../org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java  | 1 -
 .../src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java | 1 -
 .../src/main/java/org/apache/sis/geometry/AbstractEnvelope.java       | 2 --
 .../src/main/java/org/apache/sis/geometry/ArrayEnvelope.java          | 1 -
 .../src/main/java/org/apache/sis/geometry/CoordinateFormat.java       | 1 -
 .../src/main/java/org/apache/sis/geometry/CurveExtremum.java          | 1 -
 .../src/main/java/org/apache/sis/geometry/DirectPosition1D.java       | 1 -
 .../src/main/java/org/apache/sis/geometry/DirectPosition2D.java       | 1 -
 .../src/main/java/org/apache/sis/geometry/Envelope2D.java             | 1 -
 .../src/main/java/org/apache/sis/geometry/EnvelopeReducer.java        | 1 -
 .../src/main/java/org/apache/sis/geometry/Envelopes.java              | 1 -
 .../src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java  | 1 -
 .../src/main/java/org/apache/sis/geometry/GeneralEnvelope.java        | 1 -
 .../src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java      | 1 -
 .../src/main/java/org/apache/sis/geometry/Shapes2D.java               | 1 -
 .../src/main/java/org/apache/sis/geometry/SubEnvelope.java            | 1 -
 .../src/main/java/org/apache/sis/geometry/WraparoundAdjustment.java   | 1 -
 .../src/main/java/org/apache/sis/geometry/WraparoundInEnvelope.java   | 1 -
 .../src/main/java/org/apache/sis/geometry/WraparoundMethod.java       | 1 -
 .../src/main/java/org/apache/sis/geometry/package-info.java           | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java  | 1 -
 .../apache/sis/internal/jaxb/referencing/CC_CoordinateOperation.java  | 1 -
 .../sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java   | 1 -
 .../sis/internal/jaxb/referencing/CC_GeneralParameterValue.java       | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CC_OperationMethod.java  | 1 -
 .../apache/sis/internal/jaxb/referencing/CC_OperationParameter.java   | 1 -
 .../sis/internal/jaxb/referencing/CC_OperationParameterGroup.java     | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CD_Ellipsoid.java   | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CD_EngineeringDatum.java | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CD_GeodeticDatum.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CD_ImageDatum.java  | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CD_ParametricDatum.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java    | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CD_TemporalDatum.java    | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CD_VerticalDatum.java    | 1 -
 .../apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CS_AffineCS.java    | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CS_AxisDirection.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CS_CartesianCS.java | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CS_CoordinateSystem.java | 1 -
 .../apache/sis/internal/jaxb/referencing/CS_CoordinateSystemAxis.java | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CS_CylindricalCS.java    | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CS_EllipsoidalCS.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CS_LinearCS.java    | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CS_ParametricCS.java     | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CS_PolarCS.java     | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CS_RangeMeaning.java     | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CS_SphericalCS.java | 1 -
 .../main/java/org/apache/sis/internal/jaxb/referencing/CS_TimeCS.java | 1 -
 .../org/apache/sis/internal/jaxb/referencing/CS_UserDefinedCS.java    | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/CS_VerticalCS.java  | 1 -
 .../src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java  | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java  | 1 -
 .../main/java/org/apache/sis/internal/jaxb/referencing/SC_CRS.java    | 1 -
 .../org/apache/sis/internal/jaxb/referencing/SC_DerivedCRSType.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/SC_SingleCRS.java   | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java | 1 -
 .../apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java | 1 -
 .../java/org/apache/sis/internal/jaxb/referencing/package-info.java   | 1 -
 .../java/org/apache/sis/internal/referencing/AnnotatedMatrix.java     | 1 -
 .../src/main/java/org/apache/sis/internal/referencing/AxesMapper.java | 1 -
 .../main/java/org/apache/sis/internal/referencing/AxisDirections.java | 1 -
 .../org/apache/sis/internal/referencing/CoordinateOperations.java     | 1 -
 .../java/org/apache/sis/internal/referencing/DatabaseListener.java    | 1 -
 .../apache/sis/internal/referencing/DeferredCoordinateOperation.java  | 1 -
 .../java/org/apache/sis/internal/referencing/DefinitionVerifier.java  | 1 -
 .../main/java/org/apache/sis/internal/referencing/DeprecatedCode.java | 1 -
 .../main/java/org/apache/sis/internal/referencing/DeprecatedName.java | 1 -
 .../java/org/apache/sis/internal/referencing/DirectPositionView.java  | 1 -
 .../java/org/apache/sis/internal/referencing/EPSGParameterDomain.java | 1 -
 .../apache/sis/internal/referencing/EllipsoidalHeightCombiner.java    | 1 -
 .../org/apache/sis/internal/referencing/ExtendedPrecisionMatrix.java  | 1 -
 .../main/java/org/apache/sis/internal/referencing/ExtentSelector.java | 1 -
 .../src/main/java/org/apache/sis/internal/referencing/Formulas.java   | 1 -
 .../org/apache/sis/internal/referencing/GeodeticObjectBuilder.java    | 1 -
 .../src/main/java/org/apache/sis/internal/referencing/LazySet.java    | 1 -
 .../src/main/java/org/apache/sis/internal/referencing/Legacy.java     | 1 -
 .../org/apache/sis/internal/referencing/MathTransformsOrFactory.java  | 1 -
 .../java/org/apache/sis/internal/referencing/MergedProperties.java    | 1 -
 .../org/apache/sis/internal/referencing/NilReferencingObject.java     | 1 -
 .../java/org/apache/sis/internal/referencing/PositionTransformer.java | 1 -
 .../apache/sis/internal/referencing/PositionalAccuracyConstant.java   | 1 -
 .../src/main/java/org/apache/sis/internal/referencing/RTreeNode.java  | 1 -
 .../apache/sis/internal/referencing/ReferencingFactoryContainer.java  | 1 -
 .../java/org/apache/sis/internal/referencing/ReferencingTypes.java    | 1 -
 .../org/apache/sis/internal/referencing/ReferencingUtilities.java     | 1 -
 .../src/main/java/org/apache/sis/internal/referencing/Resources.java  | 2 --
 .../java/org/apache/sis/internal/referencing/ServicesForMetadata.java | 1 -
 .../java/org/apache/sis/internal/referencing/SignReversalComment.java | 1 -
 .../java/org/apache/sis/internal/referencing/TemporalAccessor.java    | 1 -
 .../java/org/apache/sis/internal/referencing/VerticalDatumTypes.java  | 1 -
 .../main/java/org/apache/sis/internal/referencing/WKTKeywords.java    | 1 -
 .../main/java/org/apache/sis/internal/referencing/WKTUtilities.java   | 1 -
 .../org/apache/sis/internal/referencing/WraparoundApplicator.java     | 1 -
 .../org/apache/sis/internal/referencing/WraparoundAxesFinder.java     | 1 -
 .../java/org/apache/sis/internal/referencing/j2d/AbstractShape.java   | 1 -
 .../java/org/apache/sis/internal/referencing/j2d/AffineMatrix.java    | 1 -
 .../org/apache/sis/internal/referencing/j2d/AffineTransform2D.java    | 1 -
 .../src/main/java/org/apache/sis/internal/referencing/j2d/Bezier.java | 1 -
 .../apache/sis/internal/referencing/j2d/ImmutableAffineTransform.java | 1 -
 .../org/apache/sis/internal/referencing/j2d/IntervalRectangle.java    | 1 -
 .../org/apache/sis/internal/referencing/j2d/LinearTransform2D.java    | 1 -
 .../org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java  | 1 -
 .../java/org/apache/sis/internal/referencing/j2d/ShapeUtilities.java  | 1 -
 .../src/main/java/org/apache/sis/internal/referencing/j2d/Tile.java   | 1 -
 .../java/org/apache/sis/internal/referencing/j2d/TileOrganizer.java   | 1 -
 .../java/org/apache/sis/internal/referencing/j2d/package-info.java    | 1 -
 .../main/java/org/apache/sis/internal/referencing/package-info.java   | 1 -
 .../apache/sis/internal/referencing/provider/AbridgedMolodensky.java  | 1 -
 .../org/apache/sis/internal/referencing/provider/AbstractLambert.java | 1 -
 .../apache/sis/internal/referencing/provider/AbstractMercator.java    | 1 -
 .../apache/sis/internal/referencing/provider/AbstractProvider.java    | 1 -
 .../sis/internal/referencing/provider/AbstractStereographic.java      | 1 -
 .../java/org/apache/sis/internal/referencing/provider/Affine.java     | 1 -
 .../org/apache/sis/internal/referencing/provider/AlbersEqualArea.java | 1 -
 .../apache/sis/internal/referencing/provider/AxisOrderReversal.java   | 1 -
 .../apache/sis/internal/referencing/provider/AxisOrderReversal3D.java | 1 -
 .../internal/referencing/provider/AzimuthalEquidistantSpherical.java  | 1 -
 .../org/apache/sis/internal/referencing/provider/CassiniSoldner.java  | 1 -
 .../sis/internal/referencing/provider/CoordinateFrameRotation.java    | 1 -
 .../sis/internal/referencing/provider/CoordinateFrameRotation2D.java  | 1 -
 .../sis/internal/referencing/provider/CoordinateFrameRotation3D.java  | 1 -
 .../sis/internal/referencing/provider/DatumShiftGridCompressed.java   | 1 -
 .../apache/sis/internal/referencing/provider/DatumShiftGridFile.java  | 3 ---
 .../apache/sis/internal/referencing/provider/DatumShiftGridGroup.java | 1 -
 .../sis/internal/referencing/provider/DatumShiftGridLoader.java       | 1 -
 .../apache/sis/internal/referencing/provider/DatumShiftMethod.java    | 1 -
 .../java/org/apache/sis/internal/referencing/provider/EPSGName.java   | 1 -
 .../main/java/org/apache/sis/internal/referencing/provider/ESRI.java  | 1 -
 .../org/apache/sis/internal/referencing/provider/Equirectangular.java | 1 -
 .../internal/referencing/provider/FranceGeocentricInterpolation.java  | 1 -
 .../apache/sis/internal/referencing/provider/GeocentricAffine.java    | 1 -
 .../referencing/provider/GeocentricAffineBetweenGeographic.java       | 1 -
 .../sis/internal/referencing/provider/GeocentricToGeographic.java     | 1 -
 .../sis/internal/referencing/provider/GeocentricToTopocentric.java    | 1 -
 .../sis/internal/referencing/provider/GeocentricTranslation.java      | 1 -
 .../sis/internal/referencing/provider/GeocentricTranslation2D.java    | 1 -
 .../sis/internal/referencing/provider/GeocentricTranslation3D.java    | 1 -
 .../apache/sis/internal/referencing/provider/GeodeticOperation.java   | 1 -
 .../apache/sis/internal/referencing/provider/Geographic2Dto3D.java    | 1 -
 .../apache/sis/internal/referencing/provider/Geographic3Dto2D.java    | 1 -
 .../internal/referencing/provider/GeographicAndVerticalOffsets.java   | 1 -
 .../apache/sis/internal/referencing/provider/GeographicOffsets.java   | 1 -
 .../apache/sis/internal/referencing/provider/GeographicOffsets2D.java | 1 -
 .../sis/internal/referencing/provider/GeographicRedimension.java      | 1 -
 .../sis/internal/referencing/provider/GeographicToGeocentric.java     | 1 -
 .../sis/internal/referencing/provider/GeographicToTopocentric.java    | 1 -
 .../sis/internal/referencing/provider/HyperbolicCassiniSoldner.java   | 1 -
 .../org/apache/sis/internal/referencing/provider/Interpolation1D.java | 1 -
 .../sis/internal/referencing/provider/LambertAzimuthalEqualArea.java  | 1 -
 .../referencing/provider/LambertAzimuthalEqualAreaSpherical.java      | 1 -
 .../apache/sis/internal/referencing/provider/LambertConformal1SP.java | 1 -
 .../apache/sis/internal/referencing/provider/LambertConformal2SP.java | 1 -
 .../sis/internal/referencing/provider/LambertConformalBelgium.java    | 1 -
 .../sis/internal/referencing/provider/LambertConformalMichigan.java   | 1 -
 .../sis/internal/referencing/provider/LambertConformalWest.java       | 1 -
 .../internal/referencing/provider/LambertCylindricalEqualArea.java    | 1 -
 .../referencing/provider/LambertCylindricalEqualAreaSpherical.java    | 1 -
 .../apache/sis/internal/referencing/provider/LongitudeRotation.java   | 1 -
 .../org/apache/sis/internal/referencing/provider/MapProjection.java   | 1 -
 .../org/apache/sis/internal/referencing/provider/MapProjection3D.java | 1 -
 .../org/apache/sis/internal/referencing/provider/Mercator1SP.java     | 1 -
 .../org/apache/sis/internal/referencing/provider/Mercator2SP.java     | 1 -
 .../sis/internal/referencing/provider/MercatorAuxiliarySphere.java    | 1 -
 .../apache/sis/internal/referencing/provider/MercatorSpherical.java   | 1 -
 .../apache/sis/internal/referencing/provider/MillerCylindrical.java   | 1 -
 .../internal/referencing/provider/ModifiedAzimuthalEquidistant.java   | 1 -
 .../java/org/apache/sis/internal/referencing/provider/Mollweide.java  | 1 -
 .../java/org/apache/sis/internal/referencing/provider/Molodensky.java | 1 -
 .../sis/internal/referencing/provider/MolodenskyInterpolation.java    | 1 -
 .../java/org/apache/sis/internal/referencing/provider/NADCON.java     | 2 --
 .../main/java/org/apache/sis/internal/referencing/provider/NTv1.java  | 1 -
 .../main/java/org/apache/sis/internal/referencing/provider/NTv2.java  | 2 --
 .../apache/sis/internal/referencing/provider/NorthPoleRotation.java   | 1 -
 .../org/apache/sis/internal/referencing/provider/ObliqueMercator.java | 1 -
 .../sis/internal/referencing/provider/ObliqueMercatorCenter.java      | 1 -
 .../sis/internal/referencing/provider/ObliqueMercatorTwoPoints.java   | 1 -
 .../internal/referencing/provider/ObliqueMercatorTwoPointsCenter.java | 1 -
 .../sis/internal/referencing/provider/ObliqueStereographic.java       | 1 -
 .../org/apache/sis/internal/referencing/provider/Orthographic.java    | 1 -
 .../apache/sis/internal/referencing/provider/PolarStereographicA.java | 1 -
 .../apache/sis/internal/referencing/provider/PolarStereographicB.java | 1 -
 .../apache/sis/internal/referencing/provider/PolarStereographicC.java | 1 -
 .../sis/internal/referencing/provider/PolarStereographicNorth.java    | 1 -
 .../sis/internal/referencing/provider/PolarStereographicSouth.java    | 1 -
 .../java/org/apache/sis/internal/referencing/provider/Polyconic.java  | 1 -
 .../sis/internal/referencing/provider/PositionVector7Param.java       | 1 -
 .../sis/internal/referencing/provider/PositionVector7Param2D.java     | 1 -
 .../sis/internal/referencing/provider/PositionVector7Param3D.java     | 1 -
 .../java/org/apache/sis/internal/referencing/provider/Providers.java  | 1 -
 .../org/apache/sis/internal/referencing/provider/PseudoMercator.java  | 1 -
 .../apache/sis/internal/referencing/provider/PseudoPlateCarree.java   | 1 -
 .../apache/sis/internal/referencing/provider/PseudoSinusoidal.java    | 1 -
 .../apache/sis/internal/referencing/provider/RegionalMercator.java    | 1 -
 .../apache/sis/internal/referencing/provider/SatelliteTracking.java   | 1 -
 .../java/org/apache/sis/internal/referencing/provider/Sinusoidal.java | 1 -
 .../apache/sis/internal/referencing/provider/SouthPoleRotation.java   | 1 -
 .../apache/sis/internal/referencing/provider/TransverseMercator.java  | 2 --
 .../sis/internal/referencing/provider/TransverseMercatorSouth.java    | 1 -
 .../org/apache/sis/internal/referencing/provider/VerticalOffset.java  | 1 -
 .../java/org/apache/sis/internal/referencing/provider/Wraparound.java | 1 -
 .../sis/internal/referencing/provider/ZonedTransverseMercator.java    | 1 -
 .../org/apache/sis/internal/referencing/provider/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/io/wkt/AbstractParser.java           | 1 -
 core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Colors.java  | 1 -
 .../src/main/java/org/apache/sis/io/wkt/Convention.java               | 1 -
 core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Element.java | 1 -
 .../src/main/java/org/apache/sis/io/wkt/ElementKind.java              | 1 -
 .../src/main/java/org/apache/sis/io/wkt/FormattableObject.java        | 1 -
 .../src/main/java/org/apache/sis/io/wkt/Formatter.java                | 1 -
 .../src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java     | 1 -
 .../src/main/java/org/apache/sis/io/wkt/KeywordCase.java              | 1 -
 .../src/main/java/org/apache/sis/io/wkt/KeywordStyle.java             | 1 -
 .../src/main/java/org/apache/sis/io/wkt/MathTransformParser.java      | 1 -
 core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Parser.java  | 1 -
 .../src/main/java/org/apache/sis/io/wkt/SingletonElement.java         | 1 -
 .../src/main/java/org/apache/sis/io/wkt/StoredTree.java               | 1 -
 core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Symbols.java | 1 -
 .../src/main/java/org/apache/sis/io/wkt/Transliterator.java           | 1 -
 .../main/java/org/apache/sis/io/wkt/UnformattableObjectException.java | 1 -
 .../main/java/org/apache/sis/io/wkt/UnparsableObjectException.java    | 1 -
 .../src/main/java/org/apache/sis/io/wkt/VerticalInfo.java             | 1 -
 .../src/main/java/org/apache/sis/io/wkt/WKTDictionary.java            | 1 -
 .../src/main/java/org/apache/sis/io/wkt/WKTFormat.java                | 1 -
 .../sis-referencing/src/main/java/org/apache/sis/io/wkt/Warnings.java | 1 -
 .../src/main/java/org/apache/sis/io/wkt/package-info.java             | 1 -
 .../java/org/apache/sis/parameter/AbstractParameterDescriptor.java    | 1 -
 .../java/org/apache/sis/parameter/DefaultParameterDescriptor.java     | 1 -
 .../org/apache/sis/parameter/DefaultParameterDescriptorGroup.java     | 1 -
 .../src/main/java/org/apache/sis/parameter/DefaultParameterValue.java | 1 -
 .../java/org/apache/sis/parameter/DefaultParameterValueGroup.java     | 1 -
 .../src/main/java/org/apache/sis/parameter/FilteredParameters.java    | 1 -
 .../src/main/java/org/apache/sis/parameter/IntegerList.java           | 1 -
 .../main/java/org/apache/sis/parameter/MapProjectionDescriptor.java   | 1 -
 .../main/java/org/apache/sis/parameter/MapProjectionParameters.java   | 1 -
 .../src/main/java/org/apache/sis/parameter/MatrixParameters.java      | 1 -
 .../main/java/org/apache/sis/parameter/MatrixParametersAlphaNum.java  | 1 -
 .../src/main/java/org/apache/sis/parameter/ParameterBuilder.java      | 1 -
 .../src/main/java/org/apache/sis/parameter/ParameterFormat.java       | 2 --
 .../src/main/java/org/apache/sis/parameter/ParameterTableRow.java     | 1 -
 .../src/main/java/org/apache/sis/parameter/ParameterValueList.java    | 1 -
 .../src/main/java/org/apache/sis/parameter/Parameterized.java         | 1 -
 .../src/main/java/org/apache/sis/parameter/Parameters.java            | 1 -
 .../src/main/java/org/apache/sis/parameter/TensorParameters.java      | 1 -
 .../src/main/java/org/apache/sis/parameter/TensorValues.java          | 1 -
 .../main/java/org/apache/sis/parameter/UninitializedParameter.java    | 1 -
 .../java/org/apache/sis/parameter/UnmodifiableParameterValue.java     | 1 -
 .../org/apache/sis/parameter/UnmodifiableParameterValueGroup.java     | 1 -
 .../src/main/java/org/apache/sis/parameter/Verifier.java              | 1 -
 .../src/main/java/org/apache/sis/parameter/package-info.java          | 1 -
 .../java/org/apache/sis/referencing/AbstractIdentifiedObject.java     | 1 -
 .../main/java/org/apache/sis/referencing/AbstractReferenceSystem.java | 1 -
 .../src/main/java/org/apache/sis/referencing/AuthorityFactories.java  | 1 -
 .../src/main/java/org/apache/sis/referencing/Builder.java             | 1 -
 .../sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java | 1 -
 .../src/main/java/org/apache/sis/referencing/CommonCRS.java           | 4 ----
 .../src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java | 1 -
 .../java/org/apache/sis/referencing/EllipsoidalHeightSeparator.java   | 1 -
 .../main/java/org/apache/sis/referencing/GeodesicsOnEllipsoid.java    | 1 -
 .../src/main/java/org/apache/sis/referencing/GeodeticCalculator.java  | 1 -
 .../src/main/java/org/apache/sis/referencing/GeodeticException.java   | 1 -
 .../src/main/java/org/apache/sis/referencing/IdentifiedObjects.java   | 1 -
 .../src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java | 1 -
 .../src/main/java/org/apache/sis/referencing/NameIterator.java        | 1 -
 .../src/main/java/org/apache/sis/referencing/NamedIdentifier.java     | 1 -
 .../src/main/java/org/apache/sis/referencing/Properties.java          | 1 -
 .../src/main/java/org/apache/sis/referencing/PropertiesConverter.java | 1 -
 .../src/main/java/org/apache/sis/referencing/StandardDefinitions.java | 1 -
 .../src/main/java/org/apache/sis/referencing/SubTypes.java            | 1 -
 .../src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java     | 1 -
 .../main/java/org/apache/sis/referencing/crs/AbstractDerivedCRS.java  | 1 -
 .../src/main/java/org/apache/sis/referencing/crs/ConversionKeys.java  | 1 -
 .../main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java  | 1 -
 .../main/java/org/apache/sis/referencing/crs/DefaultDerivedCRS.java   | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java    | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java     | 1 -
 .../main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java  | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java     | 1 -
 .../src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultParametricCRS.java     | 1 -
 .../main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 1 -
 .../main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java  | 1 -
 .../main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java  | 1 -
 .../main/java/org/apache/sis/referencing/crs/ExplicitParameters.java  | 1 -
 .../main/java/org/apache/sis/referencing/crs/SC_GeographicCRS.java    | 1 -
 .../src/main/java/org/apache/sis/referencing/crs/SubTypes.java        | 1 -
 .../src/main/java/org/apache/sis/referencing/crs/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/AbstractCS.java       | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/AxesConvention.java   | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/AxisFilter.java       | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/AxisName.java         | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/Codes.java            | 1 -
 .../main/java/org/apache/sis/referencing/cs/CoordinateSystems.java    | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java  | 1 -
 .../main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java   | 1 -
 .../main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java    | 1 -
 .../org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java    | 1 -
 .../main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java | 1 -
 .../main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java  | 1 -
 .../main/java/org/apache/sis/referencing/cs/DefaultParametricCS.java  | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java   | 1 -
 .../main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java   | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java    | 1 -
 .../main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java | 1 -
 .../main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java    | 1 -
 .../java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java    | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/Normalizer.java       | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/SubTypes.java         | 1 -
 .../src/main/java/org/apache/sis/referencing/cs/package-info.java     | 1 -
 .../src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java | 1 -
 .../java/org/apache/sis/referencing/datum/BursaWolfParameters.java    | 1 -
 .../main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java    | 1 -
 .../main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java  | 1 -
 .../org/apache/sis/referencing/datum/DefaultEngineeringDatum.java     | 1 -
 .../java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java   | 1 -
 .../main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java | 1 -
 .../java/org/apache/sis/referencing/datum/DefaultParametricDatum.java | 1 -
 .../java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java   | 1 -
 .../java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java   | 1 -
 .../java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java   | 1 -
 .../src/main/java/org/apache/sis/referencing/datum/Sphere.java        | 1 -
 .../src/main/java/org/apache/sis/referencing/datum/SubTypes.java      | 1 -
 .../main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java  | 1 -
 .../src/main/java/org/apache/sis/referencing/datum/package-info.java  | 1 -
 .../apache/sis/referencing/factory/AuthorityFactoryIdentifier.java    | 1 -
 .../org/apache/sis/referencing/factory/AuthorityFactoryProxy.java     | 1 -
 .../src/main/java/org/apache/sis/referencing/factory/CacheRecord.java | 1 -
 .../java/org/apache/sis/referencing/factory/CommonAuthorityCode.java  | 1 -
 .../org/apache/sis/referencing/factory/CommonAuthorityFactory.java    | 1 -
 .../apache/sis/referencing/factory/ConcurrentAuthorityFactory.java    | 2 --
 .../java/org/apache/sis/referencing/factory/FactoryDataException.java | 1 -
 .../main/java/org/apache/sis/referencing/factory/FilteredCodes.java   | 1 -
 .../org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java  | 1 -
 .../org/apache/sis/referencing/factory/GeodeticObjectFactory.java     | 1 -
 .../org/apache/sis/referencing/factory/IdentifiedObjectFinder.java    | 2 --
 .../java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java  | 1 -
 .../sis/referencing/factory/InvalidGeodeticParameterException.java    | 1 -
 .../org/apache/sis/referencing/factory/LazySynchronizedIterator.java  | 1 -
 .../sis/referencing/factory/MissingFactoryResourceException.java      | 1 -
 .../org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java   | 1 -
 .../sis/referencing/factory/NoSuchAuthorityFactoryException.java      | 1 -
 .../main/java/org/apache/sis/referencing/factory/ReferenceKeeper.java | 1 -
 .../apache/sis/referencing/factory/UnavailableFactoryException.java   | 1 -
 .../main/java/org/apache/sis/referencing/factory/package-info.java    | 1 -
 .../java/org/apache/sis/referencing/factory/sql/AuthorityCodes.java   | 1 -
 .../main/java/org/apache/sis/referencing/factory/sql/AxisName.java    | 1 -
 .../java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java    | 1 -
 .../org/apache/sis/referencing/factory/sql/CloseableReference.java    | 1 -
 .../apache/sis/referencing/factory/sql/CoordinateOperationSet.java    | 1 -
 .../java/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java   | 1 -
 .../java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java   | 1 -
 .../main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java | 1 -
 .../java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java    | 1 -
 .../sis/referencing/factory/sql/InstallationScriptProvider.java       | 2 --
 .../java/org/apache/sis/referencing/factory/sql/SQLTranslator.java    | 1 -
 .../main/java/org/apache/sis/referencing/factory/sql/TableInfo.java   | 1 -
 .../java/org/apache/sis/referencing/factory/sql/package-info.java     | 1 -
 .../apache/sis/referencing/operation/AbstractCoordinateOperation.java | 1 -
 .../org/apache/sis/referencing/operation/AbstractSingleOperation.java | 1 -
 .../src/main/java/org/apache/sis/referencing/operation/CRSPair.java   | 1 -
 .../apache/sis/referencing/operation/CoordinateOperationContext.java  | 1 -
 .../apache/sis/referencing/operation/CoordinateOperationFinder.java   | 1 -
 .../apache/sis/referencing/operation/CoordinateOperationRegistry.java | 1 -
 .../apache/sis/referencing/operation/CoordinateOperationSorter.java   | 1 -
 .../sis/referencing/operation/DefaultConcatenatedOperation.java       | 1 -
 .../org/apache/sis/referencing/operation/DefaultConicProjection.java  | 1 -
 .../java/org/apache/sis/referencing/operation/DefaultConversion.java  | 1 -
 .../sis/referencing/operation/DefaultCoordinateOperationFactory.java  | 1 -
 .../sis/referencing/operation/DefaultCylindricalProjection.java       | 1 -
 .../java/org/apache/sis/referencing/operation/DefaultFormula.java     | 1 -
 .../org/apache/sis/referencing/operation/DefaultOperationMethod.java  | 1 -
 .../apache/sis/referencing/operation/DefaultPassThroughOperation.java | 1 -
 .../org/apache/sis/referencing/operation/DefaultPlanarProjection.java | 1 -
 .../java/org/apache/sis/referencing/operation/DefaultProjection.java  | 1 -
 .../org/apache/sis/referencing/operation/DefaultTransformation.java   | 1 -
 .../org/apache/sis/referencing/operation/InverseOperationMethod.java  | 1 -
 .../org/apache/sis/referencing/operation/LooselyDefinedMethod.java    | 1 -
 .../org/apache/sis/referencing/operation/MathTransformContext.java    | 1 -
 .../apache/sis/referencing/operation/MismatchedDatumException.java    | 1 -
 .../java/org/apache/sis/referencing/operation/SubOperationInfo.java   | 1 -
 .../src/main/java/org/apache/sis/referencing/operation/SubTypes.java  | 1 -
 .../sis/referencing/operation/builder/LinearTransformBuilder.java     | 1 -
 .../java/org/apache/sis/referencing/operation/builder/Linearizer.java | 1 -
 .../sis/referencing/operation/builder/LocalizationGridBuilder.java    | 1 -
 .../sis/referencing/operation/builder/ProjectedTransformTry.java      | 1 -
 .../org/apache/sis/referencing/operation/builder/ResidualGrid.java    | 2 --
 .../apache/sis/referencing/operation/builder/TransformBuilder.java    | 1 -
 .../org/apache/sis/referencing/operation/builder/package-info.java    | 1 -
 .../apache/sis/referencing/operation/matrix/AffineTransforms2D.java   | 1 -
 .../org/apache/sis/referencing/operation/matrix/GeneralMatrix.java    | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/Matrices.java    | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/Matrix1.java     | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/Matrix2.java     | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/Matrix3.java     | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/Matrix4.java     | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java   | 1 -
 .../referencing/operation/matrix/MismatchedMatrixSizeException.java   | 1 -
 .../org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java  | 1 -
 .../referencing/operation/matrix/NoninvertibleMatrixException.java    | 1 -
 .../main/java/org/apache/sis/referencing/operation/matrix/Solver.java | 1 -
 .../apache/sis/referencing/operation/matrix/UnmodifiableMatrix.java   | 1 -
 .../org/apache/sis/referencing/operation/matrix/package-info.java     | 1 -
 .../main/java/org/apache/sis/referencing/operation/package-info.java  | 1 -
 .../apache/sis/referencing/operation/projection/AlbersEqualArea.java  | 2 --
 .../sis/referencing/operation/projection/AuthalicConversion.java      | 1 -
 .../apache/sis/referencing/operation/projection/AuthalicMercator.java | 1 -
 .../sis/referencing/operation/projection/AzimuthalEquidistant.java    | 1 -
 .../apache/sis/referencing/operation/projection/CassiniSoldner.java   | 2 --
 .../sis/referencing/operation/projection/ConformalProjection.java     | 1 -
 .../sis/referencing/operation/projection/CylindricalEqualArea.java    | 2 --
 .../org/apache/sis/referencing/operation/projection/Initializer.java  | 1 -
 .../org/apache/sis/referencing/operation/projection/Inverter.java     | 1 -
 .../referencing/operation/projection/LambertAzimuthalEqualArea.java   | 1 -
 .../sis/referencing/operation/projection/LambertConicConformal.java   | 2 --
 .../sis/referencing/operation/projection/LongitudeWraparound.java     | 2 --
 .../org/apache/sis/referencing/operation/projection/Mercator.java     | 2 --
 .../apache/sis/referencing/operation/projection/MeridianArcBased.java | 1 -
 .../operation/projection/ModifiedAzimuthalEquidistant.java            | 1 -
 .../org/apache/sis/referencing/operation/projection/Mollweide.java    | 1 -
 .../sis/referencing/operation/projection/NormalizedProjection.java    | 3 ---
 .../apache/sis/referencing/operation/projection/ObliqueMercator.java  | 1 -
 .../sis/referencing/operation/projection/ObliqueStereographic.java    | 2 --
 .../org/apache/sis/referencing/operation/projection/Orthographic.java | 1 -
 .../sis/referencing/operation/projection/PolarStereographic.java      | 2 --
 .../org/apache/sis/referencing/operation/projection/Polyconic.java    | 2 --
 .../sis/referencing/operation/projection/ProjectionException.java     | 1 -
 .../sis/referencing/operation/projection/ProjectionVariant.java       | 1 -
 .../sis/referencing/operation/projection/SatelliteTracking.java       | 1 -
 .../org/apache/sis/referencing/operation/projection/Sinusoidal.java   | 2 --
 .../sis/referencing/operation/projection/TransverseMercator.java      | 2 --
 .../apache/sis/referencing/operation/projection/ZonedGridSystem.java  | 2 --
 .../org/apache/sis/referencing/operation/projection/package-info.java | 1 -
 .../operation/transform/AbridgedMolodenskyTransform2D.java            | 1 -
 .../sis/referencing/operation/transform/AbstractLinearTransform.java  | 1 -
 .../sis/referencing/operation/transform/AbstractMathTransform.java    | 2 --
 .../sis/referencing/operation/transform/AbstractMathTransform1D.java  | 2 --
 .../sis/referencing/operation/transform/AbstractMathTransform2D.java  | 2 --
 .../apache/sis/referencing/operation/transform/CartesianToPolar.java  | 1 -
 .../sis/referencing/operation/transform/CartesianToSpherical.java     | 1 -
 .../sis/referencing/operation/transform/ConcatenatedTransform.java    | 1 -
 .../sis/referencing/operation/transform/ConcatenatedTransform1D.java  | 1 -
 .../sis/referencing/operation/transform/ConcatenatedTransform2D.java  | 1 -
 .../referencing/operation/transform/ConcatenatedTransformDirect.java  | 1 -
 .../operation/transform/ConcatenatedTransformDirect1D.java            | 1 -
 .../operation/transform/ConcatenatedTransformDirect2D.java            | 1 -
 .../sis/referencing/operation/transform/ConstantTransform1D.java      | 1 -
 .../sis/referencing/operation/transform/ContextualParameter.java      | 1 -
 .../sis/referencing/operation/transform/ContextualParameters.java     | 2 --
 .../referencing/operation/transform/CoordinateSystemTransform.java    | 1 -
 .../org/apache/sis/referencing/operation/transform/CopyTransform.java | 1 -
 .../sis/referencing/operation/transform/DatumShiftTransform.java      | 1 -
 .../referencing/operation/transform/DefaultMathTransformFactory.java  | 2 --
 .../apache/sis/referencing/operation/transform/DomainDefinition.java  | 1 -
 .../referencing/operation/transform/EllipsoidToCentricTransform.java  | 3 ---
 .../sis/referencing/operation/transform/ExponentialTransform1D.java   | 1 -
 .../apache/sis/referencing/operation/transform/IdentityTransform.java | 1 -
 .../sis/referencing/operation/transform/IdentityTransform1D.java      | 1 -
 .../operation/transform/InterpolatedGeocentricTransform.java          | 2 --
 .../operation/transform/InterpolatedGeocentricTransform2D.java        | 2 --
 .../operation/transform/InterpolatedMolodenskyTransform.java          | 2 --
 .../operation/transform/InterpolatedMolodenskyTransform2D.java        | 2 --
 .../sis/referencing/operation/transform/InterpolatedTransform.java    | 2 --
 .../sis/referencing/operation/transform/InterpolatedTransform2D.java  | 2 --
 .../apache/sis/referencing/operation/transform/IterationStrategy.java | 1 -
 .../sis/referencing/operation/transform/LinearInterpolator1D.java     | 1 -
 .../apache/sis/referencing/operation/transform/LinearTransform.java   | 1 -
 .../apache/sis/referencing/operation/transform/LinearTransform1D.java | 1 -
 .../sis/referencing/operation/transform/LogarithmicTransform1D.java   | 1 -
 .../sis/referencing/operation/transform/MathTransformProvider.java    | 1 -
 .../apache/sis/referencing/operation/transform/MathTransforms.java    | 1 -
 .../apache/sis/referencing/operation/transform/MolodenskyFormula.java | 1 -
 .../sis/referencing/operation/transform/MolodenskyTransform.java      | 1 -
 .../sis/referencing/operation/transform/MolodenskyTransform2D.java    | 1 -
 .../sis/referencing/operation/transform/OperationMethodSet.java       | 1 -
 .../sis/referencing/operation/transform/PassThroughTransform.java     | 1 -
 .../sis/referencing/operation/transform/PassThroughTransform2D.java   | 1 -
 .../apache/sis/referencing/operation/transform/PolarToCartesian.java  | 1 -
 .../org/apache/sis/referencing/operation/transform/PoleRotation.java  | 1 -
 .../apache/sis/referencing/operation/transform/PowerTransform1D.java  | 1 -
 .../sis/referencing/operation/transform/ProjectiveTransform.java      | 1 -
 .../sis/referencing/operation/transform/ProjectiveTransform2D.java    | 1 -
 .../apache/sis/referencing/operation/transform/ScaleTransform.java    | 1 -
 .../sis/referencing/operation/transform/SpecializableTransform.java   | 1 -
 .../sis/referencing/operation/transform/SpecializableTransform2D.java | 1 -
 .../sis/referencing/operation/transform/SphericalToCartesian.java     | 1 -
 .../apache/sis/referencing/operation/transform/TransferFunction.java  | 1 -
 .../sis/referencing/operation/transform/TransformAdapter2D.java       | 1 -
 .../sis/referencing/operation/transform/TransformSeparator.java       | 1 -
 .../sis/referencing/operation/transform/TranslationTransform.java     | 1 -
 .../sis/referencing/operation/transform/WraparoundTransform.java      | 1 -
 .../org/apache/sis/referencing/operation/transform/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/referencing/package-info.java        | 1 -
 .../test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java | 1 -
 .../src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java   | 1 -
 .../src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java      | 1 -
 .../src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java   | 1 -
 .../src/test/java/org/apache/sis/geometry/CurveExtremumTest.java      | 1 -
 .../src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java   | 1 -
 .../src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java   | 1 -
 .../src/test/java/org/apache/sis/geometry/Envelope2DTest.java         | 1 -
 .../src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java    | 1 -
 .../src/test/java/org/apache/sis/geometry/EnvelopesTest.java          | 1 -
 .../test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java  | 1 -
 .../src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java    | 1 -
 .../src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java  | 1 -
 .../src/test/java/org/apache/sis/geometry/Shapes2DTest.java           | 1 -
 .../src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java        | 1 -
 .../src/test/java/org/apache/sis/geometry/TransformTestCase.java      | 1 -
 .../test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java   | 1 -
 .../internal/jaxb/referencing/CC_GeneralOperationParameterTest.java   | 1 -
 .../sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java | 1 -
 .../test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java  | 1 -
 .../sis/internal/jaxb/referencing/SecondDefiningParameterTest.java    | 1 -
 .../test/java/org/apache/sis/internal/referencing/AxesMapperTest.java | 1 -
 .../java/org/apache/sis/internal/referencing/AxisDirectionsTest.java  | 1 -
 .../org/apache/sis/internal/referencing/CoordinateOperationsTest.java | 1 -
 .../org/apache/sis/internal/referencing/DefinitionVerifierTest.java   | 1 -
 .../sis/internal/referencing/EllipsoidalHeightCombinerTest.java       | 1 -
 .../java/org/apache/sis/internal/referencing/ExtentSelectorTest.java  | 1 -
 .../test/java/org/apache/sis/internal/referencing/FormulasTest.java   | 1 -
 .../apache/sis/internal/referencing/GeodeticObjectBuilderTest.java    | 1 -
 .../test/java/org/apache/sis/internal/referencing/LazySetTest.java    | 1 -
 .../sis/internal/referencing/PositionalAccuracyConstantTest.java      | 1 -
 .../org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java | 1 -
 .../org/apache/sis/internal/referencing/ServicesForMetadataTest.java  | 1 -
 .../org/apache/sis/internal/referencing/VerticalDatumTypesTest.java   | 1 -
 .../java/org/apache/sis/internal/referencing/WKTKeywordsTest.java     | 1 -
 .../java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java    | 1 -
 .../org/apache/sis/internal/referencing/WraparoundApplicatorTest.java | 1 -
 .../org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java    | 1 -
 .../org/apache/sis/internal/referencing/j2d/ShapeUtilitiesExt.java    | 1 -
 .../org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java   | 1 -
 .../org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java | 1 -
 .../java/org/apache/sis/internal/referencing/provider/AffineTest.java | 1 -
 .../internal/referencing/provider/CoordinateFrameRotationTest.java    | 1 -
 .../internal/referencing/provider/DatumShiftGridCompressedTest.java   | 1 -
 .../sis/internal/referencing/provider/DatumShiftGridFileTest.java     | 1 -
 .../apache/sis/internal/referencing/provider/DatumShiftTestCase.java  | 1 -
 .../referencing/provider/FranceGeocentricInterpolationTest.java       | 1 -
 .../sis/internal/referencing/provider/GeocentricTranslationTest.java  | 1 -
 .../sis/internal/referencing/provider/Geographic3Dto2DTest.java       | 1 -
 .../sis/internal/referencing/provider/GeographicOffsetsTest.java      | 1 -
 .../sis/internal/referencing/provider/LongitudeRotationTest.java      | 1 -
 .../apache/sis/internal/referencing/provider/MapProjectionTest.java   | 1 -
 .../org/apache/sis/internal/referencing/provider/MolodenskyTest.java  | 1 -
 .../java/org/apache/sis/internal/referencing/provider/NADCONTest.java | 1 -
 .../java/org/apache/sis/internal/referencing/provider/NTv2Test.java   | 1 -
 .../internal/referencing/provider/ParameterNameTableGenerator.java    | 1 -
 .../sis/internal/referencing/provider/PositionVector7ParamTest.java   | 1 -
 .../org/apache/sis/internal/referencing/provider/ProviderMock.java    | 1 -
 .../org/apache/sis/internal/referencing/provider/ProvidersTest.java   | 1 -
 .../apache/sis/internal/referencing/provider/SeismicBinGridMock.java  | 1 -
 .../sis/internal/referencing/provider/TransverseMercatorTest.java     | 1 -
 .../src/test/java/org/apache/sis/io/wkt/ColorsTest.java               | 1 -
 .../src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java       | 1 -
 .../src/test/java/org/apache/sis/io/wkt/ConventionTest.java           | 1 -
 .../src/test/java/org/apache/sis/io/wkt/ElementTest.java              | 1 -
 .../src/test/java/org/apache/sis/io/wkt/FormatterTest.java            | 1 -
 .../src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java | 1 -
 .../src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java  | 1 -
 .../src/test/java/org/apache/sis/io/wkt/SymbolsTest.java              | 1 -
 .../src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java       | 1 -
 .../src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java        | 1 -
 .../src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java            | 1 -
 .../src/test/java/org/apache/sis/io/wkt/WKTParserTest.java            | 1 -
 .../org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java | 1 -
 .../java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java | 1 -
 .../java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java | 1 -
 .../test/java/org/apache/sis/parameter/DefaultParameterValueTest.java | 1 -
 .../java/org/apache/sis/parameter/MapProjectionParametersTest.java    | 1 -
 .../java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java   | 1 -
 .../src/test/java/org/apache/sis/parameter/MatrixParametersTest.java  | 1 -
 .../src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java  | 1 -
 .../src/test/java/org/apache/sis/parameter/ParameterFormatTest.java   | 1 -
 .../test/java/org/apache/sis/parameter/ParameterMarshallingTest.java  | 1 -
 .../java/org/apache/sis/parameter/ParameterValueGroupWrapper.java     | 1 -
 .../src/test/java/org/apache/sis/parameter/ParametersTest.java        | 1 -
 .../src/test/java/org/apache/sis/parameter/TensorParametersTest.java  | 1 -
 .../src/test/java/org/apache/sis/parameter/TensorValuesTest.java      | 1 -
 .../org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java | 1 -
 .../java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java | 1 -
 .../java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java | 1 -
 .../java/org/apache/sis/referencing/AbstractReferenceSystemTest.java  | 1 -
 .../test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java  | 1 -
 .../src/test/java/org/apache/sis/referencing/BuilderMock.java         | 1 -
 .../src/test/java/org/apache/sis/referencing/BuilderTest.java         | 1 -
 .../src/test/java/org/apache/sis/referencing/CRSTest.java             | 1 -
 .../src/test/java/org/apache/sis/referencing/ClenshawSummation.java   | 1 -
 .../src/test/java/org/apache/sis/referencing/CommonCRSTest.java       | 1 -
 .../test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java | 1 -
 .../java/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java     | 1 -
 .../test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java  | 1 -
 .../test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java  | 1 -
 .../test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java   | 1 -
 .../test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java | 1 -
 .../src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java | 1 -
 .../test/java/org/apache/sis/referencing/StandardDefinitionsTest.java | 1 -
 .../src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java   | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java    | 1 -
 .../org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java     | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java   | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java | 1 -
 .../test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java  | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java   | 1 -
 .../java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java   | 1 -
 .../src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java    | 1 -
 .../test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java    | 1 -
 .../src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java    | 1 -
 .../src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java   | 1 -
 .../src/test/java/org/apache/sis/referencing/cs/CodesTest.java        | 1 -
 .../java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java     | 1 -
 .../java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java    | 1 -
 .../java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java     | 1 -
 .../apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java    | 1 -
 .../java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java  | 1 -
 .../java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java  | 1 -
 .../test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java   | 1 -
 .../java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java    | 1 -
 .../org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java     | 1 -
 .../src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java    | 1 -
 .../src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java      | 1 -
 .../src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java  | 1 -
 .../src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java   | 1 -
 .../org/apache/sis/referencing/datum/BursaWolfParametersTest.java     | 1 -
 .../java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java   | 1 -
 .../org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java    | 1 -
 .../org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java    | 1 -
 .../org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java    | 1 -
 .../org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java    | 1 -
 .../test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java | 1 -
 .../test/java/org/apache/sis/referencing/datum/HardCodedDatum.java    | 1 -
 .../test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java | 1 -
 .../java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java   | 1 -
 .../java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java | 1 -
 .../org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java | 1 -
 .../apache/sis/referencing/factory/CommonAuthorityFactoryTest.java    | 1 -
 .../sis/referencing/factory/ConcurrentAuthorityFactoryTest.java       | 1 -
 .../org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java | 1 -
 .../apache/sis/referencing/factory/IdentifiedObjectFinderTest.java    | 1 -
 .../apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java   | 1 -
 .../java/org/apache/sis/referencing/factory/TestFactorySource.java    | 1 -
 .../java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java  | 1 -
 .../org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java     | 1 -
 .../java/org/apache/sis/referencing/factory/sql/TableInfoTest.java    | 1 -
 .../apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java  | 1 -
 .../sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java     | 1 -
 .../sis/referencing/operation/CoordinateOperationFinderTest.java      | 1 -
 .../sis/referencing/operation/CoordinateOperationRegistryTest.java    | 1 -
 .../sis/referencing/operation/DefaultConcatenatedOperationTest.java   | 1 -
 .../org/apache/sis/referencing/operation/DefaultConversionTest.java   | 1 -
 .../referencing/operation/DefaultCoordinateOperationFactoryTest.java  | 1 -
 .../java/org/apache/sis/referencing/operation/DefaultFormulaTest.java | 1 -
 .../apache/sis/referencing/operation/DefaultOperationMethodTest.java  | 1 -
 .../sis/referencing/operation/DefaultPassThroughOperationTest.java    | 1 -
 .../apache/sis/referencing/operation/DefaultTransformationTest.java   | 1 -
 .../org/apache/sis/referencing/operation/HardCodedConversions.java    | 1 -
 .../sis/referencing/operation/SingleOperationMarshallingTest.java     | 1 -
 .../sis/referencing/operation/builder/LinearTransformBuilderTest.java | 1 -
 .../org/apache/sis/referencing/operation/builder/LinearizerTest.java  | 1 -
 .../referencing/operation/builder/LocalizationGridBuilderTest.java    | 1 -
 .../apache/sis/referencing/operation/builder/NonLinearTransform.java  | 1 -
 .../apache/sis/referencing/operation/builder/ResidualGridTest.java    | 1 -
 .../sis/referencing/operation/matrix/AffineTransforms2DTest.java      | 1 -
 .../apache/sis/referencing/operation/matrix/GeneralMatrixTest.java    | 1 -
 .../org/apache/sis/referencing/operation/matrix/MatricesTest.java     | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java | 1 -
 .../org/apache/sis/referencing/operation/matrix/MatrixTestCase.java   | 1 -
 .../apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java  | 1 -
 .../java/org/apache/sis/referencing/operation/matrix/SolverTest.java  | 1 -
 .../sis/referencing/operation/projection/AlbersEqualAreaTest.java     | 1 -
 .../sis/referencing/operation/projection/AuthalicConversionTest.java  | 1 -
 .../referencing/operation/projection/AzimuthalEquidistantTest.java    | 1 -
 .../org/apache/sis/referencing/operation/projection/Benchmark.java    | 1 -
 .../sis/referencing/operation/projection/CassiniSoldnerTest.java      | 1 -
 .../sis/referencing/operation/projection/ConformalProjectionTest.java | 1 -
 .../referencing/operation/projection/CylindricalEqualAreaTest.java    | 1 -
 .../sis/referencing/operation/projection/EquirectangularTest.java     | 1 -
 .../apache/sis/referencing/operation/projection/InitializerTest.java  | 1 -
 .../operation/projection/LambertAzimuthalEqualAreaTest.java           | 1 -
 .../referencing/operation/projection/LambertConicConformalTest.java   | 1 -
 .../sis/referencing/operation/projection/MapProjectionTestCase.java   | 1 -
 .../referencing/operation/projection/MercatorMethodComparison.java    | 1 -
 .../org/apache/sis/referencing/operation/projection/MercatorTest.java | 1 -
 .../apache/sis/referencing/operation/projection/MeridianArcTest.java  | 1 -
 .../operation/projection/ModifiedAzimuthalEquidistantTest.java        | 1 -
 .../apache/sis/referencing/operation/projection/MollweideTest.java    | 1 -
 .../java/org/apache/sis/referencing/operation/projection/NoOp.java    | 1 -
 .../referencing/operation/projection/NormalizedProjectionTest.java    | 1 -
 .../sis/referencing/operation/projection/ObliqueMercatorTest.java     | 1 -
 .../referencing/operation/projection/ObliqueStereographicTest.java    | 1 -
 .../apache/sis/referencing/operation/projection/OrthographicTest.java | 1 -
 .../sis/referencing/operation/projection/PolarStereographicTest.java  | 1 -
 .../apache/sis/referencing/operation/projection/PolyconicTest.java    | 1 -
 .../referencing/operation/projection/ProjectionResultComparator.java  | 1 -
 .../sis/referencing/operation/projection/SatelliteTrackingTest.java   | 1 -
 .../apache/sis/referencing/operation/projection/SinusoidalTest.java   | 1 -
 .../sis/referencing/operation/projection/TransverseMercatorTest.java  | 1 -
 .../sis/referencing/operation/projection/ZonedGridSystemTest.java     | 1 -
 .../operation/transform/AbridgedMolodenskyTransformTest.java          | 1 -
 .../referencing/operation/transform/AbstractMathTransformTest.java    | 1 -
 .../sis/referencing/operation/transform/CartesianToPolarTest.java     | 1 -
 .../sis/referencing/operation/transform/CartesianToSphericalTest.java | 1 -
 .../referencing/operation/transform/ConcatenatedTransformTest.java    | 1 -
 .../sis/referencing/operation/transform/ContextualParametersTest.java | 1 -
 .../apache/sis/referencing/operation/transform/CoordinateDomain.java  | 1 -
 .../sis/referencing/operation/transform/CoordinateDomainTest.java     | 1 -
 .../operation/transform/CoordinateSystemTransformTest.java            | 1 -
 .../apache/sis/referencing/operation/transform/CopyTransformTest.java | 1 -
 .../operation/transform/DefaultMathTransformFactoryTest.java          | 1 -
 .../sis/referencing/operation/transform/DomainDefinitionTest.java     | 1 -
 .../operation/transform/EllipsoidToCentricTransformTest.java          | 1 -
 .../referencing/operation/transform/ExponentialTransform1DTest.java   | 1 -
 .../operation/transform/InterpolatedGeocentricTransformTest.java      | 1 -
 .../operation/transform/InterpolatedMolodenskyTransformTest.java      | 1 -
 .../referencing/operation/transform/InterpolatedTransformTest.java    | 1 -
 .../sis/referencing/operation/transform/IterationStrategyTest.java    | 1 -
 .../sis/referencing/operation/transform/LinearInterpolator1DTest.java | 1 -
 .../sis/referencing/operation/transform/LinearTransformTest.java      | 1 -
 .../referencing/operation/transform/LogarithmicTransform1DTest.java   | 1 -
 .../sis/referencing/operation/transform/MathTransformFactoryBase.java | 1 -
 .../sis/referencing/operation/transform/MathTransformFactoryMock.java | 1 -
 .../sis/referencing/operation/transform/MathTransformTestCase.java    | 1 -
 .../sis/referencing/operation/transform/MathTransformWrapper.java     | 1 -
 .../sis/referencing/operation/transform/MathTransformsTest.java       | 1 -
 .../sis/referencing/operation/transform/MolodenskyTransformTest.java  | 1 -
 .../sis/referencing/operation/transform/OperationMethodSetTest.java   | 1 -
 .../sis/referencing/operation/transform/PassThroughTransformTest.java | 1 -
 .../sis/referencing/operation/transform/PolarToCartesianTest.java     | 1 -
 .../apache/sis/referencing/operation/transform/PoleRotationTest.java  | 1 -
 .../sis/referencing/operation/transform/ProjectiveTransformTest.java  | 1 -
 .../apache/sis/referencing/operation/transform/PseudoTransform.java   | 1 -
 .../sis/referencing/operation/transform/RandomFailureTransform.java   | 1 -
 .../sis/referencing/operation/transform/ScaleTransformTest.java       | 1 -
 .../sis/referencing/operation/transform/SinusoidalShiftGrid.java      | 1 -
 .../referencing/operation/transform/SpecializableTransformTest.java   | 1 -
 .../sis/referencing/operation/transform/SphericalToCartesianTest.java | 1 -
 .../sis/referencing/operation/transform/TransferFunctionTest.java     | 1 -
 .../referencing/operation/transform/TransformResultComparator.java    | 1 -
 .../sis/referencing/operation/transform/TransformSeparatorTest.java   | 1 -
 .../sis/referencing/operation/transform/TranslationTransformTest.java | 1 -
 .../sis/referencing/operation/transform/WraparoundTransformTest.java  | 1 -
 .../org/apache/sis/referencing/report/CoordinateOperationMethods.java | 1 -
 .../org/apache/sis/referencing/report/CoordinateReferenceSystems.java | 1 -
 .../test/java/org/apache/sis/referencing/report/HTMLGenerator.java    | 1 -
 .../src/test/java/org/apache/sis/referencing/report/package-info.java | 1 -
 .../src/test/java/org/apache/sis/test/ReferencingAssert.java          | 1 -
 .../test/java/org/apache/sis/test/integration/ConsistencyTest.java    | 1 -
 .../java/org/apache/sis/test/integration/CoordinateOperationTest.java | 1 -
 .../apache/sis/test/integration/CoordinateReferenceSystemTest.java    | 1 -
 .../src/test/java/org/apache/sis/test/integration/DatumShiftTest.java | 1 -
 .../src/test/java/org/apache/sis/test/integration/MetadataTest.java   | 1 -
 .../java/org/apache/sis/test/integration/MetadataVerticalTest.java    | 1 -
 .../src/test/java/org/apache/sis/test/integration/package-info.java   | 1 -
 .../src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java | 1 -
 .../src/test/java/org/apache/sis/test/widget/ShapeViewer.java         | 1 -
 .../src/test/java/org/apache/sis/test/widget/SwingAssertions.java     | 1 -
 .../src/test/java/org/apache/sis/test/widget/VisualCheck.java         | 1 -
 .../src/test/java/org/apache/sis/test/widget/package-info.java        | 1 -
 .../main/java/org/apache/sis/internal/converter/AngleConverter.java   | 1 -
 .../main/java/org/apache/sis/internal/converter/ArrayConverter.java   | 1 -
 .../java/org/apache/sis/internal/converter/CharSequenceConverter.java | 1 -
 .../src/main/java/org/apache/sis/internal/converter/ClassPair.java    | 1 -
 .../java/org/apache/sis/internal/converter/CollectionConverter.java   | 1 -
 .../src/main/java/org/apache/sis/internal/converter/Column.java       | 1 -
 .../java/org/apache/sis/internal/converter/ConverterRegistry.java     | 1 -
 .../main/java/org/apache/sis/internal/converter/DateConverter.java    | 1 -
 .../java/org/apache/sis/internal/converter/FallbackConverter.java     | 1 -
 .../java/org/apache/sis/internal/converter/FractionConverter.java     | 1 -
 .../java/org/apache/sis/internal/converter/IdentityConverter.java     | 1 -
 .../main/java/org/apache/sis/internal/converter/NumberConverter.java  | 1 -
 .../main/java/org/apache/sis/internal/converter/ObjectToString.java   | 1 -
 .../main/java/org/apache/sis/internal/converter/PathConverter.java    | 1 -
 .../main/java/org/apache/sis/internal/converter/StringConverter.java  | 1 -
 .../java/org/apache/sis/internal/converter/SurjectiveConverter.java   | 1 -
 .../main/java/org/apache/sis/internal/converter/SystemConverter.java  | 1 -
 .../main/java/org/apache/sis/internal/converter/SystemRegistry.java   | 1 -
 .../src/main/java/org/apache/sis/internal/converter/package-info.java | 1 -
 .../src/main/java/org/apache/sis/internal/jdk17/HexFormat.java        | 1 -
 .../src/main/java/org/apache/sis/internal/jdk17/JDK17.java            | 1 -
 .../src/main/java/org/apache/sis/internal/jdk17/Record.java           | 1 -
 .../src/main/java/org/apache/sis/internal/jdk17/package-info.java     | 1 -
 .../src/main/java/org/apache/sis/internal/system/CommonExecutor.java  | 1 -
 .../src/main/java/org/apache/sis/internal/system/DaemonThread.java    | 1 -
 .../src/main/java/org/apache/sis/internal/system/DataDirectory.java   | 1 -
 .../main/java/org/apache/sis/internal/system/DefaultFactories.java    | 1 -
 .../src/main/java/org/apache/sis/internal/system/DelayedExecutor.java | 1 -
 .../src/main/java/org/apache/sis/internal/system/DelayedRunnable.java | 2 --
 .../src/main/java/org/apache/sis/internal/system/Fallback.java        | 1 -
 .../java/org/apache/sis/internal/system/LocalizedStaticObject.java    | 1 -
 .../src/main/java/org/apache/sis/internal/system/Loggers.java         | 1 -
 .../src/main/java/org/apache/sis/internal/system/Modules.java         | 1 -
 .../main/java/org/apache/sis/internal/system/OptionalDependency.java  | 1 -
 .../java/org/apache/sis/internal/system/ReferenceQueueConsumer.java   | 1 -
 .../src/main/java/org/apache/sis/internal/system/Semaphores.java      | 1 -
 .../src/main/java/org/apache/sis/internal/system/Shutdown.java        | 1 -
 .../src/main/java/org/apache/sis/internal/system/Supervisor.java      | 1 -
 .../src/main/java/org/apache/sis/internal/system/SupervisorMBean.java | 1 -
 .../src/main/java/org/apache/sis/internal/system/SystemListener.java  | 1 -
 .../src/main/java/org/apache/sis/internal/system/Threads.java         | 1 -
 .../src/main/java/org/apache/sis/internal/system/package-info.java    | 1 -
 .../main/java/org/apache/sis/internal/temporal/DefaultInstant.java    | 1 -
 .../src/main/java/org/apache/sis/internal/temporal/DefaultPeriod.java | 1 -
 .../java/org/apache/sis/internal/temporal/DefaultPeriodDuration.java  | 1 -
 .../java/org/apache/sis/internal/temporal/DefaultTemporalFactory.java | 1 -
 .../src/main/java/org/apache/sis/internal/temporal/Primitive.java     | 1 -
 .../src/main/java/org/apache/sis/internal/temporal/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/internal/util/AbstractIterator.java  | 1 -
 .../src/main/java/org/apache/sis/internal/util/AbstractMap.java       | 1 -
 .../src/main/java/org/apache/sis/internal/util/AbstractMapEntry.java  | 1 -
 .../src/main/java/org/apache/sis/internal/util/Acyclic.java           | 1 -
 .../src/main/java/org/apache/sis/internal/util/AutoMessageFormat.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/internal/util/Bag.java  | 1 -
 .../src/main/java/org/apache/sis/internal/util/CheckedArrayList.java  | 1 -
 .../src/main/java/org/apache/sis/internal/util/CheckedHashSet.java    | 1 -
 .../src/main/java/org/apache/sis/internal/util/Cloner.java            | 1 -
 .../src/main/java/org/apache/sis/internal/util/CodeLists.java         | 1 -
 .../src/main/java/org/apache/sis/internal/util/CollectionsExt.java    | 1 -
 .../src/main/java/org/apache/sis/internal/util/Constants.java         | 1 -
 .../src/main/java/org/apache/sis/internal/util/DefinitionURI.java     | 1 -
 .../src/main/java/org/apache/sis/internal/util/DoubleDouble.java      | 1 -
 .../src/main/java/org/apache/sis/internal/util/EmptyQueue.java        | 1 -
 .../src/main/java/org/apache/sis/internal/util/FinalFieldSetter.java  | 1 -
 .../src/main/java/org/apache/sis/internal/util/ListOfUnknownSize.java | 1 -
 .../java/org/apache/sis/internal/util/LocalizedParseException.java    | 1 -
 .../src/main/java/org/apache/sis/internal/util/MetadataServices.java  | 1 -
 .../src/main/java/org/apache/sis/internal/util/Numerics.java          | 1 -
 .../src/main/java/org/apache/sis/internal/util/PropertyFormat.java    | 1 -
 .../src/main/java/org/apache/sis/internal/util/SetOfUnknownSize.java  | 1 -
 .../java/org/apache/sis/internal/util/SimpleCharacterIterator.java    | 1 -
 .../main/java/org/apache/sis/internal/util/StandardDateFormat.java    | 1 -
 .../src/main/java/org/apache/sis/internal/util/Strings.java           | 1 -
 .../src/main/java/org/apache/sis/internal/util/TemporalUtilities.java | 1 -
 .../java/org/apache/sis/internal/util/TreeFormatCustomization.java    | 1 -
 core/sis-utility/src/main/java/org/apache/sis/internal/util/URLs.java | 1 -
 .../main/java/org/apache/sis/internal/util/UnmodifiableArrayList.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java | 1 -
 .../src/main/java/org/apache/sis/internal/util/package-info.java      | 1 -
 .../sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/io/Appender.java        | 1 -
 core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java     | 1 -
 core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java  | 1 -
 core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java   | 1 -
 core/sis-utility/src/main/java/org/apache/sis/io/IO.java              | 1 -
 .../src/main/java/org/apache/sis/io/IdentifiedObjectFormat.java       | 1 -
 .../src/main/java/org/apache/sis/io/InvalidSeekException.java         | 1 -
 core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java    | 1 -
 core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java   | 2 --
 core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java   | 1 -
 core/sis-utility/src/main/java/org/apache/sis/io/package-info.java    | 1 -
 core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java   | 1 -
 .../src/main/java/org/apache/sis/math/CompoundDirectPositions.java    | 1 -
 .../src/main/java/org/apache/sis/math/ConcatenatedVector.java         | 1 -
 .../src/main/java/org/apache/sis/math/DecimalFunctions.java           | 1 -
 core/sis-utility/src/main/java/org/apache/sis/math/Fraction.java      | 1 -
 .../src/main/java/org/apache/sis/math/FunctionProperty.java           | 1 -
 core/sis-utility/src/main/java/org/apache/sis/math/Line.java          | 1 -
 .../src/main/java/org/apache/sis/math/LinearlyDerivedVector.java      | 1 -
 core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/math/PackedVector.java  | 1 -
 core/sis-utility/src/main/java/org/apache/sis/math/Plane.java         | 1 -
 .../sis-utility/src/main/java/org/apache/sis/math/RepeatedVector.java | 1 -
 .../sis-utility/src/main/java/org/apache/sis/math/SequenceVector.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java    | 2 --
 .../src/main/java/org/apache/sis/math/StatisticsFormat.java           | 1 -
 core/sis-utility/src/main/java/org/apache/sis/math/Vector.java        | 1 -
 core/sis-utility/src/main/java/org/apache/sis/math/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/measure/AbstractConverter.java       | 1 -
 .../src/main/java/org/apache/sis/measure/AbstractUnit.java            | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/Angle.java      | 1 -
 .../sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java | 2 --
 .../src/main/java/org/apache/sis/measure/AngularVelocity.java         | 1 -
 .../src/main/java/org/apache/sis/measure/ConcatenatedConverter.java   | 1 -
 .../src/main/java/org/apache/sis/measure/ConventionalUnit.java        | 1 -
 .../src/main/java/org/apache/sis/measure/DerivedScalar.java           | 1 -
 .../src/main/java/org/apache/sis/measure/ElevationAngle.java          | 1 -
 .../sis-utility/src/main/java/org/apache/sis/measure/FormatField.java | 1 -
 .../main/java/org/apache/sis/measure/FormattedCharacterIterator.java  | 1 -
 .../src/main/java/org/apache/sis/measure/IdentityConverter.java       | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/Latitude.java   | 1 -
 .../src/main/java/org/apache/sis/measure/LinearConverter.java         | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/Longitude.java  | 1 -
 .../src/main/java/org/apache/sis/measure/MeasurementRange.java        | 1 -
 .../sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/PowerOf10.java  | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/Prefixes.java   | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/Quantities.java | 1 -
 .../src/main/java/org/apache/sis/measure/QuantityFormat.java          | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/Range.java      | 1 -
 .../sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java | 2 --
 core/sis-utility/src/main/java/org/apache/sis/measure/Salinity.java   | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/Scalar.java     | 1 -
 .../src/main/java/org/apache/sis/measure/ScalarFactory.java           | 1 -
 .../src/main/java/org/apache/sis/measure/ScalarFallback.java          | 1 -
 .../src/main/java/org/apache/sis/measure/ScaleRateOfChange.java       | 1 -
 .../src/main/java/org/apache/sis/measure/SexagesimalConverter.java    | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java | 1 -
 .../src/main/java/org/apache/sis/measure/UnitDimension.java           | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java | 2 --
 .../src/main/java/org/apache/sis/measure/UnitRegistry.java            | 1 -
 .../src/main/java/org/apache/sis/measure/UnitServices.java            | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/Units.java      | 1 -
 core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java | 1 -
 .../src/main/java/org/apache/sis/measure/package-info.java            | 1 -
 core/sis-utility/src/main/java/org/apache/sis/setup/About.java        | 1 -
 .../sis-utility/src/main/java/org/apache/sis/setup/Configuration.java | 1 -
 .../src/main/java/org/apache/sis/setup/GeometryLibrary.java           | 1 -
 .../src/main/java/org/apache/sis/setup/InstallationResources.java     | 1 -
 core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java    | 1 -
 .../src/main/java/org/apache/sis/setup/OptionalInstallations.java     | 1 -
 core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java | 1 -
 .../main/java/org/apache/sis/util/AbstractInternationalString.java    | 1 -
 .../sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java     | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Characters.java    | 2 --
 core/sis-utility/src/main/java/org/apache/sis/util/Classes.java       | 1 -
 .../sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Configuration.java | 1 -
 .../src/main/java/org/apache/sis/util/CorruptedObjectException.java   | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Debug.java         | 1 -
 .../src/main/java/org/apache/sis/util/DefaultInternationalString.java | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java    | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Disposable.java    | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Emptiable.java     | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java    | 1 -
 .../src/main/java/org/apache/sis/util/LenientComparable.java          | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Locales.java       | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Localized.java     | 1 -
 .../src/main/java/org/apache/sis/util/LocalizedException.java         | 1 -
 .../src/main/java/org/apache/sis/util/NullArgumentException.java      | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java       | 1 -
 .../src/main/java/org/apache/sis/util/ObjectConverter.java            | 1 -
 .../src/main/java/org/apache/sis/util/ObjectConverters.java           | 1 -
 .../src/main/java/org/apache/sis/util/OptionalCandidate.java          | 1 -
 .../main/java/org/apache/sis/util/ResourceInternationalString.java    | 1 -
 .../src/main/java/org/apache/sis/util/SimpleInternationalString.java  | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Static.java        | 1 -
 .../sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java | 1 -
 .../main/java/org/apache/sis/util/UnconvertibleObjectException.java   | 1 -
 .../src/main/java/org/apache/sis/util/UnknownNameException.java       | 1 -
 .../java/org/apache/sis/util/UnsupportedImplementationException.java  | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java     | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Version.java       | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/Workaround.java    | 1 -
 .../java/org/apache/sis/util/collection/BackingStoreException.java    | 1 -
 .../src/main/java/org/apache/sis/util/collection/Cache.java           | 2 --
 .../src/main/java/org/apache/sis/util/collection/CacheEntries.java    | 1 -
 .../main/java/org/apache/sis/util/collection/CheckedContainer.java    | 1 -
 .../src/main/java/org/apache/sis/util/collection/CodeListSet.java     | 1 -
 .../src/main/java/org/apache/sis/util/collection/Containers.java      | 1 -
 .../main/java/org/apache/sis/util/collection/DefaultTreeTable.java    | 2 --
 .../src/main/java/org/apache/sis/util/collection/DerivedIterator.java | 1 -
 .../src/main/java/org/apache/sis/util/collection/DerivedMap.java      | 1 -
 .../src/main/java/org/apache/sis/util/collection/DerivedSet.java      | 1 -
 .../main/java/org/apache/sis/util/collection/FrequencySortedSet.java  | 1 -
 .../src/main/java/org/apache/sis/util/collection/IntegerList.java     | 1 -
 .../src/main/java/org/apache/sis/util/collection/RangeSet.java        | 3 ---
 .../src/main/java/org/apache/sis/util/collection/TableColumn.java     | 1 -
 .../src/main/java/org/apache/sis/util/collection/TreeNodeList.java    | 1 -
 .../src/main/java/org/apache/sis/util/collection/TreeTable.java       | 2 --
 .../src/main/java/org/apache/sis/util/collection/TreeTableFormat.java | 1 -
 .../src/main/java/org/apache/sis/util/collection/TreeTables.java      | 1 -
 .../src/main/java/org/apache/sis/util/collection/WeakEntry.java       | 1 -
 .../src/main/java/org/apache/sis/util/collection/WeakHashSet.java     | 1 -
 .../main/java/org/apache/sis/util/collection/WeakValueHashMap.java    | 2 --
 .../src/main/java/org/apache/sis/util/collection/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/util/logging/Initializer.java        | 1 -
 .../src/main/java/org/apache/sis/util/logging/Logging.java            | 1 -
 .../src/main/java/org/apache/sis/util/logging/MonolineFormatter.java  | 1 -
 .../src/main/java/org/apache/sis/util/logging/PerformanceLevel.java   | 1 -
 .../src/main/java/org/apache/sis/util/logging/package-info.java       | 1 -
 core/sis-utility/src/main/java/org/apache/sis/util/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/util/resources/Errors.java           | 2 --
 .../java/org/apache/sis/util/resources/IndexedResourceBundle.java     | 1 -
 .../src/main/java/org/apache/sis/util/resources/KeyConstants.java     | 1 -
 .../src/main/java/org/apache/sis/util/resources/Loader.java           | 1 -
 .../src/main/java/org/apache/sis/util/resources/Messages.java         | 2 --
 .../org/apache/sis/util/resources/ResourceInternationalString.java    | 1 -
 .../src/main/java/org/apache/sis/util/resources/Vocabulary.java       | 2 --
 .../src/main/java/org/apache/sis/util/resources/package-info.java     | 1 -
 .../java/org/apache/sis/internal/converter/AngleConverterTest.java    | 1 -
 .../java/org/apache/sis/internal/converter/ArrayConverterTest.java    | 1 -
 .../java/org/apache/sis/internal/converter/ConverterRegistryTest.java | 1 -
 .../java/org/apache/sis/internal/converter/FallbackConverterTest.java | 1 -
 .../java/org/apache/sis/internal/converter/NumberConverterTest.java   | 1 -
 .../java/org/apache/sis/internal/converter/PathConverterTest.java     | 1 -
 .../java/org/apache/sis/internal/converter/StringConverterTest.java   | 1 -
 .../java/org/apache/sis/internal/converter/SystemRegistryTest.java    | 1 -
 .../src/test/java/org/apache/sis/internal/system/LoggersTest.java     | 1 -
 .../org/apache/sis/internal/system/ReferenceQueueConsumerTest.java    | 1 -
 .../src/test/java/org/apache/sis/internal/test/AssertTest.java        | 1 -
 .../src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java | 1 -
 .../src/test/java/org/apache/sis/internal/test/package-info.java      | 1 -
 .../src/test/java/org/apache/sis/internal/util/AbstractMapTest.java   | 1 -
 .../src/test/java/org/apache/sis/internal/util/BagTest.java           | 1 -
 .../test/java/org/apache/sis/internal/util/CheckedArrayListTest.java  | 1 -
 .../test/java/org/apache/sis/internal/util/CollectionsExtTest.java    | 1 -
 .../src/test/java/org/apache/sis/internal/util/DefinitionURITest.java | 1 -
 .../src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java  | 1 -
 .../test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java | 1 -
 .../org/apache/sis/internal/util/LocalizedParseExceptionTest.java     | 1 -
 .../src/test/java/org/apache/sis/internal/util/NumericsTest.java      | 1 -
 .../java/org/apache/sis/internal/util/StandardDateFormatTest.java     | 1 -
 .../src/test/java/org/apache/sis/internal/util/StringsTest.java       | 1 -
 .../src/test/java/org/apache/sis/internal/util/X364Test.java          | 1 -
 .../sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java | 1 -
 core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java  | 1 -
 core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java  | 1 -
 .../sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java | 1 -
 .../src/test/java/org/apache/sis/io/SingleCharAppendable.java         | 1 -
 .../src/test/java/org/apache/sis/io/TableAppenderTest.java            | 1 -
 .../src/test/java/org/apache/sis/io/TabulationExpansionTest.java      | 1 -
 core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java    | 1 -
 .../test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java    | 1 -
 .../src/test/java/org/apache/sis/math/DecimalFunctionsTest.java       | 1 -
 core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java  | 1 -
 core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java      | 1 -
 .../src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java  | 1 -
 .../src/test/java/org/apache/sis/math/MathFunctionsTest.java          | 1 -
 core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java     | 1 -
 .../src/test/java/org/apache/sis/math/RepeatedVectorTest.java         | 1 -
 .../src/test/java/org/apache/sis/math/StatisticsFormatTest.java       | 1 -
 .../sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java | 1 -
 core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java    | 1 -
 .../src/test/java/org/apache/sis/measure/AngleFormatTest.java         | 1 -
 core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java  | 1 -
 .../src/test/java/org/apache/sis/measure/ConventionalUnitTest.java    | 1 -
 .../src/test/java/org/apache/sis/measure/DateRangeTest.java           | 1 -
 .../java/org/apache/sis/measure/FormattedCharacterIteratorTest.java   | 1 -
 .../src/test/java/org/apache/sis/measure/LinearConverterTest.java     | 1 -
 .../src/test/java/org/apache/sis/measure/MeasurementRangeTest.java    | 1 -
 .../src/test/java/org/apache/sis/measure/NumberRangeTest.java         | 1 -
 .../src/test/java/org/apache/sis/measure/PrefixesTest.java            | 1 -
 .../src/test/java/org/apache/sis/measure/QuantitiesTest.java          | 1 -
 .../src/test/java/org/apache/sis/measure/RangeFormatTest.java         | 1 -
 core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java  | 1 -
 core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java | 1 -
 .../test/java/org/apache/sis/measure/SexagesimalConverterTest.java    | 1 -
 .../src/test/java/org/apache/sis/measure/SystemUnitTest.java          | 1 -
 .../src/test/java/org/apache/sis/measure/UnitDimensionTest.java       | 1 -
 .../src/test/java/org/apache/sis/measure/UnitFormatTest.java          | 1 -
 .../src/test/java/org/apache/sis/measure/UnitServicesTest.java        | 1 -
 core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java  | 1 -
 .../sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/Assert.java        | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/Assume.java        | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java     | 1 -
 .../src/test/java/org/apache/sis/test/DependsOnMethod.java            | 1 -
 .../src/test/java/org/apache/sis/test/LogRecordCollector.java         | 1 -
 .../sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java | 1 -
 .../src/test/java/org/apache/sis/test/OptionalTestData.java           | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/Performance.java   | 1 -
 .../src/test/java/org/apache/sis/test/PlatformDependent.java          | 1 -
 .../src/test/java/org/apache/sis/test/ProjectDirectories.java         | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java      | 1 -
 .../src/test/java/org/apache/sis/test/TestConfiguration.java          | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java    | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/TestStep.java      | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java     | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java | 1 -
 .../java/org/apache/sis/test/foreigner/SerializableTableColumn.java   | 1 -
 .../src/test/java/org/apache/sis/test/foreigner/package-info.java     | 1 -
 core/sis-utility/src/test/java/org/apache/sis/test/package-info.java  | 1 -
 .../src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java     | 1 -
 .../src/test/java/org/apache/sis/test/suite/package-info.java         | 1 -
 .../src/test/java/org/apache/sis/util/ArgumentChecksTest.java         | 1 -
 core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java | 1 -
 .../src/test/java/org/apache/sis/util/CharSequencesTest.java          | 1 -
 .../sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java | 1 -
 core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java   | 1 -
 .../test/java/org/apache/sis/util/DefaultInternationalStringTest.java | 1 -
 .../sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java | 1 -
 core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java   | 1 -
 core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java   | 1 -
 .../test/java/org/apache/sis/util/SimpleInternationalStringTest.java  | 1 -
 .../src/test/java/org/apache/sis/util/StringBuildersTest.java         | 1 -
 core/sis-utility/src/test/java/org/apache/sis/util/UtilitiesTest.java | 1 -
 core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java   | 1 -
 .../src/test/java/org/apache/sis/util/collection/CacheTest.java       | 1 -
 .../src/test/java/org/apache/sis/util/collection/CodeListSetTest.java | 1 -
 .../java/org/apache/sis/util/collection/DefaultTreeTableTest.java     | 1 -
 .../src/test/java/org/apache/sis/util/collection/DerivedMapTest.java  | 1 -
 .../src/test/java/org/apache/sis/util/collection/DerivedSetTest.java  | 1 -
 .../java/org/apache/sis/util/collection/FrequencySortedSetTest.java   | 1 -
 .../src/test/java/org/apache/sis/util/collection/IntObject.java       | 1 -
 .../src/test/java/org/apache/sis/util/collection/IntegerListTest.java | 1 -
 .../src/test/java/org/apache/sis/util/collection/LargeCodeList.java   | 1 -
 .../src/test/java/org/apache/sis/util/collection/RangeSetTest.java    | 1 -
 .../src/test/java/org/apache/sis/util/collection/TableColumnTest.java | 1 -
 .../test/java/org/apache/sis/util/collection/TreeTableFormatTest.java | 1 -
 .../src/test/java/org/apache/sis/util/collection/TreeTablesTest.java  | 1 -
 .../src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java | 1 -
 .../java/org/apache/sis/util/collection/WeakValueHashMapTest.java     | 1 -
 .../test/java/org/apache/sis/util/logging/MonolineFormatterTest.java  | 1 -
 .../test/java/org/apache/sis/util/logging/PerformanceLevelTest.java   | 1 -
 .../main/java/org/apache/sis/internal/profile/fra/Constraints.java    | 1 -
 .../java/org/apache/sis/internal/profile/fra/DataIdentification.java  | 1 -
 .../org/apache/sis/internal/profile/fra/DirectReferenceSystem.java    | 1 -
 .../org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java  | 1 -
 .../java/org/apache/sis/internal/profile/fra/LegalConstraints.java    | 1 -
 .../main/java/org/apache/sis/internal/profile/fra/ProfileTypes.java   | 1 -
 .../java/org/apache/sis/internal/profile/fra/SecurityConstraints.java | 1 -
 .../main/java/org/apache/sis/internal/profile/fra/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/profile/france/FrenchProfile.java    | 1 -
 .../src/main/java/org/apache/sis/profile/france/package-info.java     | 1 -
 .../org/apache/sis/internal/profile/fra/DataIdentificationTest.java   | 1 -
 .../apache/sis/internal/profile/fra/DirectReferenceSystemTest.java    | 1 -
 .../test/java/org/apache/sis/profile/france/FrenchProfileTest.java    | 1 -
 .../test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java   | 1 -
 .../java/org/apache/sis/internal/earth/netcdf/FactoryForUCAR.java     | 1 -
 .../src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java    | 1 -
 .../src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java    | 1 -
 .../main/java/org/apache/sis/internal/earth/netcdf/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/profile/japan/JapaneseProfile.java   | 1 -
 .../src/main/java/org/apache/sis/profile/japan/package-info.java      | 1 -
 .../src/test/java/org/apache/sis/profile/japan/JapanProfileTest.java  | 1 -
 .../test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java    | 1 -
 .../src/main/java/org/apache/sis/storage/landsat/Band.java            | 1 -
 .../src/main/java/org/apache/sis/storage/landsat/BandGroup.java       | 1 -
 .../src/main/java/org/apache/sis/storage/landsat/BandGroupName.java   | 1 -
 .../src/main/java/org/apache/sis/storage/landsat/BandName.java        | 1 -
 .../src/main/java/org/apache/sis/storage/landsat/LandsatStore.java    | 1 -
 .../java/org/apache/sis/storage/landsat/LandsatStoreProvider.java     | 1 -
 .../src/main/java/org/apache/sis/storage/landsat/MetadataReader.java  | 1 -
 .../src/main/java/org/apache/sis/storage/landsat/package-info.java    | 1 -
 .../java/org/apache/sis/storage/landsat/LandsatStoreProviderTest.java | 1 -
 .../test/java/org/apache/sis/storage/landsat/MetadataReaderTest.java  | 1 -
 .../java/org/apache/sis/test/suite/EarthObservationTestSuite.java     | 1 -
 .../src/main/java/org/apache/sis/internal/geotiff/Compression.java    | 1 -
 .../src/main/java/org/apache/sis/internal/geotiff/Predictor.java      | 1 -
 .../src/main/java/org/apache/sis/internal/geotiff/Resources.java      | 2 --
 .../src/main/java/org/apache/sis/internal/geotiff/SchemaModifier.java | 1 -
 .../src/main/java/org/apache/sis/internal/geotiff/package-info.java   | 1 -
 .../main/java/org/apache/sis/internal/storage/inflater/CCITTRLE.java  | 1 -
 .../org/apache/sis/internal/storage/inflater/CompressionChannel.java  | 1 -
 .../java/org/apache/sis/internal/storage/inflater/CopyFromBytes.java  | 1 -
 .../org/apache/sis/internal/storage/inflater/HorizontalPredictor.java | 1 -
 .../main/java/org/apache/sis/internal/storage/inflater/Inflater.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/inflater/LZW.java   | 1 -
 .../main/java/org/apache/sis/internal/storage/inflater/PackBits.java  | 1 -
 .../java/org/apache/sis/internal/storage/inflater/PixelChannel.java   | 1 -
 .../org/apache/sis/internal/storage/inflater/PredictorChannel.java    | 1 -
 .../src/main/java/org/apache/sis/internal/storage/inflater/ZIP.java   | 1 -
 .../java/org/apache/sis/internal/storage/inflater/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java      | 1 -
 .../main/java/org/apache/sis/storage/geotiff/CompressedSubset.java    | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/DataCube.java        | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/DataSubset.java      | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/DeferredEntry.java   | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/GeoCodes.java        | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/GeoKeys.java         | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/GeoKeysLoader.java   | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java         | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java    | 1 -
 .../java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java     | 1 -
 .../main/java/org/apache/sis/storage/geotiff/GridGeometryBuilder.java | 1 -
 .../main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java  | 1 -
 .../java/org/apache/sis/storage/geotiff/ImageMetadataBuilder.java     | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/Localization.java    | 1 -
 .../java/org/apache/sis/storage/geotiff/MultiResolutionImage.java     | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/NativeMetadata.java  | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/Reader.java          | 1 -
 .../main/java/org/apache/sis/storage/geotiff/ReversedBitsChannel.java | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/Tags.java            | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/Type.java            | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java     | 1 -
 .../src/main/java/org/apache/sis/storage/geotiff/package-info.java    | 1 -
 .../test/java/org/apache/sis/internal/geotiff/CompressionTest.java    | 1 -
 .../java/org/apache/sis/internal/storage/inflater/CCITTRLETest.java   | 1 -
 .../java/org/apache/sis/internal/storage/inflater/InflaterTest.java   | 1 -
 .../src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java  | 1 -
 .../src/test/java/org/apache/sis/storage/geotiff/GeoIdentifiers.java  | 1 -
 .../src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java     | 1 -
 .../test/java/org/apache/sis/storage/geotiff/SelfConsistencyTest.java | 1 -
 .../src/test/java/org/apache/sis/storage/geotiff/TagsTest.java        | 1 -
 .../src/test/java/org/apache/sis/storage/geotiff/TypeTest.java        | 1 -
 .../src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java | 1 -
 .../src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java     | 1 -
 .../sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/AxisType.java        | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/CRSBuilder.java      | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/CRSMerger.java       | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/Convention.java      | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/DataType.java        | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/Decoder.java         | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/Dimension.java       | 1 -
 .../main/java/org/apache/sis/internal/netcdf/DiscreteSampling.java    | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/FeatureSet.java      | 1 -
 .../sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Grid.java | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/GridAdjustment.java  | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/GridCacheKey.java    | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/GridCacheValue.java  | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/GridMapping.java     | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/HYCOM.java           | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/Linearizer.java      | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/NamedElement.java    | 1 -
 .../sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Node.java | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/Raster.java          | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/RasterResource.java  | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/Resources.java       | 2 --
 .../src/main/java/org/apache/sis/internal/netcdf/Variable.java        | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/VariableRole.java    | 1 -
 .../main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java | 1 -
 .../main/java/org/apache/sis/internal/netcdf/impl/DimensionInfo.java  | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/impl/GridInfo.java   | 1 -
 .../main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java   | 1 -
 .../main/java/org/apache/sis/internal/netcdf/impl/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/package-info.java    | 1 -
 .../main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java | 1 -
 .../java/org/apache/sis/internal/netcdf/ucar/DimensionWrapper.java    | 1 -
 .../java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java     | 1 -
 .../main/java/org/apache/sis/internal/netcdf/ucar/GridWrapper.java    | 1 -
 .../main/java/org/apache/sis/internal/netcdf/ucar/GroupWrapper.java   | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/ucar/LogAdapter.java | 1 -
 .../src/main/java/org/apache/sis/internal/netcdf/ucar/Utils.java      | 1 -
 .../java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java     | 1 -
 .../main/java/org/apache/sis/internal/netcdf/ucar/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java   | 4 ----
 .../src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java   | 1 -
 .../src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java      | 1 -
 .../main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java  | 1 -
 .../src/main/java/org/apache/sis/storage/netcdf/package-info.java     | 1 -
 .../src/test/java/org/apache/sis/internal/netcdf/AxisTest.java        | 1 -
 .../src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java    | 1 -
 .../src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java     | 1 -
 .../src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java  | 1 -
 .../src/test/java/org/apache/sis/internal/netcdf/GridTest.java        | 1 -
 .../src/test/java/org/apache/sis/internal/netcdf/TestCase.java        | 1 -
 .../src/test/java/org/apache/sis/internal/netcdf/VariableTest.java    | 1 -
 .../java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java  | 1 -
 .../test/java/org/apache/sis/internal/netcdf/impl/FeatureSetTest.java | 1 -
 .../test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java   | 1 -
 .../java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java    | 1 -
 .../test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java   | 1 -
 .../java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java   | 1 -
 .../src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java  | 1 -
 .../test/java/org/apache/sis/storage/netcdf/SelfConsistencyTest.java  | 1 -
 .../src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java      | 1 -
 .../shapefile/SQLInvalidRecordNumberForDirectAccessException.java     | 1 -
 .../sis/internal/shapefile/SQLNoDirectAccessAvailableException.java   | 1 -
 .../apache/sis/internal/shapefile/SQLShapefileNotFoundException.java  | 1 -
 .../java/org/apache/sis/internal/shapefile/ShapefileByteReader.java   | 1 -
 .../java/org/apache/sis/internal/shapefile/ShapefileDescriptor.java   | 1 -
 .../apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.java  | 1 -
 .../java/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java     | 1 -
 .../java/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java | 1 -
 .../main/java/org/apache/sis/internal/shapefile/jdbc/DBFDriver.java   | 1 -
 .../org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java | 1 -
 .../java/org/apache/sis/internal/shapefile/jdbc/DBaseDataType.java    | 1 -
 .../java/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java | 1 -
 .../sis/internal/shapefile/jdbc/SQLDbaseFileNotFoundException.java    | 1 -
 .../internal/shapefile/jdbc/SQLInvalidDbaseFileFormatException.java   | 1 -
 .../sis/internal/shapefile/jdbc/connection/AbstractConnection.java    | 1 -
 .../apache/sis/internal/shapefile/jdbc/connection/DBFConnection.java  | 1 -
 .../java/org/apache/sis/internal/shapefile/jdbc/package-info.java     | 1 -
 .../sis/internal/shapefile/jdbc/resultset/AbstractResultSet.java      | 1 -
 .../sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java | 1 -
 .../sis/internal/shapefile/jdbc/statement/AbstractStatement.java      | 1 -
 .../apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java    | 1 -
 .../src/main/java/org/apache/sis/internal/shapefile/package-info.java | 1 -
 .../org/apache/sis/storage/shapefile/DataStoreQueryException.java     | 1 -
 .../apache/sis/storage/shapefile/DataStoreQueryResultException.java   | 1 -
 .../org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java  | 1 -
 .../java/org/apache/sis/storage/shapefile/InputFeatureStream.java     | 1 -
 .../apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java | 1 -
 .../apache/sis/storage/shapefile/InvalidShapefileFormatException.java | 1 -
 .../src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java     | 1 -
 .../src/main/java/org/apache/sis/storage/shapefile/ShapeTypeEnum.java | 1 -
 .../org/apache/sis/storage/shapefile/ShapefileNotFoundException.java  | 1 -
 .../src/main/java/org/apache/sis/storage/shapefile/cpg/CpgFiles.java  | 1 -
 .../src/main/java/org/apache/sis/storage/shapefile/package-info.java  | 1 -
 .../org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java     | 1 -
 .../java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java | 1 -
 .../java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java | 1 -
 .../src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java | 1 -
 .../src/main/java/org/apache/sis/internal/sql/feature/Analyzer.java   | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/BinaryEncoding.java | 1 -
 .../src/main/java/org/apache/sis/internal/sql/feature/Column.java     | 1 -
 .../src/main/java/org/apache/sis/internal/sql/feature/Database.java   | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/FeatureAdapter.java | 1 -
 .../java/org/apache/sis/internal/sql/feature/FeatureAnalyzer.java     | 1 -
 .../java/org/apache/sis/internal/sql/feature/FeatureIterator.java     | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/FeatureStream.java  | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/GeometryGetter.java | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/InfoStatements.java | 1 -
 .../src/main/java/org/apache/sis/internal/sql/feature/PrimaryKey.java | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/QueryAnalyzer.java  | 1 -
 .../src/main/java/org/apache/sis/internal/sql/feature/Relation.java   | 1 -
 .../src/main/java/org/apache/sis/internal/sql/feature/Resources.java  | 2 --
 .../main/java/org/apache/sis/internal/sql/feature/SchemaModifier.java | 1 -
 .../java/org/apache/sis/internal/sql/feature/SelectionClause.java     | 1 -
 .../org/apache/sis/internal/sql/feature/SelectionClauseWriter.java    | 1 -
 .../src/main/java/org/apache/sis/internal/sql/feature/Table.java      | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/TableAnalyzer.java  | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/TableReference.java | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/ValueGetter.java    | 1 -
 .../main/java/org/apache/sis/internal/sql/feature/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/internal/sql/postgis/Band.java       | 1 -
 .../org/apache/sis/internal/sql/postgis/ExtendedClauseWriter.java     | 1 -
 .../main/java/org/apache/sis/internal/sql/postgis/ExtendedInfo.java   | 1 -
 .../java/org/apache/sis/internal/sql/postgis/ExtentEstimator.java     | 1 -
 .../main/java/org/apache/sis/internal/sql/postgis/ObjectGetter.java   | 1 -
 .../src/main/java/org/apache/sis/internal/sql/postgis/Postgres.java   | 1 -
 .../main/java/org/apache/sis/internal/sql/postgis/RasterFormat.java   | 1 -
 .../main/java/org/apache/sis/internal/sql/postgis/RasterGetter.java   | 1 -
 .../main/java/org/apache/sis/internal/sql/postgis/RasterReader.java   | 1 -
 .../main/java/org/apache/sis/internal/sql/postgis/RasterWriter.java   | 1 -
 .../main/java/org/apache/sis/internal/sql/postgis/package-info.java   | 1 -
 .../main/java/org/apache/sis/internal/stream/BaseStreamWrapper.java   | 1 -
 .../src/main/java/org/apache/sis/internal/stream/DeferredStream.java  | 1 -
 .../main/java/org/apache/sis/internal/stream/DoubleStreamWrapper.java | 1 -
 .../main/java/org/apache/sis/internal/stream/PaginedDoubleStream.java | 1 -
 .../src/main/java/org/apache/sis/internal/stream/PaginedStream.java   | 1 -
 .../src/main/java/org/apache/sis/internal/stream/StreamWrapper.java   | 1 -
 .../src/main/java/org/apache/sis/internal/stream/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/storage/sql/ResourceDefinition.java  | 1 -
 .../src/main/java/org/apache/sis/storage/sql/SQLStore.java            | 1 -
 .../src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java    | 1 -
 .../src/main/java/org/apache/sis/storage/sql/package-info.java        | 1 -
 .../java/org/apache/sis/internal/sql/feature/GeometryGetterTest.java  | 1 -
 .../test/java/org/apache/sis/internal/sql/feature/ResultSetMock.java  | 1 -
 .../apache/sis/internal/sql/feature/SelectionClauseWriterTest.java    | 1 -
 .../src/test/java/org/apache/sis/internal/sql/postgis/BandTest.java   | 1 -
 .../test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java   | 1 -
 .../java/org/apache/sis/internal/sql/postgis/RasterReaderTest.java    | 1 -
 .../java/org/apache/sis/internal/sql/postgis/RasterWriterTest.java    | 1 -
 .../src/test/java/org/apache/sis/internal/sql/postgis/TestRaster.java | 1 -
 .../src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java        | 1 -
 .../src/main/java/org/apache/sis/internal/storage/Capability.java     | 1 -
 .../src/main/java/org/apache/sis/internal/storage/CodeType.java       | 1 -
 .../java/org/apache/sis/internal/storage/DocumentedStoreProvider.java | 1 -
 .../java/org/apache/sis/internal/storage/FeatureCatalogBuilder.java   | 1 -
 .../java/org/apache/sis/internal/storage/GridResourceWrapper.java     | 1 -
 .../main/java/org/apache/sis/internal/storage/MemoryFeatureSet.java   | 1 -
 .../main/java/org/apache/sis/internal/storage/MemoryGridResource.java | 1 -
 .../main/java/org/apache/sis/internal/storage/MetadataBuilder.java    | 1 -
 .../src/main/java/org/apache/sis/internal/storage/PRJDataStore.java   | 2 --
 .../src/main/java/org/apache/sis/internal/storage/RangeArgument.java  | 1 -
 .../main/java/org/apache/sis/internal/storage/ResourceLineage.java    | 1 -
 .../java/org/apache/sis/internal/storage/ResourceOnFileSystem.java    | 1 -
 .../java/org/apache/sis/internal/storage/ResourceTransaction.java     | 1 -
 .../src/main/java/org/apache/sis/internal/storage/Resources.java      | 2 --
 .../src/main/java/org/apache/sis/internal/storage/StoreMetadata.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/StoreResource.java  | 1 -
 .../main/java/org/apache/sis/internal/storage/StoreTypeDetector.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/StoreUtilities.java | 1 -
 .../main/java/org/apache/sis/internal/storage/TiledDeferredImage.java | 1 -
 .../main/java/org/apache/sis/internal/storage/TiledGridCoverage.java  | 1 -
 .../main/java/org/apache/sis/internal/storage/TiledGridResource.java  | 1 -
 .../java/org/apache/sis/internal/storage/TransactionalResource.java   | 1 -
 .../src/main/java/org/apache/sis/internal/storage/URIDataStore.java   | 2 --
 .../java/org/apache/sis/internal/storage/WritableResourceSupport.java | 1 -
 .../java/org/apache/sis/internal/storage/csv/FeatureIterator.java     | 1 -
 .../main/java/org/apache/sis/internal/storage/csv/FixedSizeList.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/csv/Foliation.java  | 1 -
 .../main/java/org/apache/sis/internal/storage/csv/GeometryParser.java | 1 -
 .../org/apache/sis/internal/storage/csv/MovingFeatureBuilder.java     | 1 -
 .../org/apache/sis/internal/storage/csv/MovingFeatureIterator.java    | 1 -
 .../src/main/java/org/apache/sis/internal/storage/csv/Store.java      | 1 -
 .../main/java/org/apache/sis/internal/storage/csv/StoreProvider.java  | 1 -
 .../main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java   | 1 -
 .../main/java/org/apache/sis/internal/storage/csv/package-info.java   | 1 -
 .../java/org/apache/sis/internal/storage/esri/AsciiGridStore.java     | 1 -
 .../org/apache/sis/internal/storage/esri/AsciiGridStoreProvider.java  | 1 -
 .../java/org/apache/sis/internal/storage/esri/CharactersView.java     | 1 -
 .../main/java/org/apache/sis/internal/storage/esri/RasterStore.java   | 1 -
 .../java/org/apache/sis/internal/storage/esri/RawRasterLayout.java    | 1 -
 .../java/org/apache/sis/internal/storage/esri/RawRasterReader.java    | 1 -
 .../java/org/apache/sis/internal/storage/esri/RawRasterStore.java     | 1 -
 .../org/apache/sis/internal/storage/esri/RawRasterStoreProvider.java  | 1 -
 .../main/java/org/apache/sis/internal/storage/esri/WritableStore.java | 1 -
 .../main/java/org/apache/sis/internal/storage/esri/package-info.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/folder/Store.java   | 1 -
 .../java/org/apache/sis/internal/storage/folder/StoreProvider.java    | 1 -
 .../org/apache/sis/internal/storage/folder/UnstructuredAggregate.java | 1 -
 .../java/org/apache/sis/internal/storage/folder/WritableStore.java    | 1 -
 .../java/org/apache/sis/internal/storage/folder/package-info.java     | 1 -
 .../main/java/org/apache/sis/internal/storage/image/FormatFilter.java | 1 -
 .../main/java/org/apache/sis/internal/storage/image/FormatFinder.java | 1 -
 .../java/org/apache/sis/internal/storage/image/MultiImageStore.java   | 1 -
 .../java/org/apache/sis/internal/storage/image/SingleImageStore.java  | 1 -
 .../java/org/apache/sis/internal/storage/image/WarningListener.java   | 1 -
 .../java/org/apache/sis/internal/storage/image/WorldFileResource.java | 1 -
 .../java/org/apache/sis/internal/storage/image/WorldFileStore.java    | 1 -
 .../org/apache/sis/internal/storage/image/WorldFileStoreProvider.java | 1 -
 .../java/org/apache/sis/internal/storage/image/WritableResource.java  | 1 -
 .../java/org/apache/sis/internal/storage/image/WritableStore.java     | 1 -
 .../main/java/org/apache/sis/internal/storage/image/package-info.java | 1 -
 .../src/main/java/org/apache/sis/internal/storage/io/ByteWriter.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/io/ChannelData.java | 1 -
 .../java/org/apache/sis/internal/storage/io/ChannelDataInput.java     | 1 -
 .../java/org/apache/sis/internal/storage/io/ChannelDataOutput.java    | 1 -
 .../main/java/org/apache/sis/internal/storage/io/ChannelFactory.java  | 1 -
 .../org/apache/sis/internal/storage/io/ChannelImageInputStream.java   | 1 -
 .../org/apache/sis/internal/storage/io/ChannelImageOutputStream.java  | 1 -
 .../main/java/org/apache/sis/internal/storage/io/DataTransfer.java    | 1 -
 .../java/org/apache/sis/internal/storage/io/FileCacheByteChannel.java | 1 -
 .../main/java/org/apache/sis/internal/storage/io/HttpByteChannel.java | 1 -
 .../java/org/apache/sis/internal/storage/io/HyperRectangleReader.java | 1 -
 .../src/main/java/org/apache/sis/internal/storage/io/IOUtilities.java | 1 -
 .../java/org/apache/sis/internal/storage/io/InputStreamAdapter.java   | 1 -
 .../java/org/apache/sis/internal/storage/io/InternalOptionKey.java    | 1 -
 .../src/main/java/org/apache/sis/internal/storage/io/Markable.java    | 1 -
 .../java/org/apache/sis/internal/storage/io/MemoryDataTransfer.java   | 1 -
 .../src/main/java/org/apache/sis/internal/storage/io/NullChannel.java | 1 -
 .../java/org/apache/sis/internal/storage/io/OutputStreamAdapter.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/io/Region.java      | 1 -
 .../java/org/apache/sis/internal/storage/io/RewindableLineReader.java | 1 -
 .../main/java/org/apache/sis/internal/storage/io/package-info.java    | 1 -
 .../src/main/java/org/apache/sis/internal/storage/package-info.java   | 1 -
 .../java/org/apache/sis/internal/storage/wkt/FirstKeywordPeek.java    | 1 -
 .../src/main/java/org/apache/sis/internal/storage/wkt/Store.java      | 1 -
 .../main/java/org/apache/sis/internal/storage/wkt/StoreFormat.java    | 1 -
 .../main/java/org/apache/sis/internal/storage/wkt/StoreProvider.java  | 1 -
 .../main/java/org/apache/sis/internal/storage/wkt/package-info.java   | 1 -
 .../java/org/apache/sis/internal/storage/xml/AbstractProvider.java    | 1 -
 .../java/org/apache/sis/internal/storage/xml/GeographicEnvelope.java  | 1 -
 .../java/org/apache/sis/internal/storage/xml/MimeTypeDetector.java    | 1 -
 .../src/main/java/org/apache/sis/internal/storage/xml/Store.java      | 1 -
 .../main/java/org/apache/sis/internal/storage/xml/StoreProvider.java  | 1 -
 .../main/java/org/apache/sis/internal/storage/xml/package-info.java   | 1 -
 .../src/main/java/org/apache/sis/storage/AbstractFeatureSet.java      | 1 -
 .../java/org/apache/sis/storage/AbstractGridCoverageResource.java     | 1 -
 .../src/main/java/org/apache/sis/storage/AbstractResource.java        | 1 -
 .../sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java   | 1 -
 .../src/main/java/org/apache/sis/storage/CanNotProbeException.java    | 1 -
 .../src/main/java/org/apache/sis/storage/ConcurrentReadException.java | 1 -
 .../main/java/org/apache/sis/storage/ConcurrentWriteException.java    | 1 -
 .../src/main/java/org/apache/sis/storage/CoverageQuery.java           | 1 -
 .../src/main/java/org/apache/sis/storage/CoverageSubset.java          | 1 -
 .../src/main/java/org/apache/sis/storage/DataOptionKey.java           | 1 -
 storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java | 1 -
 .../sis-storage/src/main/java/org/apache/sis/storage/DataStore.java   | 1 -
 .../main/java/org/apache/sis/storage/DataStoreClosedException.java    | 1 -
 .../main/java/org/apache/sis/storage/DataStoreContentException.java   | 1 -
 .../src/main/java/org/apache/sis/storage/DataStoreException.java      | 1 -
 .../src/main/java/org/apache/sis/storage/DataStoreProvider.java       | 1 -
 .../java/org/apache/sis/storage/DataStoreReferencingException.java    | 1 -
 .../src/main/java/org/apache/sis/storage/DataStoreRegistry.java       | 1 -
 .../sis-storage/src/main/java/org/apache/sis/storage/DataStores.java  | 1 -
 .../src/main/java/org/apache/sis/storage/FeatureNaming.java           | 1 -
 .../src/main/java/org/apache/sis/storage/FeatureQuery.java            | 1 -
 .../sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java  | 1 -
 .../src/main/java/org/apache/sis/storage/FeatureSubset.java           | 1 -
 .../main/java/org/apache/sis/storage/ForwardOnlyStorageException.java | 1 -
 .../src/main/java/org/apache/sis/storage/GridCoverageResource.java    | 1 -
 .../main/java/org/apache/sis/storage/IllegalFeatureTypeException.java | 1 -
 .../src/main/java/org/apache/sis/storage/IllegalNameException.java    | 1 -
 .../java/org/apache/sis/storage/IllegalOpenParameterException.java    | 1 -
 .../java/org/apache/sis/storage/IncompatibleResourceException.java    | 1 -
 .../main/java/org/apache/sis/storage/InternalDataStoreException.java  | 1 -
 .../src/main/java/org/apache/sis/storage/NoSuchDataException.java     | 1 -
 .../src/main/java/org/apache/sis/storage/ProbeInputStream.java        | 1 -
 .../src/main/java/org/apache/sis/storage/ProbeProviderPair.java       | 1 -
 .../sis-storage/src/main/java/org/apache/sis/storage/ProbeReader.java | 1 -
 .../sis-storage/src/main/java/org/apache/sis/storage/ProbeResult.java | 1 -
 storage/sis-storage/src/main/java/org/apache/sis/storage/Query.java   | 1 -
 .../src/main/java/org/apache/sis/storage/RasterLoadingStrategy.java   | 1 -
 .../main/java/org/apache/sis/storage/ReadOnlyStorageException.java    | 1 -
 .../sis-storage/src/main/java/org/apache/sis/storage/Resource.java    | 1 -
 .../java/org/apache/sis/storage/ResourceAlreadyExistsException.java   | 1 -
 .../src/main/java/org/apache/sis/storage/StorageConnector.java        | 1 -
 .../java/org/apache/sis/storage/UnsupportedEncodingException.java     | 1 -
 .../main/java/org/apache/sis/storage/UnsupportedQueryException.java   | 1 -
 .../main/java/org/apache/sis/storage/UnsupportedStorageException.java | 1 -
 .../src/main/java/org/apache/sis/storage/WritableAggregate.java       | 1 -
 .../src/main/java/org/apache/sis/storage/WritableFeatureSet.java      | 1 -
 .../java/org/apache/sis/storage/WritableGridCoverageResource.java     | 3 ---
 .../java/org/apache/sis/storage/aggregate/AggregatedFeatureSet.java   | 1 -
 .../java/org/apache/sis/storage/aggregate/AggregatedResource.java     | 1 -
 .../java/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java | 1 -
 .../org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java    | 1 -
 .../org/apache/sis/storage/aggregate/ConcatenatedGridResource.java    | 1 -
 .../java/org/apache/sis/storage/aggregate/CoverageAggregator.java     | 1 -
 .../main/java/org/apache/sis/storage/aggregate/DimensionSelector.java | 1 -
 .../src/main/java/org/apache/sis/storage/aggregate/GridSlice.java     | 1 -
 .../main/java/org/apache/sis/storage/aggregate/GridSliceLocator.java  | 1 -
 .../src/main/java/org/apache/sis/storage/aggregate/Group.java         | 1 -
 .../main/java/org/apache/sis/storage/aggregate/GroupAggregate.java    | 1 -
 .../src/main/java/org/apache/sis/storage/aggregate/GroupByCRS.java    | 1 -
 .../src/main/java/org/apache/sis/storage/aggregate/GroupBySample.java | 1 -
 .../main/java/org/apache/sis/storage/aggregate/GroupByTransform.java  | 1 -
 .../main/java/org/apache/sis/storage/aggregate/JoinFeatureSet.java    | 1 -
 .../src/main/java/org/apache/sis/storage/aggregate/MergeStrategy.java | 1 -
 .../src/main/java/org/apache/sis/storage/aggregate/package-info.java  | 1 -
 .../main/java/org/apache/sis/storage/event/CascadedStoreEvent.java    | 1 -
 .../src/main/java/org/apache/sis/storage/event/CloseEvent.java        | 1 -
 .../src/main/java/org/apache/sis/storage/event/StoreEvent.java        | 1 -
 .../src/main/java/org/apache/sis/storage/event/StoreListener.java     | 1 -
 .../src/main/java/org/apache/sis/storage/event/StoreListeners.java    | 1 -
 .../src/main/java/org/apache/sis/storage/event/WarningEvent.java      | 1 -
 .../src/main/java/org/apache/sis/storage/event/package-info.java      | 1 -
 .../src/main/java/org/apache/sis/storage/package-info.java            | 1 -
 .../sis-storage/src/main/java/org/apache/sis/storage/tiling/Tile.java | 1 -
 .../src/main/java/org/apache/sis/storage/tiling/TileMatrix.java       | 1 -
 .../src/main/java/org/apache/sis/storage/tiling/TileMatrixSet.java    | 1 -
 .../src/main/java/org/apache/sis/storage/tiling/TileStatus.java       | 1 -
 .../src/main/java/org/apache/sis/storage/tiling/TiledResource.java    | 1 -
 .../main/java/org/apache/sis/storage/tiling/WritableTileMatrix.java   | 1 -
 .../java/org/apache/sis/storage/tiling/WritableTileMatrixSet.java     | 1 -
 .../java/org/apache/sis/storage/tiling/WritableTiledResource.java     | 1 -
 .../src/main/java/org/apache/sis/storage/tiling/package-info.java     | 1 -
 .../src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java   | 1 -
 .../java/org/apache/sis/internal/storage/MemoryGridResourceTest.java  | 1 -
 .../java/org/apache/sis/internal/storage/MetadataBuilderTest.java     | 1 -
 .../test/java/org/apache/sis/internal/storage/RangeArgumentTest.java  | 1 -
 .../test/java/org/apache/sis/internal/storage/StoreUtilitiesTest.java | 1 -
 .../java/org/apache/sis/internal/storage/csv/StoreProviderTest.java   | 1 -
 .../src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java  | 1 -
 .../java/org/apache/sis/internal/storage/esri/AsciiGridStoreTest.java | 1 -
 .../java/org/apache/sis/internal/storage/esri/BILConsistencyTest.java | 1 -
 .../java/org/apache/sis/internal/storage/esri/BIPConsistencyTest.java | 1 -
 .../java/org/apache/sis/internal/storage/esri/BSQConsistencyTest.java | 1 -
 .../java/org/apache/sis/internal/storage/esri/WritableStoreTest.java  | 1 -
 .../test/java/org/apache/sis/internal/storage/folder/StoreTest.java   | 1 -
 .../org/apache/sis/internal/storage/image/SelfConsistencyTest.java    | 1 -
 .../org/apache/sis/internal/storage/image/WorldFileStoreTest.java     | 1 -
 .../java/org/apache/sis/internal/storage/io/ByteArrayChannel.java     | 1 -
 .../java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java | 1 -
 .../org/apache/sis/internal/storage/io/ChannelDataOutputTest.java     | 1 -
 .../java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java  | 1 -
 .../apache/sis/internal/storage/io/ChannelImageInputStreamTest.java   | 1 -
 .../apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java  | 1 -
 .../java/org/apache/sis/internal/storage/io/ComputedInputStream.java  | 1 -
 .../test/java/org/apache/sis/internal/storage/io/DripByteChannel.java | 1 -
 .../org/apache/sis/internal/storage/io/FileCacheByteChannelTest.java  | 1 -
 .../org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java  | 1 -
 .../test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java | 1 -
 .../apache/sis/internal/storage/io/ImageInputStreamComparator.java    | 1 -
 .../apache/sis/internal/storage/io/MemoryCacheImageOutputStream.java  | 1 -
 .../org/apache/sis/internal/storage/io/RewindableLineReaderTest.java  | 1 -
 .../java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java   | 1 -
 .../src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java  | 1 -
 .../org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java     | 1 -
 .../java/org/apache/sis/internal/storage/xml/StoreProviderTest.java   | 1 -
 .../src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java  | 1 -
 .../src/test/java/org/apache/sis/storage/DataStoreMock.java           | 1 -
 .../src/test/java/org/apache/sis/storage/DataStoreProviderTest.java   | 1 -
 .../src/test/java/org/apache/sis/storage/DataStoresTest.java          | 1 -
 .../src/test/java/org/apache/sis/storage/FeatureNamingTest.java       | 1 -
 .../src/test/java/org/apache/sis/storage/FeatureQueryTest.java        | 1 -
 .../src/test/java/org/apache/sis/storage/ProbeResultTest.java         | 1 -
 .../src/test/java/org/apache/sis/storage/StorageConnectorTest.java    | 1 -
 .../org/apache/sis/storage/aggregate/ConcatenatedFeatureSetTest.java  | 1 -
 .../java/org/apache/sis/storage/aggregate/CoverageAggregatorTest.java | 1 -
 .../java/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java     | 1 -
 .../test/java/org/apache/sis/storage/event/StoreListenersTest.java    | 1 -
 .../java/org/apache/sis/test/storage/CoverageReadConsistency.java     | 1 -
 .../src/test/java/org/apache/sis/test/storage/SubsampledImage.java    | 1 -
 .../src/test/java/org/apache/sis/test/storage/package-info.java       | 1 -
 .../src/test/java/org/apache/sis/test/suite/StorageTestSuite.java     | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Attributes.java | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Bounds.java     | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Copyright.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Email.java      | 1 -
 .../org/apache/sis/internal/storage/gpx/GroupAsPolylineOperation.java | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Link.java       | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Metadata.java   | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Person.java     | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Reader.java     | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Store.java      | 1 -
 .../main/java/org/apache/sis/internal/storage/gpx/StoreProvider.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Tags.java       | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Types.java      | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Updater.java    | 1 -
 .../main/java/org/apache/sis/internal/storage/gpx/WritableStore.java  | 1 -
 .../src/main/java/org/apache/sis/internal/storage/gpx/Writer.java     | 1 -
 .../main/java/org/apache/sis/internal/storage/gpx/package-info.java   | 1 -
 .../org/apache/sis/internal/storage/xml/stream/FormattedWriter.java   | 1 -
 .../java/org/apache/sis/internal/storage/xml/stream/InputType.java    | 1 -
 .../org/apache/sis/internal/storage/xml/stream/NamespaceEraser.java   | 1 -
 .../java/org/apache/sis/internal/storage/xml/stream/OutputType.java   | 1 -
 .../org/apache/sis/internal/storage/xml/stream/RewriteOnUpdate.java   | 1 -
 .../org/apache/sis/internal/storage/xml/stream/StaxDataStore.java     | 1 -
 .../apache/sis/internal/storage/xml/stream/StaxDataStoreProvider.java | 1 -
 .../java/org/apache/sis/internal/storage/xml/stream/StaxStreamIO.java | 1 -
 .../org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java  | 1 -
 .../org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java  | 1 -
 .../java/org/apache/sis/internal/storage/xml/stream/package-info.java | 1 -
 .../sis-xmlstore/src/main/java/org/apache/sis/storage/gps/Fix.java    | 1 -
 .../src/main/java/org/apache/sis/storage/gps/package-info.java        | 1 -
 .../test/java/org/apache/sis/internal/storage/gpx/MetadataTest.java   | 1 -
 .../src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java | 1 -
 .../src/test/java/org/apache/sis/internal/storage/gpx/TypesTest.java  | 1 -
 .../test/java/org/apache/sis/internal/storage/gpx/UpdaterTest.java    | 1 -
 .../src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java | 1 -
 2844 files changed, 2944 deletions(-)

diff --git a/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java b/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java
index d1e4e5c206..bd022690cd 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java
@@ -62,7 +62,6 @@ import org.apache.sis.internal.util.X364;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.3
- * @module
  */
 final class AboutCommand extends CommandRunner {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/CRSCommand.java b/application/sis-console/src/main/java/org/apache/sis/console/CRSCommand.java
index cf53bc09be..1996db3727 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/CRSCommand.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/CRSCommand.java
@@ -28,7 +28,6 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.3
- * @module
  */
 final class CRSCommand extends FormattedOutputCommand {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/Command.java b/application/sis-console/src/main/java/org/apache/sis/console/Command.java
index 8c78513fdf..b4640e41a7 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/Command.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/Command.java
@@ -74,7 +74,6 @@ import org.apache.sis.util.logging.MonolineFormatter;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.3
- * @module
  */
 public final class Command {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/CommandRunner.java b/application/sis-console/src/main/java/org/apache/sis/console/CommandRunner.java
index 11a0fb0314..fb8f2f5cad 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/CommandRunner.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/CommandRunner.java
@@ -42,7 +42,6 @@ import org.apache.sis.internal.util.X364;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.3
- * @module
  */
 abstract class CommandRunner {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/FormattedOutputCommand.java b/application/sis-console/src/main/java/org/apache/sis/console/FormattedOutputCommand.java
index 9070cfdf30..40f889509c 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/FormattedOutputCommand.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/FormattedOutputCommand.java
@@ -57,7 +57,6 @@ import org.apache.sis.xml.XML;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.8
- * @module
  */
 abstract class FormattedOutputCommand extends CommandRunner {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/HelpCommand.java b/application/sis-console/src/main/java/org/apache/sis/console/HelpCommand.java
index 348d0661f4..d769d9163d 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/HelpCommand.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/HelpCommand.java
@@ -29,7 +29,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.3
- * @module
  */
 final class HelpCommand extends CommandRunner {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/IdentifierCommand.java b/application/sis-console/src/main/java/org/apache/sis/console/IdentifierCommand.java
index a02b52de4d..3c306f280e 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/IdentifierCommand.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/IdentifierCommand.java
@@ -43,7 +43,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.3
- * @module
  */
 final class IdentifierCommand extends FormattedOutputCommand {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java b/application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java
index b037b7f0a4..ff536f5dbd 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java
@@ -23,7 +23,6 @@ package org.apache.sis.console;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.3
  * @since   0.3
- * @module
  */
 public class InvalidCommandException extends Exception {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/InvalidOptionException.java b/application/sis-console/src/main/java/org/apache/sis/console/InvalidOptionException.java
index a590b1b8ec..30f4a5a764 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/InvalidOptionException.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/InvalidOptionException.java
@@ -23,7 +23,6 @@ package org.apache.sis.console;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.3
  * @since   0.3
- * @module
  */
 public class InvalidOptionException extends Exception {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/MetadataCommand.java b/application/sis-console/src/main/java/org/apache/sis/console/MetadataCommand.java
index 6c678516fd..6611a480c7 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/MetadataCommand.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/MetadataCommand.java
@@ -32,7 +32,6 @@ import org.apache.sis.util.collection.TreeTable;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 final class MetadataCommand extends FormattedOutputCommand {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java b/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java
index 2f8d9e17ad..3c4f572f41 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java
@@ -44,7 +44,6 @@ import org.apache.sis.util.CharSequences;
  * @see DataStores#probeContentType(Object)
  *
  * @since 0.4
- * @module
  */
 final class MimeTypeCommand extends CommandRunner {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/Option.java b/application/sis-console/src/main/java/org/apache/sis/console/Option.java
index 62801ce603..6e617a54d9 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/Option.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/Option.java
@@ -26,7 +26,6 @@ import org.apache.sis.util.resources.Errors;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
  * @since   0.3
- * @module
  */
 enum Option {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/OutputFormat.java b/application/sis-console/src/main/java/org/apache/sis/console/OutputFormat.java
index 02deb37f24..533889da0d 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/OutputFormat.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/OutputFormat.java
@@ -29,7 +29,6 @@ import org.apache.sis.storage.DataStoreProvider;
  * @see FormattedOutputCommand
  *
  * @since 0.8
- * @module
  */
 enum OutputFormat {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java b/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
index 6d7d067006..13a186b5e7 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
@@ -40,7 +40,6 @@ import org.apache.sis.setup.OptionalInstallations;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.7
- * @module
  */
 @Fallback
 public class ResourcesDownloader extends OptionalInstallations {
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java b/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
index 4ec5e735e6..f8b887e55b 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
@@ -83,7 +83,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.7
- * @module
  */
 final class TransformCommand extends FormattedOutputCommand {
     /**
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/package-info.java b/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
index 3831b544f0..d3e6fc77ac 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
@@ -49,6 +49,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 package org.apache.sis.console;
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
index 0c7ff18da2..1d2120c5ab 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
@@ -32,7 +32,6 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.4
  * @since   0.3
- * @module
  */
 @DependsOn(CommandRunnerTest.class)
 public final strictfp class AboutCommandTest extends TestCase {
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
index 63b572a08c..149a3ce10c 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
@@ -31,7 +31,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   0.8
- * @module
  */
 @DependsOn(CommandRunnerTest.class)
 public final strictfp class CRSCommandTest extends TestCase {
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java b/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
index ddc899ed05..5196744dce 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
@@ -35,7 +35,6 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.3
  * @since   0.3
- * @module
  */
 public final strictfp class CommandRunnerTest extends TestCase {
     /**
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
index 9b207f7dde..6db008d3cb 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
@@ -30,7 +30,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.3
- * @module
  */
 @DependsOn(CommandRunnerTest.class)
 public final strictfp class HelpCommandTest extends TestCase {
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
index 3b61f367ed..f58870c8f9 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
@@ -32,7 +32,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 @DependsOn(CommandRunnerTest.class)
 public final strictfp class MetadataCommandTest extends TestCase {
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
index 294c9768a3..4efc3b36f3 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
@@ -32,7 +32,6 @@ import static org.apache.sis.metadata.iso.extent.DefaultExtentTest.FILENAME;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.4
- * @module
  */
 @DependsOn(CommandRunnerTest.class)
 public final strictfp class MimeTypeCommandTest extends TestUsingFile {
diff --git a/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java b/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
index a6db61197d..611ee640f3 100644
--- a/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
+++ b/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
@@ -27,7 +27,6 @@ import org.junit.BeforeClass;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.3
- * @module
  */
 @Suite.SuiteClasses({
     org.apache.sis.console.CommandRunnerTest.class,
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/AboutDialog.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/AboutDialog.java
index 3fc003a7d7..144367e72b 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/AboutDialog.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/AboutDialog.java
@@ -33,7 +33,6 @@ import org.apache.sis.setup.About;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class AboutDialog {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/DataViewer.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/DataViewer.java
index d6468d774a..f024134961 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/DataViewer.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/DataViewer.java
@@ -67,7 +67,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public class DataViewer extends Application {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/SystemMonitor.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/SystemMonitor.java
index 62e07d0016..c154c55e74 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/SystemMonitor.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/SystemMonitor.java
@@ -39,7 +39,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class SystemMonitor implements EventHandler<WindowEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/Widget.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/Widget.java
index 13bd977667..548bab1de2 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/Widget.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/Widget.java
@@ -40,7 +40,6 @@ import org.apache.sis.util.Localized;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public abstract class Widget implements Localized {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/BandRangeTable.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/BandRangeTable.java
index 13f7ae4fa8..768d753dba 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/BandRangeTable.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/BandRangeTable.java
@@ -41,7 +41,6 @@ import org.apache.sis.internal.gui.Styles;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class BandRangeTable implements Callback<TableColumn<SampleDimension,Number>, TableCell<SampleDimension,Number>> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/BandSelectionListener.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/BandSelectionListener.java
index 6c394a2569..9dcecabd84 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/BandSelectionListener.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/BandSelectionListener.java
@@ -29,7 +29,6 @@ import javafx.scene.control.SelectionModel;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class BandSelectionListener implements ChangeListener<Number> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CellFormat.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CellFormat.java
index 19fff83da7..1a587db3ee 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CellFormat.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CellFormat.java
@@ -43,7 +43,6 @@ import org.apache.sis.internal.gui.RecentChoices;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class CellFormat extends SimpleStringProperty {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageCanvas.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageCanvas.java
index 5ea173549a..a8a23068ea 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageCanvas.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageCanvas.java
@@ -96,7 +96,6 @@ import static java.util.logging.Logger.getLogger;
  * @see CoverageExplorer
  *
  * @since 1.1
- * @module
  */
 @DefaultProperty("coverage")
 public class CoverageCanvas extends MapCanvasAWT {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageControls.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageControls.java
index 650503bd27..b277c36422 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageControls.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageControls.java
@@ -51,7 +51,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class CoverageControls extends ViewAndControls {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java
index d4bcfba71c..c3728662f1 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java
@@ -77,7 +77,6 @@ import org.apache.sis.gui.Widget;
  * @see GridView
  *
  * @since 1.1
- * @module
  */
 @DefaultProperty("coverage")
 public class CoverageExplorer extends Widget {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageStyling.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageStyling.java
index 519a8b1804..44b98a4c87 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageStyling.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageStyling.java
@@ -49,7 +49,6 @@ import org.opengis.util.InternationalString;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class CoverageStyling extends ColorColumnHandler<Category> implements Function<Category,Color[]> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridCell.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridCell.java
index 7955e8ee28..7ea350c216 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridCell.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridCell.java
@@ -27,7 +27,6 @@ import javafx.scene.control.skin.CellSkinBase;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class GridCell extends IndexedCell<String> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridControls.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridControls.java
index 572a0ede53..94c25a7290 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridControls.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridControls.java
@@ -38,7 +38,6 @@ import org.apache.sis.internal.gui.Styles;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class GridControls extends ViewAndControls {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridError.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridError.java
index 9395662065..74855afed8 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridError.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridError.java
@@ -38,7 +38,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class GridError extends VBox {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridRow.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridRow.java
index 78ed0ee85c..19118ac1c6 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridRow.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridRow.java
@@ -42,7 +42,6 @@ import javafx.scene.text.FontWeight;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class GridRow extends IndexedCell<Void> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridRowSkin.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridRowSkin.java
index ae4d22b024..4545ab5485 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridRowSkin.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridRowSkin.java
@@ -34,7 +34,6 @@ import javafx.geometry.Pos;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class GridRowSkin extends CellSkinBase<GridRow> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridSliceSelector.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridSliceSelector.java
index b27d334e36..d176a04712 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridSliceSelector.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridSliceSelector.java
@@ -73,7 +73,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public class GridSliceSelector extends Widget {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTile.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTile.java
index c044282847..bc19dad184 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTile.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTile.java
@@ -29,7 +29,6 @@ import org.apache.sis.internal.gui.BackgroundThreads;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class GridTile {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTileCache.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTileCache.java
index 444c3eae89..81359890e3 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTileCache.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTileCache.java
@@ -28,7 +28,6 @@ import org.apache.sis.internal.coverage.j2d.ImageUtilities;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @SuppressWarnings("serial")
 final class GridTileCache extends LinkedHashMap<GridTile,GridTile> {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridView.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridView.java
index a6c733f681..a08938a9a2 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridView.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridView.java
@@ -64,7 +64,6 @@ import org.apache.sis.internal.gui.ExceptionReporter;
  * @see CoverageExplorer
  *
  * @since 1.1
- * @module
  */
 @DefaultProperty("image")
 public class GridView extends Control {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java
index 1475d73315..0a1e91733f 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java
@@ -57,7 +57,6 @@ import org.apache.sis.internal.gui.Styles;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class GridViewSkin extends VirtualContainerBase<GridView, GridRow> implements EventHandler<MouseEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImagePropertyExplorer.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
index a892225845..0a5b24b8ab 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
@@ -75,7 +75,6 @@ import org.apache.sis.internal.gui.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public class ImagePropertyExplorer extends Widget {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageRequest.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageRequest.java
index 608d9f7c05..edd691605d 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageRequest.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageRequest.java
@@ -37,7 +37,6 @@ import org.apache.sis.util.ArgumentChecks;
  * @see CoverageExplorer#setCoverage(ImageRequest)
  *
  * @since 1.1
- * @module
  */
 public class ImageRequest {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/InterpolationConverter.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/InterpolationConverter.java
index 5fd0f1e955..7d58f759f5 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/InterpolationConverter.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/InterpolationConverter.java
@@ -30,7 +30,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class InterpolationConverter extends StringConverter<Interpolation> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/IsolineRenderer.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/IsolineRenderer.java
index 0ff08d6993..afd18cecd8 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/IsolineRenderer.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/IsolineRenderer.java
@@ -56,7 +56,6 @@ import org.apache.sis.util.ArraysExt;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class IsolineRenderer {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/MultiResolutionImageLoader.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/MultiResolutionImageLoader.java
index e42e6da83e..276e43648b 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/MultiResolutionImageLoader.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/MultiResolutionImageLoader.java
@@ -35,7 +35,6 @@ import org.apache.sis.internal.map.coverage.MultiResolutionCoverageLoader;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.2
- * @module
  */
 final class MultiResolutionImageLoader extends MultiResolutionCoverageLoader {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/PropertyPaneCreator.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/PropertyPaneCreator.java
index 066dd09329..7e3c887771 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/PropertyPaneCreator.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/PropertyPaneCreator.java
@@ -29,7 +29,6 @@ import javafx.scene.control.TitledPane;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class PropertyPaneCreator implements ChangeListener<Boolean> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/Stretching.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/Stretching.java
index deb9a9170f..0b57166c80 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/Stretching.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/Stretching.java
@@ -30,7 +30,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 enum Stretching {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/StyledRenderingData.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/StyledRenderingData.java
index 2e59e89505..5b35576327 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/StyledRenderingData.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/StyledRenderingData.java
@@ -39,7 +39,6 @@ import org.apache.sis.internal.map.coverage.RenderingData;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class StyledRenderingData extends RenderingData {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java
index 37b76ff94c..f854d52572 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java
@@ -51,7 +51,6 @@ import org.apache.sis.gui.map.StatusBar;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 abstract class ViewAndControls {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/package-info.java
index 94bab9bdcb..871ee06932 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/package-info.java
@@ -21,6 +21,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.4
  * @since   1.1
- * @module
  */
 package org.apache.sis.gui.coverage;
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandableList.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandableList.java
index 8b41ab071f..0537ba6636 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandableList.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandableList.java
@@ -46,7 +46,6 @@ import org.opengis.feature.Feature;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class ExpandableList extends TransformationList<Feature,Feature>
         implements Callback<TableColumn<Feature,Feature>, TableCell<Feature,Feature>>,
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java
index 7b2a5c078c..e8c25c59e0 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java
@@ -37,7 +37,6 @@ import org.opengis.feature.Property;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class ExpandedFeature implements Feature {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
index 339dbf04d9..2128c2de2c 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
@@ -52,7 +52,6 @@ import org.apache.sis.util.ArraysExt;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class FeatureList extends ObservableListBase<Feature> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java
index 59d9ff909c..1fa4c895e2 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java
@@ -39,7 +39,6 @@ import org.apache.sis.internal.gui.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class FeatureLoader extends Task<Boolean> implements Consumer<Feature> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureTable.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureTable.java
index 2e6f22a6d0..dba7cec6eb 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureTable.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureTable.java
@@ -82,7 +82,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @DefaultProperty("features")
 public class FeatureTable extends TableView<Feature> {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/LogViewer.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/LogViewer.java
index f2416fd28d..adb2eff30b 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/LogViewer.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/LogViewer.java
@@ -92,7 +92,6 @@ import org.apache.sis.util.CharSequences;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public class LogViewer extends Widget {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/PathAction.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/PathAction.java
index 632d82c96e..d6a49eb7e0 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/PathAction.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/PathAction.java
@@ -44,7 +44,6 @@ import org.apache.sis.storage.Resource;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class PathAction implements EventHandler<ActionEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceCell.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceCell.java
index 0fbd45a098..be4635181b 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceCell.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceCell.java
@@ -52,7 +52,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @see ResourceItem
  *
  * @since 1.3
- * @module
  */
 final class ResourceCell extends TreeCell<Resource> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceExplorer.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceExplorer.java
index edcdf55f8d..8f2c3d9efe 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceExplorer.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceExplorer.java
@@ -66,7 +66,6 @@ import org.apache.sis.internal.gui.LogHandler;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public class ResourceExplorer extends Widget {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceItem.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceItem.java
index 3cf8670154..64262a1f9d 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceItem.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceItem.java
@@ -47,7 +47,6 @@ import org.apache.sis.internal.gui.LogHandler;
  * @see Cell
  *
  * @since 1.3
- * @module
  */
 final class ResourceItem extends TreeItem<Resource> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceTree.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceTree.java
index b47fa88dad..078f9e246e 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceTree.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ResourceTree.java
@@ -74,7 +74,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public class ResourceTree extends TreeView<Resource> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/RootResource.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/RootResource.java
index fa34e50f7a..84adab9214 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/RootResource.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/RootResource.java
@@ -36,7 +36,6 @@ import org.opengis.util.GenericName;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 final class RootResource implements Aggregate {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/TreeViewType.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/TreeViewType.java
index 075ac3cba1..f253c90a9b 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/TreeViewType.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/TreeViewType.java
@@ -25,7 +25,6 @@ import org.apache.sis.internal.storage.folder.UnstructuredAggregate;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 enum TreeViewType {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/WindowHandler.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/WindowHandler.java
index 3ccc4ed658..263e128bcf 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/WindowHandler.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/WindowHandler.java
@@ -56,7 +56,6 @@ import org.apache.sis.util.resources.Errors;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public abstract class WindowHandler {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/WindowManager.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/WindowManager.java
index 002bbcdfe2..b41f20a161 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/WindowManager.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/WindowManager.java
@@ -46,7 +46,6 @@ import org.apache.sis.internal.gui.ToolbarButton;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public final class WindowManager {          // Not designed for subclassing.
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/package-info.java
index fb0e5eff3b..2ebdaecc2c 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/package-info.java
@@ -26,6 +26,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.gui.dataset;
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/GestureFollower.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/GestureFollower.java
index 09adf8b71b..060b3936da 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/GestureFollower.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/GestureFollower.java
@@ -60,7 +60,6 @@ import org.apache.sis.util.logging.Logging;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public class GestureFollower extends CanvasFollower implements EventHandler<MouseEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
index 0ff9fc2f5b..22e8e4296b 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
@@ -132,7 +132,6 @@ import static org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_MILLISEC
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public abstract class MapCanvas extends PlanarCanvas {
     /**
@@ -1055,7 +1054,6 @@ public abstract class MapCanvas extends PlanarCanvas {
      * @author  Martin Desruisseaux (Geomatys)
      * @version 1.1
      * @since   1.1
-     * @module
      */
     protected abstract static class Renderer {
         /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvasAWT.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvasAWT.java
index c92961efa1..a497028403 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvasAWT.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvasAWT.java
@@ -55,7 +55,6 @@ import org.apache.sis.internal.coverage.j2d.ColorModelFactory;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public abstract class MapCanvasAWT extends MapCanvas {
     /**
@@ -212,7 +211,6 @@ public abstract class MapCanvasAWT extends MapCanvas {
      * @author  Martin Desruisseaux (Geomatys)
      * @version 1.1
      * @since   1.1
-     * @module
      */
     protected abstract static class Renderer extends MapCanvas.Renderer {
         /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapMenu.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapMenu.java
index 470f075fd6..32ed79a156 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapMenu.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapMenu.java
@@ -56,7 +56,6 @@ import org.apache.sis.util.ArgumentChecks;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public class MapMenu extends ContextMenu {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/OperationFinder.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/OperationFinder.java
index c3c814f148..7bd4b83007 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/OperationFinder.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/OperationFinder.java
@@ -47,7 +47,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 abstract class OperationFinder extends Task<MathTransform> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java
index 798c860f07..1c653292dd 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java
@@ -126,7 +126,6 @@ import org.apache.sis.referencing.gazetteer.ReferencingByIdentifiers;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.4
  * @since   1.1
- * @module
  */
 public class StatusBar extends Widget implements EventHandler<MouseEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesFormatter.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesFormatter.java
index efb9599825..5f21fe3598 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesFormatter.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesFormatter.java
@@ -62,7 +62,6 @@ import org.opengis.coverage.CannotEvaluateException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class ValuesFormatter extends ValuesUnderCursor.Formatter {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesFromCoverage.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesFromCoverage.java
index 03712fbf8b..7c5a6acd35 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesFromCoverage.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesFromCoverage.java
@@ -50,7 +50,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class ValuesFromCoverage extends ValuesUnderCursor implements ChangeListener<GridCoverage> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java
index 70b923313a..baa24e3ff8 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java
@@ -41,7 +41,6 @@ import org.apache.sis.internal.gui.BackgroundThreads;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public abstract class ValuesUnderCursor {
     /**
@@ -159,7 +158,6 @@ public abstract class ValuesUnderCursor {
      * @author  Martin Desruisseaux (Geomatys)
      * @version 1.3
      * @since   1.3
-     * @module
      */
     protected abstract static class Formatter implements Runnable {
         /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/package-info.java
index 798eba1fc9..43f51967bf 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/package-info.java
@@ -24,6 +24,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.4
  * @since   1.1
- * @module
  */
 package org.apache.sis.gui.map;
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/IdentificationInfo.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/IdentificationInfo.java
index 0049a4bfb8..abfd0f19d3 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/IdentificationInfo.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/IdentificationInfo.java
@@ -84,7 +84,6 @@ import static org.apache.sis.internal.util.CollectionsExt.nonNull;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class IdentificationInfo extends Section<Identification> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java
index c028b78b72..4ca561aed2 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java
@@ -55,7 +55,6 @@ import org.apache.sis.gui.Widget;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 @DefaultProperty("metadata")
 public class MetadataSummary extends Widget {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataTree.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataTree.java
index 3bef141111..a1d9737c66 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataTree.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataTree.java
@@ -85,7 +85,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 @DefaultProperty("content")
 public class MetadataTree extends TreeTableView<TreeTable.Node> {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/RepresentationInfo.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/RepresentationInfo.java
index 7e93f56584..3e5a8f2b34 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/RepresentationInfo.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/RepresentationInfo.java
@@ -36,7 +36,6 @@ import static org.apache.sis.internal.util.CollectionsExt.nonNull;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class RepresentationInfo extends Section<SpatialRepresentation> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/Section.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/Section.java
index 2f350a1647..84951e692b 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/Section.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/Section.java
@@ -50,7 +50,6 @@ import org.apache.sis.internal.gui.Styles;
  * @param <T> the type of information object (e.g. {@link org.opengis.metadata.identification.Identification}).
  *
  * @since 1.1
- * @module
  */
 abstract class Section<T> extends GridPane implements EventHandler<ActionEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/StandardMetadataTree.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/StandardMetadataTree.java
index 068ea65ad3..668db9fd42 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/StandardMetadataTree.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/StandardMetadataTree.java
@@ -66,7 +66,6 @@ import org.apache.sis.xml.XML;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public class StandardMetadataTree extends MetadataTree {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/VerboseFormats.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/VerboseFormats.java
index f3114eb6e8..ac55a564c5 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/VerboseFormats.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/VerboseFormats.java
@@ -32,7 +32,6 @@ import org.apache.sis.internal.gui.PropertyValueFormats;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 @SuppressWarnings({"serial","CloneableImplementsClone"})            // Not intended to be serialized.
 final class VerboseFormats extends PropertyValueFormats {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/package-info.java
index 5ebb4e9179..135ca68667 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/package-info.java
@@ -25,6 +25,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.gui.metadata;
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/package-info.java
index 12b4662640..5a157f275a 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/package-info.java
@@ -31,6 +31,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.gui;
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java
index ad1080b6f1..b876d4b4c8 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java
@@ -61,7 +61,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class AuthorityCodes extends ObservableListBase<Code>
         implements Callback<TableColumn.CellDataFeatures<Code,String>, ObservableValue<String>>
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/CRSChooser.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/CRSChooser.java
index 03a52009b1..0539dd3979 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/CRSChooser.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/CRSChooser.java
@@ -80,7 +80,6 @@ import org.apache.sis.referencing.IdentifiedObjects;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public class CRSChooser extends Dialog<CoordinateReferenceSystem> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/Code.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/Code.java
index ad67412294..736692b61a 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/Code.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/Code.java
@@ -30,7 +30,6 @@ import org.apache.sis.internal.gui.Styles;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class Code {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/CodeFilter.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/CodeFilter.java
index 103c0c7d66..6baccef1f6 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/CodeFilter.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/CodeFilter.java
@@ -31,7 +31,6 @@ import org.apache.sis.util.CharSequences;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class CodeFilter implements Predicate<Code> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/MenuSync.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/MenuSync.java
index 41bb226624..b00247059c 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/MenuSync.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/MenuSync.java
@@ -52,7 +52,6 @@ import org.apache.sis.util.Utilities;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class MenuSync extends SimpleObjectProperty<ReferenceSystem> implements EventHandler<ActionEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/ObjectStringConverter.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/ObjectStringConverter.java
index 3c0be25271..01fe4ca2cc 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/ObjectStringConverter.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/ObjectStringConverter.java
@@ -29,7 +29,6 @@ import org.apache.sis.internal.gui.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class ObjectStringConverter<T extends IdentifiedObject> extends StringConverter<T> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/PositionableProjection.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/PositionableProjection.java
index e56b554afa..e94c3c0cb1 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/PositionableProjection.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/PositionableProjection.java
@@ -50,7 +50,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @SuppressWarnings("serial")         // We do not guarantee serialization compatibility.
 public abstract class PositionableProjection extends CodeList<PositionableProjection> {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/RecentReferenceSystems.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/RecentReferenceSystems.java
index 0225ca9f14..653121768a 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/RecentReferenceSystems.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/RecentReferenceSystems.java
@@ -85,7 +85,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.4
  * @since   1.1
- * @module
  */
 public class RecentReferenceSystems {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/Utils.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/Utils.java
index 69f0ea51b7..cb16221e65 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/Utils.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/Utils.java
@@ -42,7 +42,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class Utils {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/WKTPane.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/WKTPane.java
index f5ddb5b233..87c08fe9a4 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/WKTPane.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/WKTPane.java
@@ -43,7 +43,6 @@ import org.apache.sis.util.Exceptions;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class WKTPane extends StringConverter<Convention> implements ChangeListener<Convention> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/package-info.java
index 3b9b9019ff..b403df321f 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/package-info.java
@@ -22,6 +22,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.4
  * @since   1.1
- * @module
  */
 package org.apache.sis.gui.referencing;
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/BackgroundThreads.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/BackgroundThreads.java
index a685e33ac9..3bfa3e29cb 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/BackgroundThreads.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/BackgroundThreads.java
@@ -51,7 +51,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 @SuppressWarnings("serial")                         // Not intended to be serialized.
 public final class BackgroundThreads extends AtomicInteger implements ThreadFactory {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ColorName.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ColorName.java
index 4647fd7a65..648e3bb7a0 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ColorName.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ColorName.java
@@ -29,7 +29,6 @@ import javafx.scene.paint.Color;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final class ColorName {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataFormats.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataFormats.java
index f1bd1335bc..8a0cedeece 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataFormats.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataFormats.java
@@ -26,7 +26,6 @@ import org.apache.sis.internal.storage.xml.AbstractProvider;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final class DataFormats {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataStoreOpener.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataStoreOpener.java
index 46057448fe..20fed85abd 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataStoreOpener.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/DataStoreOpener.java
@@ -78,7 +78,6 @@ import org.apache.sis.gui.DataViewer;
  * @see BackgroundThreads#execute(Runnable)
  *
  * @since 1.1
- * @module
  */
 public final class DataStoreOpener extends Task<DataStore> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ExceptionReporter.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ExceptionReporter.java
index b64d7b8f37..ee012211e8 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ExceptionReporter.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ExceptionReporter.java
@@ -53,7 +53,6 @@ import org.apache.sis.internal.storage.StoreResource;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final class ExceptionReporter extends Widget {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/FixedHeaderColumnSize.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/FixedHeaderColumnSize.java
index 7e8b9884ef..7e77e2cac4 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/FixedHeaderColumnSize.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/FixedHeaderColumnSize.java
@@ -29,7 +29,6 @@ import javafx.scene.control.TableColumn;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final class FixedHeaderColumnSize<E> implements Callback<TableView.ResizeFeatures<E>, Boolean> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/GUIUtilities.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/GUIUtilities.java
index 08ff28b4bb..33355ee660 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/GUIUtilities.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/GUIUtilities.java
@@ -50,7 +50,6 @@ import org.apache.sis.util.Workaround;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final class GUIUtilities extends Static {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/IdentityValueFactory.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/IdentityValueFactory.java
index 44052ffe78..c1664db95c 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/IdentityValueFactory.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/IdentityValueFactory.java
@@ -33,7 +33,6 @@ import javafx.util.Callback;
  * @param <T>  the type of values in table cells.
  *
  * @since 1.1
- * @module
  */
 public final class IdentityValueFactory<S extends T, T>
         implements Callback<TableColumn.CellDataFeatures<S,T>, ObservableValue<T>>
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImageConverter.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImageConverter.java
index 6a80e6b18c..17f71ad806 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImageConverter.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImageConverter.java
@@ -62,7 +62,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class ImageConverter extends Task<Statistics[]> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImmutableObjectProperty.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImmutableObjectProperty.java
index 28faa57efa..d1c63c9878 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImmutableObjectProperty.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImmutableObjectProperty.java
@@ -30,7 +30,6 @@ import javafx.beans.property.ReadOnlyObjectProperty;
  * @param  <T>  the type of value stored in the property.
  *
  * @since 1.1
- * @module
  */
 public class ImmutableObjectProperty<T> extends ReadOnlyObjectProperty<T> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/LogHandler.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/LogHandler.java
index a1f7e174c2..7a87b9919f 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/LogHandler.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/LogHandler.java
@@ -44,7 +44,6 @@ import org.apache.sis.util.CharSequences;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final class LogHandler extends Handler implements StoreListener<WarningEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/MouseDrags.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/MouseDrags.java
index 6c567fef34..b04d00d471 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/MouseDrags.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/MouseDrags.java
@@ -29,7 +29,6 @@ import javafx.scene.layout.Region;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final class MouseDrags {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/NonNullObjectProperty.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/NonNullObjectProperty.java
index 85175eebb7..974f3d7e37 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/NonNullObjectProperty.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/NonNullObjectProperty.java
@@ -29,7 +29,6 @@ import javafx.beans.property.SimpleObjectProperty;
  * @param <T> the type of the wrapped object.
  *
  * @since 1.1
- * @module
  */
 public final class NonNullObjectProperty<T> extends SimpleObjectProperty<T> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/OptionalDataDownloader.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/OptionalDataDownloader.java
index 99195370a7..af7e31d0a5 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/OptionalDataDownloader.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/OptionalDataDownloader.java
@@ -36,7 +36,6 @@ import org.apache.sis.setup.OptionalInstallations;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 @Fallback
 public final class OptionalDataDownloader extends OptionalInstallations {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PrivateAccess.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PrivateAccess.java
index 5415c8a807..8426d49a87 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PrivateAccess.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PrivateAccess.java
@@ -31,7 +31,6 @@ import org.apache.sis.gui.dataset.WindowHandler;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public final class PrivateAccess {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyValueFormats.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyValueFormats.java
index 0ba33985d6..65aac8d385 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyValueFormats.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyValueFormats.java
@@ -33,7 +33,6 @@ import org.apache.sis.io.CompoundFormat;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.2
- * @module
  */
 @SuppressWarnings({"serial","CloneableImplementsClone"})            // Not intended to be serialized.
 public class PropertyValueFormats extends CompoundFormat<Object> {
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyValueFormatter.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyValueFormatter.java
index f84e7d06e8..be6be4a724 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyValueFormatter.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyValueFormatter.java
@@ -29,7 +29,6 @@ import org.apache.sis.internal.util.PropertyFormat;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public class PropertyValueFormatter extends PropertyFormat {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyView.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyView.java
index d8f8d6e105..412e44268a 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyView.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/PropertyView.java
@@ -53,7 +53,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final class PropertyView implements Localized, ChangeListener<Number> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/RecentChoices.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/RecentChoices.java
index 8bb43a5370..76441c4972 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/RecentChoices.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/RecentChoices.java
@@ -33,7 +33,6 @@ import org.apache.sis.util.collection.FrequencySortedSet;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final class RecentChoices {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java
index ca064fd7f7..8e448e367c 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java
@@ -36,7 +36,6 @@ import org.apache.sis.util.resources.IndexedResourceBundle;
  * @author  Johann Sorel (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final class Resources extends IndexedResourceBundle {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Styles.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Styles.java
index b214c11f90..b320d6275e 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Styles.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Styles.java
@@ -46,7 +46,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final class Styles extends Static {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ToolbarButton.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ToolbarButton.java
index b0730abf3f..6e7a574ed7 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ToolbarButton.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ToolbarButton.java
@@ -38,7 +38,6 @@ import org.apache.sis.util.ArraysExt;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public abstract class ToolbarButton implements EventHandler<ActionEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorCell.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorCell.java
index 4221bbfe02..bccd53bd73 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorCell.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorCell.java
@@ -53,7 +53,6 @@ import org.apache.sis.internal.gui.GUIUtilities;
  * @param  <S>  the type of row data as declared in the {@code TableView} generic type.
  *
  * @since 1.1
- * @module
  */
 final class ColorCell<S> extends TableCell<S,ColorRamp> implements EventHandler<ActionEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorColumnHandler.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorColumnHandler.java
index 70095b0159..c1f58cbd5c 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorColumnHandler.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorColumnHandler.java
@@ -41,7 +41,6 @@ import org.apache.sis.internal.gui.ImmutableObjectProperty;
  * @param  <S>  the type of row data as declared in the {@link TableView} generic type.
  *
  * @since 1.1
- * @module
  */
 public abstract class ColorColumnHandler<S> implements Callback<TableColumn.CellDataFeatures<S,ColorRamp>, ObservableValue<ColorRamp>> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorRamp.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorRamp.java
index 8e1575bbd2..d212cc1055 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorRamp.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ColorRamp.java
@@ -40,7 +40,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @see ColorCell#getItem()
  *
  * @since 1.1
- * @module
  */
 public final class ColorRamp {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/FormatApplicator.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/FormatApplicator.java
index bc21a6044f..7e12c37cd5 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/FormatApplicator.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/FormatApplicator.java
@@ -48,7 +48,6 @@ import org.apache.sis.util.CharSequences;
  * @param  <T>  the type of objects expected and returned by {@link #format}.
  *
  * @since 1.1
- * @module
  */
 final class FormatApplicator<T> extends StringConverter<T>
         implements EventHandler<ActionEvent>, ChangeListener<Boolean>
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/FormatTableCell.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/FormatTableCell.java
index 4a3d63feab..b19febfc7b 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/FormatTableCell.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/FormatTableCell.java
@@ -47,7 +47,6 @@ import org.apache.sis.internal.gui.Styles;
  * @param  <T>  the type of elements contained in {@link javafx.scene.control.TableColumn}.
  *
  * @since 1.1
- * @module
  */
 final class FormatTableCell<S,T> extends TableCell<S,T> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/SyncWindowList.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/SyncWindowList.java
index bb5ddfbf7a..97c57499d9 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/SyncWindowList.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/SyncWindowList.java
@@ -42,7 +42,6 @@ import org.apache.sis.internal.util.UnmodifiableArrayList;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public final class SyncWindowList extends TabularWidget implements ListChangeListener<WindowHandler> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/TabularWidget.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/TabularWidget.java
index 57b6b1a44c..e3990a43c4 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/TabularWidget.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/TabularWidget.java
@@ -32,7 +32,6 @@ import org.apache.sis.gui.Widget;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 abstract class TabularWidget extends Widget {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ValueColorMapper.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ValueColorMapper.java
index 55c74387a0..39fd1e53a4 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ValueColorMapper.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/ValueColorMapper.java
@@ -56,7 +56,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final class ValueColorMapper extends TabularWidget {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/package-info.java
index d77f9da70b..c14d01de17 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control/package-info.java
@@ -26,6 +26,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.internal.gui.control;
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessItem.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessItem.java
index aa5d433ec1..1b11bbe936 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessItem.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessItem.java
@@ -45,7 +45,6 @@ import org.apache.sis.util.collection.RangeSet;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class FileAccessItem implements Runnable, EventHandler<ActionEvent> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessView.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessView.java
index 5c3f2e0b63..4404007173 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessView.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/FileAccessView.java
@@ -47,7 +47,6 @@ import org.apache.sis.storage.event.StoreListeners;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final class FileAccessView extends Widget implements UnaryOperator<ChannelFactory> {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/package-info.java
index 0cf3dc274d..a929e6e171 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/io/package-info.java
@@ -29,6 +29,5 @@
  * @see org.apache.sis.internal.gui.DataStoreOpener
  *
  * @since   1.2
- * @module
  */
 package org.apache.sis.internal.gui.io;
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/package-info.java
index 4434c2ca57..288032722a 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/package-info.java
@@ -27,6 +27,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.internal.gui;
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java
index 4dc28c8429..5073b63eea 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java
@@ -36,7 +36,6 @@ import java.util.zip.ZipFile;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final class FXFinder {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/Inflater.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/Inflater.java
index fde9acb696..042451f766 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/Inflater.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/Inflater.java
@@ -38,7 +38,6 @@ import javax.swing.JProgressBar;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class Inflater implements Runnable {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/Wizard.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/Wizard.java
index 1aa8d4232d..d4c023cc6d 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/Wizard.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/Wizard.java
@@ -76,7 +76,6 @@ import javax.swing.filechooser.FileFilter;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class Wizard extends FileFilter implements ActionListener, PropertyChangeListener, DropTargetListener {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/WizardPage.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/WizardPage.java
index b196fcfdf6..94c5928a96 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/WizardPage.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/WizardPage.java
@@ -24,7 +24,6 @@ package org.apache.sis.internal.setup;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 enum WizardPage {
     /**
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/package-info.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/package-info.java
index 298a097bf7..713c873e9a 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/package-info.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/package-info.java
@@ -24,6 +24,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.internal.setup;
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageCanvasApp.java b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageCanvasApp.java
index ecf9709dd5..abde7a15b1 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageCanvasApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageCanvasApp.java
@@ -42,7 +42,6 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public class CoverageCanvasApp extends Application {
     /**
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java
index 094e77b7bb..fc060db65b 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java
@@ -36,7 +36,6 @@ import org.apache.sis.measure.Units;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final strictfp class CoverageStylingApp extends Application {
     /**
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java
index d667c3e9b0..49b384c4f6 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java
@@ -32,7 +32,6 @@ import org.opengis.metadata.spatial.DimensionNameType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public final strictfp class GridSliceSelectorApp extends Application {
     /**
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridViewApp.java b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridViewApp.java
index d3438e3569..717e97bf1e 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridViewApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridViewApp.java
@@ -34,7 +34,6 @@ import org.apache.sis.internal.gui.BackgroundThreads;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class GridViewApp extends Application {
     /**
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java b/application/sis-javafx/src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java
index 4445ec2497..25f8c53f76 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java
@@ -35,7 +35,6 @@ import org.apache.sis.referencing.CommonCRS;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class CRSChooserApp extends Application {
     /**
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java b/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java
index 81d6487953..874a9370fa 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java
@@ -32,7 +32,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final strictfp class GUIUtilitiesTest extends TestCase {
     /**
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java b/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java
index f72a7caa74..45e6ebc3be 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java
@@ -35,7 +35,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class ValueColorMapperApp extends Application {
     /**
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java b/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java
index c960b54e66..51d3474522 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java
@@ -27,7 +27,6 @@ import org.junit.BeforeClass;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @Suite.SuiteClasses({
     org.apache.sis.internal.gui.GUIUtilitiesTest.class
diff --git a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java
index 55b1e1a7d9..e71b49beef 100644
--- a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java
+++ b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java
@@ -39,7 +39,6 @@ import org.apache.sis.util.collection.Cache;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 final class AnglePattern {
     /**
diff --git a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
index c2419a82fc..99bf410424 100644
--- a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
+++ b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
@@ -30,7 +30,6 @@ import org.apache.sis.util.collection.Cache;
  * @param <T>  the type of cached values.
  *
  * @since 0.8
- * @module
  */
 final class CacheKey<T> {
     /**
diff --git a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java
index c0975c19df..bcb554b4a8 100644
--- a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java
+++ b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java
@@ -38,7 +38,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 public abstract class CalcAddins extends WeakBase implements XServiceName, XServiceInfo, XLocalizable {
     /**
diff --git a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
index a27bf4450d..5488097c8c 100644
--- a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
+++ b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
@@ -53,7 +53,6 @@ import org.apache.sis.storage.DataStoreException;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 public class ReferencingFunctions extends CalcAddins implements XReferencing {
     /**
diff --git a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java
index 626f38347d..2d2d9e7327 100644
--- a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java
+++ b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java
@@ -33,7 +33,6 @@ import com.sun.star.registry.XRegistryKey;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   0.8
- * @module
  */
 public final class Registration {
     /**
diff --git a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Transformer.java b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Transformer.java
index 17c102b2b5..45ef64b296 100644
--- a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Transformer.java
+++ b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Transformer.java
@@ -41,7 +41,6 @@ import org.apache.sis.storage.DataStoreException;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 final class Transformer {
     /**
diff --git a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
index 9a07441a9e..19a5d171d4 100644
--- a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
+++ b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
@@ -34,7 +34,6 @@ import com.sun.star.lang.IllegalArgumentException;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 public interface XReferencing extends XInterface {
     /**
diff --git a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/package-info.java b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/package-info.java
index 373f1ffdf0..f1aed8371d 100644
--- a/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/package-info.java
+++ b/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/package-info.java
@@ -27,6 +27,5 @@
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 package org.apache.sis.openoffice;
diff --git a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
index 736161e96f..eb52db29e0 100644
--- a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
+++ b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
@@ -35,7 +35,6 @@ import static org.junit.Assume.assumeFalse;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.3
  * @since   0.8
- * @module
  */
 @DependsOn(TransformerTest.class)
 public final strictfp class ReferencingFunctionsTest extends TestCase {
diff --git a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java
index fdf383b136..8a7f35644d 100644
--- a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java
+++ b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java
@@ -36,7 +36,6 @@ import static org.junit.Assume.assumeTrue;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 public final strictfp class TransformerTest extends TestCase {
     /**
diff --git a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java b/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
index c0479311d9..4bb693b2d6 100644
--- a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
+++ b/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
@@ -27,7 +27,6 @@ import org.junit.BeforeClass;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 @Suite.SuiteClasses({
     org.apache.sis.openoffice.TransformerTest.class,
diff --git a/application/sis-webapp/src/main/java/org/apache/sis/services/OSGiActivator.java b/application/sis-webapp/src/main/java/org/apache/sis/services/OSGiActivator.java
index 2a3d4b725a..7931888c53 100644
--- a/application/sis-webapp/src/main/java/org/apache/sis/services/OSGiActivator.java
+++ b/application/sis-webapp/src/main/java/org/apache/sis/services/OSGiActivator.java
@@ -32,7 +32,6 @@ import org.apache.sis.internal.system.SystemListener;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
  * @since 0.3
- * @module
  */
 public final class OSGiActivator implements BundleActivator, BundleListener {
     /**
diff --git a/application/sis-webapp/src/main/java/org/apache/sis/services/ServletListener.java b/application/sis-webapp/src/main/java/org/apache/sis/services/ServletListener.java
index 9fb0f93c88..461a35b0ff 100644
--- a/application/sis-webapp/src/main/java/org/apache/sis/services/ServletListener.java
+++ b/application/sis-webapp/src/main/java/org/apache/sis/services/ServletListener.java
@@ -29,7 +29,6 @@ import org.apache.sis.internal.system.Shutdown;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
  * @since   0.3
- * @module
  */
 @WebListener("Apache SIS shutdown hook")
 public final class ServletListener implements ServletContextListener {
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources.java
index f567e52c63..5880d564c4 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources.java
@@ -31,7 +31,6 @@ import org.apache.sis.util.resources.IndexedResourceBundle;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final class Resources extends IndexedResourceBundle {
     /**
@@ -42,7 +41,6 @@ public final class Resources extends IndexedResourceBundle {
      *
      * @author  Martin Desruisseaux (IRD, Geomatys)
      * @since   1.2
-     * @module
      */
     public static final class Keys extends KeyConstants {
         /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/package-info.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/package-info.java
index a6beb585ea..a984fcbc22 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/package-info.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/package-info.java
@@ -27,6 +27,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 package org.apache.sis.cloud.aws.internal;
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java
index 9858f2ae21..06f468fa1b 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java
@@ -30,7 +30,6 @@ import software.amazon.awssdk.services.s3.model.Bucket;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class BucketStore extends FileStore {
     /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java
index b364cb92f1..5d4b80845a 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java
@@ -33,7 +33,6 @@ import software.amazon.awssdk.http.Abortable;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.4
  * @since   1.2
- * @module
  */
 final class CachedByteChannel extends FileCacheByteChannel {
     /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
index 4de328d2ef..c72ca8b561 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
@@ -47,7 +47,6 @@ import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class ClientFileSystem extends FileSystem {
     /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java
index fe36bfd395..bc201b5b3e 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java
@@ -36,7 +36,6 @@ import java.util.function.Consumer;
  * @param  <E>  type of elements in this list.
  *
  * @since 1.2
- * @module
  */
 final class DerivedList<S,E> extends AbstractList<E> {
     /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java
index 062edbe5a0..d46506fe75 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java
@@ -78,7 +78,6 @@ import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.4
  * @since   1.2
- * @module
  */
 public class FileService extends FileSystemProvider {
     /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java
index 117c33a966..91b187dfd1 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java
@@ -50,7 +50,6 @@ import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.4
  * @since   1.2
- * @module
  */
 final class KeyPath implements Path {
     /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java
index 46a2ec3128..441caf2da9 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java
@@ -29,7 +29,6 @@ import org.apache.sis.util.resources.Errors;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class KeyPathMatcher implements PathMatcher {
     /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java
index 5e7513c6fb..e942e05557 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java
@@ -38,7 +38,6 @@ import software.amazon.awssdk.core.exception.SdkException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class ObjectAttributes implements BasicFileAttributeView {
     /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java
index 4298d55ccf..e1d35edb94 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java
@@ -36,7 +36,6 @@ import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class PathIterator implements DirectoryStream<Path>, Iterator<Path> {
     /**
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/package-info.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/package-info.java
index 92e86f5e6f..737924a26e 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/package-info.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/package-info.java
@@ -54,6 +54,5 @@
  * @see <a href="https://sdk.amazonaws.com/java/api/latest/index.html">AWS SDK for Java</a>
  *
  * @since 1.2
- * @module
  */
 package org.apache.sis.cloud.aws.s3;
diff --git a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
index ff766b647c..bf329bcfe1 100644
--- a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
+++ b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final strictfp class ClientFileSystemTest extends TestCase {
     /**
diff --git a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
index 64dd7acae5..885e2d4ee7 100644
--- a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
+++ b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final strictfp class KeyPathMatcherTest extends TestCase {
     /**
diff --git a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java
index b78b2565d6..f9c82f45f9 100644
--- a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java
+++ b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java
@@ -32,7 +32,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final strictfp class KeyPathTest extends TestCase {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Characters.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Characters.java
index c1d4d441ea..4ed6a15677 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Characters.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Characters.java
@@ -23,7 +23,6 @@ package org.apache.sis.internal.book;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public final class Characters {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
index 2026323d0a..0ed3e380e1 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
@@ -38,7 +38,6 @@ import org.w3c.dom.NodeList;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   0.7
- * @module
  */
 public final class CodeColorizer {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
index dcfe235781..08dbea6280 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
@@ -46,7 +46,6 @@ import jdk.javadoc.doclet.StandardDoclet;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   0.5
- * @module
  */
 public final class Doclet extends StandardDoclet {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Include.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Include.java
index 5c8c2f7f5a..8d635b4535 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Include.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Include.java
@@ -38,7 +38,6 @@ import com.sun.source.doctree.DocTree;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.5
- * @module
  */
 public final class Include extends Taglet {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
index 0959d7a19a..65889114d7 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
@@ -28,7 +28,6 @@ import com.sun.source.doctree.DocTree;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class Module extends Taglet {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
index 0ca8c07a00..581da6e8d5 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
@@ -34,7 +34,6 @@ import org.apache.sis.internal.book.CodeColorizer;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class Preformat extends Taglet {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
index e3d3160abe..472c68865a 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
@@ -46,7 +46,6 @@ import org.apache.sis.internal.book.Characters;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.7
- * @module
  */
 final class Rewriter {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Taglet.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Taglet.java
index 80c30dcccb..707ab08927 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Taglet.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Taglet.java
@@ -41,7 +41,6 @@ import jdk.javadoc.doclet.StandardDoclet;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   0.3
- * @module
  */
 abstract class Taglet implements jdk.javadoc.doclet.Taglet {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
index ab3680cda2..5817ad614a 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
@@ -23,6 +23,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   0.5
- * @module
  */
 package org.apache.sis.internal.doclet;
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
index 540b7c5cba..1478df82a0 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
@@ -66,7 +66,6 @@ import static org.apache.sis.internal.maven.Filenames.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.4
- * @module
  */
 @Mojo(name = "dist", defaultPhase = LifecyclePhase.INSTALL, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
 public final class Assembler extends AbstractMojo implements FilenameFilter {
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java
index 317f0d10e5..828dfcecf5 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java
@@ -30,7 +30,6 @@ import org.apache.maven.plugin.MojoExecutionException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.4
- * @module
  */
 final class Filenames {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
index e964c7bb34..367f86a204 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
@@ -49,7 +49,6 @@ import static org.apache.sis.internal.maven.Filenames.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 @Mojo(name = "collect-jars",
       defaultPhase = LifecyclePhase.PACKAGE,
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/package-info.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/package-info.java
index 22295e6b33..964f4cf62f 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/package-info.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/package-info.java
@@ -29,6 +29,5 @@
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 package org.apache.sis.internal.maven;
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java
index df72dea92d..ecb6c7a89e 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java
@@ -46,7 +46,6 @@ import org.apache.maven.plugins.annotations.Parameter;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   0.8
- * @module
  */
 @Mojo(name = "javamaker", defaultPhase = LifecyclePhase.PROCESS_CLASSES)
 public final class JavaMaker extends AbstractMojo {
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
index 69b6b504f6..7ff07b06af 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
@@ -39,7 +39,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   0.8
- * @module
  */
 @Mojo(name = "unopkg", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
 public final class UnoPkg extends AbstractMojo implements FilenameFilter {
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java
index 7b05df051d..ae5e6e1317 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java
@@ -83,6 +83,5 @@
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   0.8
- * @module
  */
 package org.apache.sis.internal.unopkg;
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java b/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
index d2084f9c90..879d261cce 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
@@ -34,7 +34,6 @@ import java.util.regex.Pattern;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 0.8
  * @since   0.3
- * @module
  */
 class IndexedResourceCompiler implements FilenameFilter, Comparator<Object> {
     /**
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java b/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
index 504db21b3d..68c99b1045 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
@@ -25,7 +25,6 @@ import org.apache.maven.plugin.MojoExecutionException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.3
  * @since   0.3
- * @module
  */
 @SuppressWarnings("serial")
 final class ResourceCompilerException extends MojoExecutionException {
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java b/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
index 33f6476109..826374573d 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
@@ -44,7 +44,6 @@ import static org.apache.sis.util.resources.IndexedResourceCompiler.PROPERTIES_E
  * @author  Olivier Nouguier (Geomatys)
  * @version 0.7
  * @since   0.3
- * @module
  */
 @Mojo(name = "compile-resources", defaultPhase = LifecyclePhase.GENERATE_RESOURCES)
 public class ResourceCompilerMojo extends AbstractMojo implements FilenameFilter {
diff --git a/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java b/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
index 1e355d396b..ebb6e83c7c 100644
--- a/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
+++ b/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 public strictfp class ResourceCompilerMojoTest {
     /**
diff --git a/core/sis-cql/src/main/java/org/apache/sis/cql/CQL.java b/core/sis-cql/src/main/java/org/apache/sis/cql/CQL.java
index 1720257c61..8d70de64cd 100644
--- a/core/sis-cql/src/main/java/org/apache/sis/cql/CQL.java
+++ b/core/sis-cql/src/main/java/org/apache/sis/cql/CQL.java
@@ -71,7 +71,6 @@ import org.opengis.filter.SortProperty;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final class CQL {
 
diff --git a/core/sis-cql/src/main/java/org/apache/sis/cql/CQLException.java b/core/sis-cql/src/main/java/org/apache/sis/cql/CQLException.java
index 7995dc36e8..899c76b73e 100644
--- a/core/sis-cql/src/main/java/org/apache/sis/cql/CQLException.java
+++ b/core/sis-cql/src/main/java/org/apache/sis/cql/CQLException.java
@@ -23,7 +23,6 @@ package org.apache.sis.cql;
  * @author  Johann Sorel (Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public final class CQLException extends Exception {
     /**
diff --git a/core/sis-cql/src/main/java/org/apache/sis/cql/FilterToCQLVisitor.java b/core/sis-cql/src/main/java/org/apache/sis/cql/FilterToCQLVisitor.java
index 73addd00ae..b9eeaf7ed8 100644
--- a/core/sis-cql/src/main/java/org/apache/sis/cql/FilterToCQLVisitor.java
+++ b/core/sis-cql/src/main/java/org/apache/sis/cql/FilterToCQLVisitor.java
@@ -61,7 +61,6 @@ import org.locationtech.jts.io.WKTWriter;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class FilterToCQLVisitor extends Visitor<Feature,StringBuilder> {
 
diff --git a/core/sis-cql/src/main/java/org/apache/sis/internal/cql/AntlrCQL.java b/core/sis-cql/src/main/java/org/apache/sis/internal/cql/AntlrCQL.java
index 354915a27b..afe6fd4b17 100644
--- a/core/sis-cql/src/main/java/org/apache/sis/internal/cql/AntlrCQL.java
+++ b/core/sis-cql/src/main/java/org/apache/sis/internal/cql/AntlrCQL.java
@@ -30,7 +30,6 @@ import org.antlr.v4.runtime.tree.ParseTree;
  * @author  Johann Sorel (Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public final class AntlrCQL {
 
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
index d649f99329..2785e7431a 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
@@ -29,7 +29,6 @@ import org.opengis.feature.Feature;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 abstract strictfp class CQLTestCase extends TestCase {
     /**
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java
index 72d974dad0..82b77dfbf7 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java
@@ -27,7 +27,6 @@ import org.junit.runners.Suite;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @Suite.SuiteClasses({
     org.apache.sis.cql.ExpressionReadingTest.class,
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionReadingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionReadingTest.java
index 51012f513b..4db11edf9d 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionReadingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionReadingTest.java
@@ -49,7 +49,6 @@ import static org.junit.Assert.*;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class ExpressionReadingTest extends CQLTestCase {
     @Test
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionWritingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionWritingTest.java
index 27cbc96700..63c74c89b6 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionWritingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionWritingTest.java
@@ -37,7 +37,6 @@ import static org.junit.Assert.*;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class ExpressionWritingTest extends CQLTestCase {
     @Test
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java
index 29d7fd80ea..e4b6f82cc5 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java
@@ -58,7 +58,6 @@ import org.opengis.filter.*;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class FilterReadingTest extends CQLTestCase {
 
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java
index 3731dc32eb..b7437d69cd 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java
@@ -41,7 +41,6 @@ import org.locationtech.jts.geom.LinearRing;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class FilterWritingTest extends CQLTestCase {
 
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/BandedCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/BandedCoverage.java
index 0694dd35ac..720750fbe7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/BandedCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/BandedCoverage.java
@@ -51,7 +51,6 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public abstract class BandedCoverage {
     /**
@@ -136,7 +135,6 @@ public abstract class BandedCoverage {
      * @see BandedCoverage#evaluator()
      *
      * @since 1.1
-     * @module
      */
     public interface Evaluator extends Function<DirectPosition, double[]> {
         /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/Category.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/Category.java
index 3572b37f46..064932a449 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/Category.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/Category.java
@@ -71,7 +71,6 @@ import static java.lang.Double.doubleToRawLongBits;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public class Category implements Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/CategoryList.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/CategoryList.java
index 3a19370ebd..f200a7d5ad 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/CategoryList.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/CategoryList.java
@@ -71,7 +71,6 @@ import static java.lang.Double.doubleToRawLongBits;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.2
  * @since   1.0
- * @module
  */
 final class CategoryList extends AbstractList<Category> implements MathTransform1D, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedCategory.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedCategory.java
index a80d55eb09..e52727e519 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedCategory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedCategory.java
@@ -30,7 +30,6 @@ import org.opengis.referencing.operation.TransformException;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 final class ConvertedCategory extends Category {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedRange.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedRange.java
index 292f9383ba..00ed01d2fd 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedRange.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/ConvertedRange.java
@@ -34,7 +34,6 @@ import org.apache.sis.measure.MeasurementRange;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 final class ConvertedRange extends MeasurementRange<Double> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/IllegalSampleDimensionException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/IllegalSampleDimensionException.java
index 3bc3ddf3da..68ea5be941 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/IllegalSampleDimensionException.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/IllegalSampleDimensionException.java
@@ -26,7 +26,6 @@ package org.apache.sis.coverage;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public class IllegalSampleDimensionException extends IllegalArgumentException {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/MismatchedCoverageRangeException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/MismatchedCoverageRangeException.java
index 18d182eaee..92d18e3b99 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/MismatchedCoverageRangeException.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/MismatchedCoverageRangeException.java
@@ -27,7 +27,6 @@ package org.apache.sis.coverage;
  * @see org.opengis.geometry.MismatchedDimensionException
  *
  * @since 1.0
- * @module
  */
 public class MismatchedCoverageRangeException extends IllegalArgumentException {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/RegionOfInterest.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/RegionOfInterest.java
index 558cf7f309..a5cfd024dc 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/RegionOfInterest.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/RegionOfInterest.java
@@ -51,7 +51,6 @@ import org.apache.sis.util.Utilities;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public class RegionOfInterest implements LenientComparable, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleDimension.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleDimension.java
index 755e289e6d..f2cb9f40db 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleDimension.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleDimension.java
@@ -82,7 +82,6 @@ import org.apache.sis.util.Debug;
  * @see org.opengis.metadata.content.SampleDimension
  *
  * @since 1.0
- * @module
  */
 public class SampleDimension implements Serializable {
     /**
@@ -546,7 +545,6 @@ public class SampleDimension implements Serializable {
      * @author  Alexis Manin (Geomatys)
      * @version 1.2
      * @since   1.0
-     * @module
      */
     public static class Builder {
         /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
index d60e8dcbb8..b41e4ef1e6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
@@ -37,7 +37,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 @SuppressWarnings({"CloneableImplementsClone", "serial"})           // Not intended to be cloned or serialized.
 final class SampleRangeFormat extends RangeFormat {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java
index df8037e84b..ccab503ac7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/SubspaceNotSpecifiedException.java
@@ -32,7 +32,6 @@ import org.opengis.coverage.CannotEvaluateException;
  * @see <a href="https://en.wikipedia.org/wiki/Linear_subspace">Linear subspace on Wikipedia</a>
  *
  * @since 1.0
- * @module
  */
 public class SubspaceNotSpecifiedException extends CannotEvaluateException {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/ToNaN.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/ToNaN.java
index 42f7486584..14c4d5eaba 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/ToNaN.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/ToNaN.java
@@ -31,7 +31,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 @SuppressWarnings({"CloneableImplementsClone", "serial"})           // Not intended to be cloned or serialized.
 final class ToNaN extends HashSet<Integer> implements DoubleToIntFunction {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java
index a158517cf1..a1f8fead29 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java
@@ -79,7 +79,6 @@ import org.opengis.coverage.PointOutsideCoverageException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public class BufferedGridCoverage extends GridCoverage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ConvertedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ConvertedGridCoverage.java
index a7b771af9a..5a52098d67 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ConvertedGridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ConvertedGridCoverage.java
@@ -52,7 +52,6 @@ import org.opengis.coverage.CannotEvaluateException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.0
- * @module
  */
 final class ConvertedGridCoverage extends DerivedGridCoverage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/CoordinateOperationFinder.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
index e26c2c6a91..d805f6d09c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
@@ -79,7 +79,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class CoordinateOperationFinder implements Supplier<double[]> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DefaultEvaluator.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DefaultEvaluator.java
index 47ecfee4dc..c7bd133c7b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DefaultEvaluator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DefaultEvaluator.java
@@ -72,7 +72,6 @@ import org.opengis.coverage.PointOutsideCoverageException;
  * @see GridCoverage#evaluator()
  *
  * @since 1.1
- * @module
  */
 class DefaultEvaluator implements GridCoverage.Evaluator {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DerivedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DerivedGridCoverage.java
index e91dffc900..ca8e0b5d18 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DerivedGridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DerivedGridCoverage.java
@@ -37,7 +37,6 @@ import org.apache.sis.util.Debug;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 abstract class DerivedGridCoverage extends GridCoverage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DimensionReducer.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DimensionReducer.java
index 93679f453d..b494c6e510 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DimensionReducer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DimensionReducer.java
@@ -36,7 +36,6 @@ import org.apache.sis.referencing.CRS;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class DimensionReducer {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DisjointExtentException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DisjointExtentException.java
index 6e51ff33fd..41959dea3e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DisjointExtentException.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DisjointExtentException.java
@@ -27,7 +27,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.0
- * @module
  */
 public class DisjointExtentException extends IllegalGridGeometryException {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DomainLinearizer.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DomainLinearizer.java
index de2d224f86..c60e25efd8 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DomainLinearizer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DomainLinearizer.java
@@ -49,7 +49,6 @@ import org.apache.sis.util.ArgumentChecks;
  * @see LinearTransformBuilder#approximate(MathTransform, Envelope)
  *
  * @since 1.1
- * @module
  */
 public class DomainLinearizer {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/EvaluatorWrapper.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/EvaluatorWrapper.java
index fa32bbd778..b5d08e15b7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/EvaluatorWrapper.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/EvaluatorWrapper.java
@@ -31,7 +31,6 @@ import org.opengis.coverage.CannotEvaluateException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 abstract class EvaluatorWrapper implements GridCoverage.Evaluator {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/FractionalGridCoordinates.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
index 0fb8dfad26..08f759cc70 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
@@ -53,7 +53,6 @@ import org.apache.sis.util.resources.Errors;
  * @see GridCoverage.Evaluator#toGridCoordinates(DirectPosition)
  *
  * @since 1.1
- * @module
  */
 public class FractionalGridCoordinates implements GridCoordinates, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridClippingMode.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridClippingMode.java
index e9a7232051..5776654ca6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridClippingMode.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridClippingMode.java
@@ -25,7 +25,6 @@ package org.apache.sis.coverage.grid;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public enum GridClippingMode {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
index 92d67f4201..307800bd33 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
@@ -29,7 +29,6 @@ import org.apache.sis.util.ArgumentChecks;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 final class GridCoordinatesView implements GridCoordinates {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
index 8b704c0b03..1e91a2ea04 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
@@ -60,7 +60,6 @@ import org.opengis.coverage.CannotEvaluateException;
  * @author  Johann Sorel (Geomatys)
  * @version 1.3
  * @since   1.0
- * @module
  */
 public abstract class GridCoverage extends BandedCoverage {
     /**
@@ -350,7 +349,6 @@ public abstract class GridCoverage extends BandedCoverage {
      * @see GridCoverage#evaluator()
      *
      * @since 1.3
-     * @module
      */
     public interface Evaluator extends BandedCoverage.Evaluator {
         /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java
index 6595feced6..d48f05c83e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java
@@ -95,7 +95,6 @@ import org.opengis.coverage.PointOutsideCoverageException;
  * @author  Alexis Manin (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public class GridCoverage2D extends GridCoverage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
index 32f8872d19..b45968bde7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
@@ -93,7 +93,6 @@ import org.apache.sis.util.resources.Errors;
  * @see SampleDimension.Builder
  *
  * @since 1.1
- * @module
  */
 public class GridCoverageBuilder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageProcessor.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageProcessor.java
index 9e207ab329..7a0f1b2c9d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageProcessor.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageProcessor.java
@@ -59,7 +59,6 @@ import static java.util.logging.Logger.getLogger;
  * @see org.apache.sis.image.ImageProcessor
  *
  * @since 1.1
- * @module
  */
 public class GridCoverageProcessor implements Cloneable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
index 0d7b0c9141..006247c392 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
@@ -85,7 +85,6 @@ import org.opengis.coverage.PointOutsideCoverageException;
  * @see GridGeometry#selectDimensions(int[])
  *
  * @since 1.0
- * @module
  */
 public class GridDerivation {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
index 3e998d220f..4c9ae4ef72 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
@@ -94,7 +94,6 @@ import org.opengis.coverage.PointOutsideCoverageException;
  * @author  Johann Sorel (Geomatys)
  * @version 1.4
  * @since   1.0
- * @module
  */
 public class GridExtent implements GridEnvelope, LenientComparable, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtentCRS.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtentCRS.java
index 0163934957..3b17c8d35c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtentCRS.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtentCRS.java
@@ -76,7 +76,6 @@ import org.apache.sis.measure.Units;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.3
  * @since   1.0
- * @module
  */
 final class GridExtentCRS {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
index 8a3bee66b2..bfc22b4402 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
@@ -136,7 +136,6 @@ import static org.apache.sis.referencing.CRS.findOperation;
  * @author  Johann Sorel (Geomatys)
  * @version 1.4
  * @since   1.0
- * @module
  */
 public class GridGeometry implements LenientComparable, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridOrientation.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridOrientation.java
index 22d6f8542a..47b413c395 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridOrientation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridOrientation.java
@@ -39,7 +39,6 @@ import org.apache.sis.util.resources.Errors;
  * @see GridGeometry#GridGeometry(GridExtent, Envelope, GridOrientation)
  *
  * @since 1.1
- * @module
  */
 public final class GridOrientation implements Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java
index 805a89f78c..4816855682 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridRoundingMode.java
@@ -26,7 +26,6 @@ package org.apache.sis.coverage.grid;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public enum GridRoundingMode {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IllegalGridGeometryException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IllegalGridGeometryException.java
index c4a3ab4050..e347de9576 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IllegalGridGeometryException.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IllegalGridGeometryException.java
@@ -29,7 +29,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public class IllegalGridGeometryException extends IllegalArgumentException {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
index 949b3e4d80..38165a6943 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
@@ -103,7 +103,6 @@ import static org.apache.sis.image.PlanarImage.GRID_GEOMETRY_KEY;
  * @see GridCoverage#render(GridExtent)
  *
  * @since 1.0
- * @module
  */
 public class ImageRenderer {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
index 061f51dc4d..d99bd7d7b4 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/IncompleteGridGeometryException.java
@@ -37,7 +37,6 @@ package org.apache.sis.coverage.grid;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public class IncompleteGridGeometryException extends IllegalStateException {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
index 35b3865d40..37738d40be 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/PixelTranslation.java
@@ -72,7 +72,6 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
  * @see PixelOrientation
  *
  * @since 1.0
- * @module
  */
 public final class PixelTranslation extends Static implements Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ResampledGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ResampledGridCoverage.java
index 4e9b20e3eb..7243cb88c5 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ResampledGridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ResampledGridCoverage.java
@@ -53,7 +53,6 @@ import org.apache.sis.util.Utilities;
  * @author  Johann Sorel (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class ResampledGridCoverage extends DerivedGridCoverage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ReshapedImage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ReshapedImage.java
index 7a5f02ea12..8cd8284c4b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ReshapedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ReshapedImage.java
@@ -45,7 +45,6 @@ import static java.lang.Math.toIntExact;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class ReshapedImage extends PlanarImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/SliceGeometry.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/SliceGeometry.java
index 25903d8e13..661689ad2a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/SliceGeometry.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/SliceGeometry.java
@@ -50,7 +50,6 @@ import org.apache.sis.util.resources.Errors;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class SliceGeometry implements Function<RenderedImage, GridGeometry> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/TranslatedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
index 577c887ddc..2a78c14c3b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
@@ -29,7 +29,6 @@ import org.opengis.coverage.CannotEvaluateException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 final class TranslatedGridCoverage extends DerivedGridCoverage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java
index e746986cdf..cd3dd5c96c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/package-info.java
@@ -43,6 +43,5 @@
  * @author  Alexis Manin (Geomatys)
  * @version 1.4
  * @since   1.0
- * @module
  */
 package org.apache.sis.coverage.grid;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/package-info.java
index 3f34ae4f41..433124dd5f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/package-info.java
@@ -25,6 +25,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.0
- * @module
  */
 package org.apache.sis.coverage;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java
index 136c58ec32..4d8e4d3892 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java
@@ -53,7 +53,6 @@ import org.opengis.feature.MultiValuedPropertyException;
  * @see DefaultAssociationRole
  *
  * @since 0.5
- * @module
  */
 public abstract class AbstractAssociation extends Field<Feature> implements FeatureAssociation, Cloneable, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
index d21d18d4ed..a7e169cb12 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
@@ -76,7 +76,6 @@ import org.opengis.feature.MultiValuedPropertyException;
  * @see DefaultAttributeType
  *
  * @since 0.5
- * @module
  */
 public abstract class AbstractAttribute<V> extends Field<V> implements Attribute<V>, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
index a6248e4dd6..932de85abe 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
@@ -84,7 +84,6 @@ import org.opengis.feature.Operation;
  * @see DefaultFeatureType#newInstance()
  *
  * @since 0.5
- * @module
  */
 public abstract class AbstractFeature implements Feature, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java
index d3c20b4925..9267611d2d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java
@@ -40,7 +40,6 @@ import org.opengis.feature.IdentifiedType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.5
- * @module
  */
 public class AbstractIdentifiedType implements IdentifiedType, Deprecable, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
index d2891f8d1c..e698b82d5a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
@@ -66,7 +66,6 @@ import org.opengis.feature.Property;
  * @see DefaultFeatureType
  *
  * @since 0.6
- * @module
  */
 public abstract class AbstractOperation extends AbstractIdentifiedType implements Operation,
         BiFunction<Feature, ParameterValueGroup, Property>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java
index 529bed126e..71373715ae 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java
@@ -37,7 +37,6 @@ import org.opengis.feature.FeatureAssociationRole;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 class AssociationView extends PropertyView<Feature> implements FeatureAssociation {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java
index be0758cde5..b31a7b24f8 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java
@@ -43,7 +43,6 @@ import org.opengis.feature.AttributeType;
  *            then this is the type of elements (not the collection type).
  *
  * @since 0.8
- * @module
  */
 class AttributeView<V> extends PropertyView<V> implements Attribute<V> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java b/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
index 21539d57ed..ecca81273a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
@@ -38,7 +38,6 @@ import org.opengis.feature.PropertyNotFoundException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.6
  * @since   0.5
- * @module
  */
 final class CharacteristicMap extends AbstractMap<String,Attribute<?>> implements Cloneable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java b/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
index bbcafabc97..8c0fc0e03f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
@@ -48,7 +48,6 @@ import org.opengis.feature.AttributeType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.5
- * @module
  */
 final class CharacteristicTypeMap extends AbstractMap<String,AttributeType<?>> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/CommonParentFinder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/CommonParentFinder.java
index 18c30b012d..b1f98e780d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/CommonParentFinder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/CommonParentFinder.java
@@ -32,7 +32,6 @@ import org.opengis.feature.FeatureType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 final class CommonParentFinder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
index 4dea55b7af..cf1d6aac7a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
@@ -62,7 +62,6 @@ import org.opengis.feature.PropertyNotFoundException;
  * @see AbstractAssociation
  *
  * @since 0.5
- * @module
  */
 public class DefaultAssociationRole extends FieldType implements FeatureAssociationRole {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
index f7df7ea21a..e9623d6cd8 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
@@ -104,7 +104,6 @@ import org.opengis.feature.AttributeType;
  * @see AbstractAttribute
  *
  * @since 0.5
- * @module
  */
 public class DefaultAttributeType<V> extends FieldType implements AttributeType<V> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
index 193da7f434..8d21a8cbb0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
@@ -106,7 +106,6 @@ import org.opengis.feature.PropertyNotFoundException;
  * @see org.apache.sis.storage.FeatureNaming
  *
  * @since 0.5
- * @module
  */
 public class DefaultFeatureType extends AbstractIdentifiedType implements FeatureType {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java b/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
index 56b0a3b901..e6fd97f7bf 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
@@ -43,7 +43,6 @@ import org.opengis.feature.PropertyNotFoundException;
  * @see DefaultFeatureType
  *
  * @since 0.5
- * @module
  */
 final class DenseFeature extends AbstractFeature implements Cloneable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java b/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
index b6dacc794a..5ed1cfdbfa 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
@@ -73,7 +73,6 @@ import org.opengis.feature.PropertyType;
  * @author  Alexis Manin (Geomatys)
  * @version 1.1
  * @since   0.7
- * @module
  */
 final class EnvelopeOperation extends AbstractOperation {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
index c2d9f8ba90..78011cce79 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
@@ -94,7 +94,6 @@ import org.opengis.feature.Operation;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.5
- * @module
  */
 public class FeatureFormat extends TabularFormat<Object> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperationException.java b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperationException.java
index 5993abae8f..870cfefbcc 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperationException.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperationException.java
@@ -29,7 +29,6 @@ import org.opengis.util.InternationalString;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class FeatureOperationException extends IllegalStateException implements LocalizedException {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
index 2e3f2bacfc..c4ddb1c2b8 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
@@ -109,7 +109,6 @@ import org.opengis.feature.FeatureAssociationRole;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.7
- * @module
  */
 public final class FeatureOperations extends Static {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java b/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
index 17f2fce254..4d6eca4a0c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
@@ -51,7 +51,6 @@ import org.opengis.feature.PropertyType;
  * @author  Alexis Manin (Geomatys)
  * @version 1.1
  * @since   0.5
- * @module
  */
 public final class Features extends Static {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java b/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java
index 53c280d8bf..76b8633d71 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java
@@ -39,7 +39,6 @@ import org.apache.sis.util.Deprecable;
  * @param <V> the type of property values.
  *
  * @since 0.5
- * @module
  */
 abstract class Field<V> implements Property {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/FieldType.java b/core/sis-feature/src/main/java/org/apache/sis/feature/FieldType.java
index 122a5bc522..e139d9b9a7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FieldType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FieldType.java
@@ -37,7 +37,6 @@ import org.opengis.feature.PropertyType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.5
- * @module
  */
 abstract class FieldType extends AbstractIdentifiedType implements PropertyType {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/FoliationRepresentation.java b/core/sis-feature/src/main/java/org/apache/sis/feature/FoliationRepresentation.java
index 52b15b1ab0..475d8d5cbf 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FoliationRepresentation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FoliationRepresentation.java
@@ -45,7 +45,6 @@ package org.apache.sis.feature;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public enum FoliationRepresentation {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/InvalidFeatureException.java b/core/sis-feature/src/main/java/org/apache/sis/feature/InvalidFeatureException.java
index 211a3c89ce..9c920ace88 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/InvalidFeatureException.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/InvalidFeatureException.java
@@ -37,7 +37,6 @@ import org.opengis.feature.InvalidPropertyValueException;
  * @see Features#validate(Feature)
  *
  * @since 0.7
- * @module
  */
 final class InvalidFeatureException extends InvalidPropertyValueException implements LocalizedException {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java b/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java
index c34fb2afe9..f6c2115b52 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java
@@ -39,7 +39,6 @@ import org.opengis.feature.PropertyType;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   0.6
- * @module
  */
 final class LinkOperation extends AbstractOperation {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java b/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
index bfcecaecfb..ad9e09de5b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
@@ -49,7 +49,6 @@ import org.opengis.feature.MultiValuedPropertyException;
  * @see DefaultAssociationRole
  *
  * @since 0.5
- * @module
  */
 final class MultiValuedAssociation extends AbstractAssociation {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java b/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
index 7ce6441ee6..1f1b7a2b28 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
@@ -54,7 +54,6 @@ import org.opengis.feature.MultiValuedPropertyException;
  * @see DefaultAttributeType
  *
  * @since 0.5
- * @module
  */
 final class MultiValuedAttribute<V> extends AbstractAttribute<V> implements Cloneable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java b/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java
index 0fa15556e4..dc2bd3bd4f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/NamedFeatureType.java
@@ -39,7 +39,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.5
- * @module
  */
 final class NamedFeatureType implements FeatureType, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/PropertySingleton.java b/core/sis-feature/src/main/java/org/apache/sis/feature/PropertySingleton.java
index ad733ed7f2..9887c8ba61 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/PropertySingleton.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/PropertySingleton.java
@@ -37,7 +37,6 @@ import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 final class PropertySingleton<V> extends AbstractList<V> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java b/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
index 732776ed54..d54694ded0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
@@ -52,7 +52,6 @@ import org.opengis.feature.MultiValuedPropertyException;
  * @param <V> the type of property values.
  *
  * @since 0.8
- * @module
  */
 abstract class PropertyView<V> extends Field<V> implements Property, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java b/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java
index 38b4138a60..3dfe0d4fc7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java
@@ -42,7 +42,6 @@ import org.opengis.feature.InvalidPropertyValueException;
  * @see DefaultAssociationRole
  *
  * @since 0.5
- * @module
  */
 @SuppressWarnings("CloneableImplementsClone")     // AbstractAssociation.clone() contract is to return a shallow copy.
 final class SingletonAssociation extends AbstractAssociation {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java b/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java
index af6028c630..d5872eed54 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java
@@ -45,7 +45,6 @@ import org.opengis.feature.AttributeType;
  * @see DefaultAttributeType
  *
  * @since 0.5
- * @module
  */
 @SuppressWarnings("CloneableImplementsClone")       // Nothing to add compared to subclass.
 final class SingletonAttribute<V> extends AbstractAttribute<V> implements Cloneable {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java b/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
index 8b650fe3c6..4652ce707e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
@@ -47,7 +47,6 @@ import org.opengis.feature.PropertyNotFoundException;
  * @see DefaultFeatureType
  *
  * @since 0.5
- * @module
  */
 final class SparseFeature extends AbstractFeature implements Cloneable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java b/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
index e2ea21cfd6..9c3565b64f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
@@ -66,7 +66,6 @@ import org.opengis.feature.PropertyNotFoundException;
  * @see <a href="https://en.wikipedia.org/wiki/Compound_key">Compound key on Wikipedia</a>
  *
  * @since 0.7
- * @module
  */
 final class StringJoinOperation extends AbstractOperation {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java b/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
index 92bb8ea354..e0e0be83c7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
@@ -49,7 +49,6 @@ import org.opengis.feature.FeatureAssociationRole;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
  * @since   0.5
- * @module
  */
 final class Validator {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java
index 92b9cca322..5deb0abdcc 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java
@@ -40,7 +40,6 @@ import org.opengis.feature.FeatureAssociationRole;
  * @see FeatureTypeBuilder#addAssociation(GenericName)
  *
  * @since 0.8
- * @module
  */
 public final class AssociationRoleBuilder extends PropertyTypeBuilder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java
index 355c5bb678..8d6f68d9de 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java
@@ -43,7 +43,6 @@ import org.apache.sis.feature.FeatureOperations;
  * @see AttributeTypeBuilder#addRole(AttributeRole)
  *
  * @since 0.8
- * @module
  */
 public enum AttributeRole {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
index 719fd212b4..8a1f10aa71 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
@@ -72,7 +72,6 @@ import org.opengis.feature.AttributeType;
  * @see org.apache.sis.feature.DefaultAttributeType
  *
  * @since 0.8
- * @module
  */
 public final class AttributeTypeBuilder<V> extends PropertyTypeBuilder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java
index c80030d212..a652e5b5e9 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java
@@ -46,7 +46,6 @@ import org.opengis.feature.AttributeType;
  * @see AttributeTypeBuilder#addCharacteristic(Class)
  *
  * @since 0.8
- * @module
  */
 public final class CharacteristicTypeBuilder<V> extends TypeBuilder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
index 27e05ec6d1..b20b207623 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
@@ -106,7 +106,6 @@ import org.opengis.feature.Operation;
  * @see org.apache.sis.parameter.ParameterBuilder
  *
  * @since 0.8
- * @module
  */
 public class FeatureTypeBuilder extends TypeBuilder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/OperationWrapper.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/OperationWrapper.java
index 6f1f9062db..7bcf93c8a4 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/OperationWrapper.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/OperationWrapper.java
@@ -31,7 +31,6 @@ import org.opengis.feature.PropertyType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 final class OperationWrapper extends PropertyTypeBuilder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
index 40515b147c..77412dd04e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
@@ -43,7 +43,6 @@ import org.opengis.feature.FeatureAssociationRole;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.8
- * @module
  */
 public abstract class PropertyTypeBuilder extends TypeBuilder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/RemoveOnlyList.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/RemoveOnlyList.java
index a669a38fe5..647d32a435 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/RemoveOnlyList.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/RemoveOnlyList.java
@@ -27,7 +27,6 @@ import java.util.List;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 final class RemoveOnlyList<E extends TypeBuilder> extends AbstractList<E> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
index d9fc9405f6..475c0272d1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
@@ -76,7 +76,6 @@ import org.opengis.feature.PropertyNotFoundException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 public abstract class TypeBuilder implements Localized {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java
index efb9b14a2e..d023f771fe 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java
@@ -59,6 +59,5 @@
  * @see org.apache.sis.feature.DefaultFeatureType
  *
  * @since 0.8
- * @module
  */
 package org.apache.sis.feature.builder;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/feature/package-info.java
index ff3cd92088..7cccd4c0c5 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/package-info.java
@@ -95,6 +95,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.5
- * @module
  */
 package org.apache.sis.feature;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/ArithmeticFunction.java b/core/sis-feature/src/main/java/org/apache/sis/filter/ArithmeticFunction.java
index 9999229b74..694b2f1242 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/ArithmeticFunction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/ArithmeticFunction.java
@@ -44,7 +44,6 @@ import org.opengis.filter.Expression;
  * @param  <R>  the type of resources (e.g. {@link org.opengis.feature.Feature}) used as inputs.
  *
  * @since 1.1
- * @module
  */
 abstract class ArithmeticFunction<R> extends BinaryFunction<R,Number,Number>
         implements FeatureExpression<R,Number>, Optimization.OnExpression<R,Number>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/AssociationValue.java b/core/sis-feature/src/main/java/org/apache/sis/filter/AssociationValue.java
index bcff1a1897..16d967535c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/AssociationValue.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/AssociationValue.java
@@ -49,7 +49,6 @@ import org.opengis.filter.ValueReference;
  * @see PropertyValue
  *
  * @since 1.2
- * @module
  */
 final class AssociationValue<V> extends LeafExpression<Feature, V>
         implements ValueReference<Feature, V>, Optimization.OnExpression<Feature, V>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/BinaryFunction.java b/core/sis-feature/src/main/java/org/apache/sis/filter/BinaryFunction.java
index 78eeb6c864..8eff3facc7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/BinaryFunction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/BinaryFunction.java
@@ -46,7 +46,6 @@ import org.opengis.filter.Expression;
  * @param  <V2>  the type of value computed by the second expression.
  *
  * @since 1.1
- * @module
  */
 abstract class BinaryFunction<R,V1,V2> extends Node {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/BinaryGeometryFilter.java b/core/sis-feature/src/main/java/org/apache/sis/filter/BinaryGeometryFilter.java
index 71a98683d5..a830518e4e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/BinaryGeometryFilter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/BinaryGeometryFilter.java
@@ -54,7 +54,6 @@ import org.opengis.feature.PropertyNotFoundException;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 abstract class BinaryGeometryFilter<R,G> extends FilterNode<R> implements SpatialOperator<R>, Optimization.OnFilter<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/BinarySpatialFilter.java b/core/sis-feature/src/main/java/org/apache/sis/filter/BinarySpatialFilter.java
index 160d0b614d..53de6c6039 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/BinarySpatialFilter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/BinarySpatialFilter.java
@@ -44,7 +44,6 @@ import org.opengis.filter.BinarySpatialOperator;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 final class BinarySpatialFilter<R,G> extends BinaryGeometryFilter<R,G> implements BinarySpatialOperator<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/Capabilities.java b/core/sis-feature/src/main/java/org/apache/sis/filter/Capabilities.java
index fd1edadda9..81910b8c35 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/Capabilities.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/Capabilities.java
@@ -42,7 +42,6 @@ import org.opengis.filter.capability.TemporalCapabilities;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class Capabilities implements FilterCapabilities, Conformance, IdCapabilities, ScalarCapabilities {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFilter.java b/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFilter.java
index 4a9afa8405..e7e7540274 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFilter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFilter.java
@@ -72,7 +72,6 @@ import org.opengis.filter.BetweenComparisonOperator;
  * @param  <R>  the type of resources (e.g. {@link org.opengis.feature.Feature}) used as inputs.
  *
  * @since 1.1
- * @module
  */
 abstract class ComparisonFilter<R> extends BinaryFunction<R,Object,Object>
         implements BinaryComparisonOperator<R>, Optimization.OnFilter<R>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/ConvertFunction.java b/core/sis-feature/src/main/java/org/apache/sis/filter/ConvertFunction.java
index b0c1afcd13..b6e6b6459c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/ConvertFunction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/ConvertFunction.java
@@ -46,7 +46,6 @@ import org.opengis.feature.FeatureType;
  * @see org.apache.sis.internal.filter.GeometryConverter
  *
  * @since 1.1
- * @module
  */
 final class ConvertFunction<R,S,V> extends UnaryFunction<R,S>
         implements FeatureExpression<R,V>, Optimization.OnExpression<R,V>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
index d7796ca63a..7b2b90bdf4 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
@@ -57,7 +57,6 @@ import org.opengis.filter.capability.FilterCapabilities;
  * @param  <T>  base class of temporal objects.
  *
  * @since 1.1
- * @module
  */
 public abstract class DefaultFilterFactory<R,G,T> extends AbstractFactory implements FilterFactory<R,G,T> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortProperty.java b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortProperty.java
index bd54ad4b15..b24f391cda 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortProperty.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortProperty.java
@@ -39,7 +39,6 @@ import org.opengis.filter.ValueReference;
  * @param  <R>  the type of resources (typically {@code Feature}) to sort.
  *
  * @since 1.1
- * @module
  */
 final class DefaultSortProperty<R> implements SortProperty<R>, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/DistanceFilter.java b/core/sis-feature/src/main/java/org/apache/sis/filter/DistanceFilter.java
index 16f96844d7..915aebda28 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/DistanceFilter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/DistanceFilter.java
@@ -49,7 +49,6 @@ import org.opengis.filter.DistanceOperatorName;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 final class DistanceFilter<R,G> extends BinaryGeometryFilter<R,G> implements DistanceOperator<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/FilterNode.java b/core/sis-feature/src/main/java/org/apache/sis/filter/FilterNode.java
index 8e1651d49b..ac009fc61c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/FilterNode.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/FilterNode.java
@@ -38,7 +38,6 @@ import org.opengis.filter.Filter;
  * @param  <R>  the type of resources (e.g. {@link org.opengis.feature.Feature}) used as inputs.
  *
  * @since 1.1
- * @module
  */
 abstract class FilterNode<R> extends Node implements Filter<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/IdentifierFilter.java b/core/sis-feature/src/main/java/org/apache/sis/filter/IdentifierFilter.java
index 83ee72bbfe..372ef74877 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/IdentifierFilter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/IdentifierFilter.java
@@ -38,7 +38,6 @@ import org.opengis.filter.ResourceId;
  * @param  <R>  the type of resources used as inputs.
  *
  * @since 1.1
- * @module
  */
 final class IdentifierFilter<R extends Feature> extends FilterNode<R> implements ResourceId<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/LeafExpression.java b/core/sis-feature/src/main/java/org/apache/sis/filter/LeafExpression.java
index 3475a3de5b..5f72c00ca7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/LeafExpression.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/LeafExpression.java
@@ -48,7 +48,6 @@ import org.opengis.filter.Expression;
  * @param  <V>  the type of value computed by the expression.
  *
  * @since 1.1
- * @module
  */
 abstract class LeafExpression<R,V> extends Node implements FeatureExpression<R,V> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/LikeFilter.java b/core/sis-feature/src/main/java/org/apache/sis/filter/LikeFilter.java
index e588e7c4b1..50d8edd090 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/LikeFilter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/LikeFilter.java
@@ -37,7 +37,6 @@ import org.opengis.filter.LikeOperator;
  * @param  <R>  the type of resources (e.g. {@link org.opengis.feature.Feature}) used as inputs.
  *
  * @since 1.1
- * @module
  */
 final class LikeFilter<R> extends FilterNode<R> implements LikeOperator<R>, Optimization.OnFilter<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/LogicalFilter.java b/core/sis-feature/src/main/java/org/apache/sis/filter/LogicalFilter.java
index 14b075effc..39b45858b1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/LogicalFilter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/LogicalFilter.java
@@ -41,7 +41,6 @@ import org.opengis.filter.LogicalOperatorName;
  * @param  <R>  the type of resources (e.g. {@link org.opengis.feature.Feature}) used as inputs.
  *
  * @since 1.1
- * @module
  */
 abstract class LogicalFilter<R> extends FilterNode<R> implements LogicalOperator<R>, Optimization.OnFilter<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/Optimization.java b/core/sis-feature/src/main/java/org/apache/sis/filter/Optimization.java
index 06a5938a4c..8c0971ce4f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/Optimization.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/Optimization.java
@@ -77,7 +77,6 @@ import org.opengis.feature.FeatureType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public class Optimization {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java b/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java
index a4348b1ca1..ad996001fc 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java
@@ -53,7 +53,6 @@ import org.opengis.filter.ValueReference;
  * @see AssociationValue
  *
  * @since 1.1
- * @module
  */
 abstract class PropertyValue<V> extends LeafExpression<Feature,V>
         implements ValueReference<Feature,V>, Optimization.OnExpression<Feature,V>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/TemporalFilter.java b/core/sis-feature/src/main/java/org/apache/sis/filter/TemporalFilter.java
index e22e7a449e..3275898e2e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/TemporalFilter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/TemporalFilter.java
@@ -45,7 +45,6 @@ import org.opengis.filter.TemporalOperatorName;
  * @param  <T>  the type of resources (e.g. {@link org.opengis.feature.Feature}) used as inputs.
  *
  * @since 1.1
- * @module
  */
 abstract class TemporalFilter<T> extends BinaryFunction<T,Object,Object>
         implements TemporalOperator<T>, Optimization.OnFilter<T>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/UnaryFunction.java b/core/sis-feature/src/main/java/org/apache/sis/filter/UnaryFunction.java
index d306eeec38..ebea70a8fb 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/UnaryFunction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/UnaryFunction.java
@@ -42,7 +42,6 @@ import org.opengis.filter.NullOperator;
  * @param  <V>  the type of value computed by the expression.
  *
  * @since 1.1
- * @module
  */
 class UnaryFunction<R,V> extends Node {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/XPath.java b/core/sis-feature/src/main/java/org/apache/sis/filter/XPath.java
index 9cf413a7d4..c1ca1cccb6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/XPath.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/XPath.java
@@ -31,7 +31,6 @@ import static org.apache.sis.util.CharSequences.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   0.4
- * @module
  */
 final class XPath extends Static {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/filter/package-info.java
index 10d45ca00a..dcee614f32 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/package-info.java
@@ -60,6 +60,5 @@
  * @version 1.2
  *
  * @since 1.1
- * @module
  */
 package org.apache.sis.filter;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/AnnotatedImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/AnnotatedImage.java
index 3b80130fd4..4a661a3e9a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/AnnotatedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/AnnotatedImage.java
@@ -59,7 +59,6 @@ import org.apache.sis.internal.util.Strings;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 abstract class AnnotatedImage extends ImageAdapter {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/BandSelectImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/BandSelectImage.java
index bc8c529794..5783e6c769 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/BandSelectImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/BandSelectImage.java
@@ -39,7 +39,6 @@ import org.apache.sis.internal.coverage.j2d.ColorModelFactory;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class BandSelectImage extends SourceAlignedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/BandedIterator.java b/core/sis-feature/src/main/java/org/apache/sis/image/BandedIterator.java
index 784ef63924..66debf5436 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/BandedIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/BandedIterator.java
@@ -51,7 +51,6 @@ import org.opengis.coverage.grid.SequenceType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class BandedIterator extends WritablePixelIterator {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/BandedSampleConverter.java b/core/sis-feature/src/main/java/org/apache/sis/image/BandedSampleConverter.java
index 3593e43381..8858a7061d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/BandedSampleConverter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/BandedSampleConverter.java
@@ -68,7 +68,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 class BandedSampleConverter extends ComputedImage {
     /*
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java
index 4c9d5a0643..a8f78f1a35 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java
@@ -118,7 +118,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public abstract class ComputedImage extends PlanarImage implements Disposable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ComputedTiles.java b/core/sis-feature/src/main/java/org/apache/sis/image/ComputedTiles.java
index 45244a1c86..78be08773f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ComputedTiles.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ComputedTiles.java
@@ -41,7 +41,6 @@ import org.apache.sis.util.Disposable;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class ComputedTiles extends WeakReference<ComputedImage> implements Disposable, TileObserver {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/DataType.java b/core/sis-feature/src/main/java/org/apache/sis/image/DataType.java
index bf42e01c93..82e021692e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/DataType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/DataType.java
@@ -36,7 +36,6 @@ import static org.apache.sis.internal.util.Numerics.MAX_INTEGER_CONVERTIBLE_TO_F
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public enum DataType {
     /*
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ErrorAction.java b/core/sis-feature/src/main/java/org/apache/sis/image/ErrorAction.java
index 014030c62a..325aa52fca 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ErrorAction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ErrorAction.java
@@ -31,7 +31,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 enum ErrorAction implements ErrorHandler {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ErrorHandler.java b/core/sis-feature/src/main/java/org/apache/sis/image/ErrorHandler.java
index 337d8dc873..396e6f26e1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ErrorHandler.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ErrorHandler.java
@@ -34,7 +34,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public interface ErrorHandler {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ImageAdapter.java b/core/sis-feature/src/main/java/org/apache/sis/image/ImageAdapter.java
index e34393ebfc..932afd66a6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ImageAdapter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ImageAdapter.java
@@ -47,7 +47,6 @@ import org.apache.sis.util.Disposable;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 abstract class ImageAdapter extends PlanarImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ImageCombiner.java b/core/sis-feature/src/main/java/org/apache/sis/image/ImageCombiner.java
index 61f7da9fe9..5909ce6ecc 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ImageCombiner.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ImageCombiner.java
@@ -63,7 +63,6 @@ import org.apache.sis.measure.Units;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public class ImageCombiner implements Consumer<RenderedImage> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ImageProcessor.java b/core/sis-feature/src/main/java/org/apache/sis/image/ImageProcessor.java
index 67396be6cc..2ed628303a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ImageProcessor.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ImageProcessor.java
@@ -144,7 +144,6 @@ import org.apache.sis.coverage.grid.GridCoverageProcessor;
  * @see org.apache.sis.coverage.grid.GridCoverageProcessor
  *
  * @since 1.1
- * @module
  */
 public class ImageProcessor implements Cloneable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/Interpolation.java b/core/sis-feature/src/main/java/org/apache/sis/image/Interpolation.java
index 8e13f9276f..87bcd4442d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/Interpolation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/Interpolation.java
@@ -37,7 +37,6 @@ import java.nio.DoubleBuffer;
  * @author  Johann Sorel (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public abstract class Interpolation {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/LanczosInterpolation.java b/core/sis-feature/src/main/java/org/apache/sis/image/LanczosInterpolation.java
index fa3d0aece3..e63411da84 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/LanczosInterpolation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/LanczosInterpolation.java
@@ -36,7 +36,6 @@ import java.nio.DoubleBuffer;
  * @see <a href="https://en.wikipedia.org/wiki/Lanczos_resampling">Lanczos resampling on Wikipedia</a>
  *
  * @since 1.1
- * @module
  */
 final class LanczosInterpolation extends Interpolation {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/MaskImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/MaskImage.java
index de89515d62..6642928040 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/MaskImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/MaskImage.java
@@ -41,7 +41,6 @@ import static java.util.logging.Logger.getLogger;
  * @see ResampledImage#MASK_KEY
  *
  * @since 1.1
- * @module
  */
 final class MaskImage extends SourceAlignedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/MaskedImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/MaskedImage.java
index d11a2aa251..3e719ec1e6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/MaskedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/MaskedImage.java
@@ -48,7 +48,6 @@ import static org.apache.sis.internal.util.Numerics.LONG_SHIFT;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class MaskedImage extends SourceAlignedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java b/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
index 5f3b84ad5d..de8817afa0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
@@ -85,7 +85,6 @@ import static org.apache.sis.internal.util.Numerics.ceilDiv;
  * @author  Johann Sorel (Geomatys)
  * @version 1.2
  * @since   1.0
- * @module
  */
 public class PixelIterator {
     /**
@@ -1177,7 +1176,6 @@ public class PixelIterator {
      * @param  <T>  the type of buffer which can be used for transferring data.
      *
      * @since 0.8
-     * @module
      */
     public abstract static class Window<T extends Buffer> {
         /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/PlanarImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/PlanarImage.java
index 88d16a4a9c..33aa883b41 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/PlanarImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/PlanarImage.java
@@ -107,7 +107,6 @@ import static java.lang.Math.multiplyFull;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public abstract class PlanarImage implements RenderedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/PositionalConsistencyImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/PositionalConsistencyImage.java
index f6d684fecf..27f3c190ce 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/PositionalConsistencyImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/PositionalConsistencyImage.java
@@ -32,7 +32,6 @@ import org.apache.sis.internal.coverage.j2d.ColorModelFactory;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class PositionalConsistencyImage extends SourceAlignedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/PrefetchedImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/PrefetchedImage.java
index ccb4ea5ad8..a0cfd42c8a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/PrefetchedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/PrefetchedImage.java
@@ -44,7 +44,6 @@ import org.apache.sis.util.Disposable;
  * @see ImageProcessor#prefetch(RenderedImage, Rectangle)
  *
  * @since 1.1
- * @module
  */
 final class PrefetchedImage extends PlanarImage implements TileErrorHandler.Executor {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/RecoloredImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/RecoloredImage.java
index b46e1864b1..42d535f1d2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/RecoloredImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/RecoloredImage.java
@@ -46,7 +46,6 @@ import org.apache.sis.measure.NumberRange;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class RecoloredImage extends ImageAdapter {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ResampledImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/ResampledImage.java
index f7fe04e8ed..b21609f5b0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ResampledImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ResampledImage.java
@@ -78,7 +78,6 @@ import static java.util.logging.Logger.getLogger;
  * @see java.awt.image.AffineTransformOp
  *
  * @since 1.1
- * @module
  */
 public class ResampledImage extends ComputedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ResamplingGrid.java b/core/sis-feature/src/main/java/org/apache/sis/image/ResamplingGrid.java
index 71962b90a5..e717583931 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ResamplingGrid.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ResamplingGrid.java
@@ -56,7 +56,6 @@ import static java.lang.Math.abs;
  * @author  Rémi Maréchal (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class ResamplingGrid extends AbstractMathTransform2D {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/SourceAlignedImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/SourceAlignedImage.java
index 519b9a1545..608c3a3c7e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/SourceAlignedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/SourceAlignedImage.java
@@ -48,7 +48,6 @@ import org.apache.sis.util.Workaround;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 abstract class SourceAlignedImage extends ComputedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/StatisticsCalculator.java b/core/sis-feature/src/main/java/org/apache/sis/image/StatisticsCalculator.java
index dcb691f971..95e21a514a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/StatisticsCalculator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/StatisticsCalculator.java
@@ -38,7 +38,6 @@ import org.apache.sis.internal.coverage.j2d.ImageUtilities;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class StatisticsCalculator extends AnnotatedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/TileCache.java b/core/sis-feature/src/main/java/org/apache/sis/image/TileCache.java
index 817a82cbfd..33b9e88784 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/TileCache.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/TileCache.java
@@ -40,7 +40,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class TileCache extends Cache<TileCache.Key, Raster> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/TransferType.java b/core/sis-feature/src/main/java/org/apache/sis/image/TransferType.java
index 16e1702589..e6a0dc343c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/TransferType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/TransferType.java
@@ -47,7 +47,6 @@ import org.apache.sis.util.resources.Errors;
  * @param  <T>  the type of buffer which can be used for transferring data.
  *
  * @since 1.0
- * @module
  *
  * @see Raster#getTransferType()
  * @see PixelIterator#createWindow(TransferType)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/Transferer.java b/core/sis-feature/src/main/java/org/apache/sis/image/Transferer.java
index d40a057465..4c9d46eec4 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/Transferer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/Transferer.java
@@ -48,7 +48,6 @@ import org.apache.sis.internal.util.Numerics;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 abstract class Transferer {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/Visualization.java b/core/sis-feature/src/main/java/org/apache/sis/image/Visualization.java
index 152b7309ed..4dd6e7f7dd 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/Visualization.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/Visualization.java
@@ -62,7 +62,6 @@ import org.apache.sis.util.collection.BackingStoreException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class Visualization extends ResampledImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java b/core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java
index 4c954536ed..05812c6efd 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/WritablePixelIterator.java
@@ -54,7 +54,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public class WritablePixelIterator extends PixelIterator implements Closeable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/image/package-info.java
index 738f5b4d4b..235cb32ae0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/package-info.java
@@ -44,6 +44,5 @@
  * @author  Johann Sorel (Geomatys)
  * @version 1.3
  * @since   1.0
- * @module
  */
 package org.apache.sis.image;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/index/tree/NodeIterator.java b/core/sis-feature/src/main/java/org/apache/sis/index/tree/NodeIterator.java
index c380226ec4..96199e114d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/index/tree/NodeIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/index/tree/NodeIterator.java
@@ -36,7 +36,6 @@ import org.apache.sis.internal.util.Numerics;
  * @param  <E>  the type of elements stored in the {@link PointTree}.
  *
  * @since 1.1
- * @module
  */
 class NodeIterator<E> implements Spliterator<E>, Cloneable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/index/tree/PointTree.java b/core/sis-feature/src/main/java/org/apache/sis/index/tree/PointTree.java
index a5e38ef641..fddacf1312 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/index/tree/PointTree.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/index/tree/PointTree.java
@@ -78,7 +78,6 @@ import org.apache.sis.util.collection.CheckedContainer;
  * @param  <E>  the type of elements stored in this tree.
  *
  * @since 1.1
- * @module
  */
 public class PointTree<E> extends AbstractSet<E> implements CheckedContainer<E>, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/index/tree/PointTreeNode.java b/core/sis-feature/src/main/java/org/apache/sis/index/tree/PointTreeNode.java
index f772722496..bd7a60e998 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/index/tree/PointTreeNode.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/index/tree/PointTreeNode.java
@@ -46,7 +46,6 @@ import java.io.Serializable;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 abstract class PointTreeNode implements Cloneable, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java b/core/sis-feature/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java
index 3f2a609697..6b37b01dbf 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java
@@ -27,7 +27,6 @@ package org.apache.sis.index.tree;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.1
- * @module
  */
 final class QuadTreeNode extends PointTreeNode {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/index/tree/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/index/tree/package-info.java
index 095bf1cb1c..44a6d0f7de 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/index/tree/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/index/tree/package-info.java
@@ -26,6 +26,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 package org.apache.sis.index.tree;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/CoverageCombiner.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/CoverageCombiner.java
index 692102b961..e289c68bc2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/CoverageCombiner.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/CoverageCombiner.java
@@ -70,7 +70,6 @@ import static org.apache.sis.internal.util.Numerics.saturatingSubtract;
  * @see ImageCombiner
  *
  * @since 1.2
- * @module
  */
 public final class CoverageCombiner {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/SampleDimensions.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/SampleDimensions.java
index c0121ecca8..349c4e6d6d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/SampleDimensions.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/SampleDimensions.java
@@ -32,7 +32,6 @@ import org.apache.sis.util.Static;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final class SampleDimensions extends Static {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/BatchComputedImage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/BatchComputedImage.java
index 33a002a98c..36e37a355b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/BatchComputedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/BatchComputedImage.java
@@ -41,7 +41,6 @@ import org.apache.sis.util.resources.Errors;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public abstract class BatchComputedImage extends ComputedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
index 5d7671c344..de0d86719d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
@@ -50,7 +50,6 @@ import org.apache.sis.util.Debug;
  * @author  Alexis Manin (Geomatys)
  * @version 1.4
  * @since   1.0
- * @module
  */
 public final class ColorModelFactory {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelType.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelType.java
index fb00fb54d0..c161b0b300 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelType.java
@@ -31,7 +31,6 @@ import java.awt.image.IndexColorModel;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public enum ColorModelType {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/Colorizer.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/Colorizer.java
index d8af94c8f8..18cfa60ad9 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/Colorizer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/Colorizer.java
@@ -68,7 +68,6 @@ import org.apache.sis.util.resources.Vocabulary;
  * @see ColorModelFactory#createColorModel(int, int, int, Collection)
  *
  * @since 1.1
- * @module
  */
 public final class Colorizer {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorsForRange.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorsForRange.java
index 74f640389f..58cceeb1d6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorsForRange.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorsForRange.java
@@ -38,7 +38,6 @@ import org.apache.sis.util.ArraysExt;
  * @see ColorModelFactory#createColorModel(int, int, int, ColorsForRange[])
  *
  * @since 1.1
- * @module
  */
 final class ColorsForRange implements Comparable<ColorsForRange> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/DeferredProperty.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/DeferredProperty.java
index 74737f26df..4faebacfa2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/DeferredProperty.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/DeferredProperty.java
@@ -35,7 +35,6 @@ import org.apache.sis.coverage.grid.GridGeometry;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final class DeferredProperty {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/FillValues.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/FillValues.java
index 1a93e10804..6422282fa9 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/FillValues.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/FillValues.java
@@ -31,7 +31,6 @@ import java.awt.image.WritableRenderedImage;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final class FillValues {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java
index 339c2312cd..aab3f04ad0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java
@@ -39,7 +39,6 @@ import org.apache.sis.internal.util.Strings;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public class ImageLayout {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageUtilities.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageUtilities.java
index e76d3602fd..1148179ef6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageUtilities.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageUtilities.java
@@ -55,7 +55,6 @@ import static org.apache.sis.internal.util.Numerics.COMPARISON_THRESHOLD;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final class ImageUtilities extends Static {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/MultiBandsIndexColorModel.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/MultiBandsIndexColorModel.java
index ed7531bab8..9ec0bd6be9 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/MultiBandsIndexColorModel.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/MultiBandsIndexColorModel.java
@@ -42,7 +42,6 @@ import java.awt.image.SinglePixelPackedSampleModel;
  * @author  Andrea Aime (TOPP)
  * @version 1.4
  * @since   1.0
- * @module
  */
 final class MultiBandsIndexColorModel extends IndexColorModel {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/RasterFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/RasterFactory.java
index 71462c4cd4..083501ea6e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/RasterFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/RasterFactory.java
@@ -55,7 +55,6 @@ import org.apache.sis.util.collection.WeakHashSet;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public final class RasterFactory extends Static {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/SampleModelFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/SampleModelFactory.java
index 90603cd556..3091411a48 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/SampleModelFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/SampleModelFactory.java
@@ -43,7 +43,6 @@ import org.apache.sis.util.resources.Errors;
  * @see SampleModel#createSubsetSampleModel(int[])
  *
  * @since 1.1
- * @module
  */
 public final class SampleModelFactory {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorModel.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorModel.java
index 46a3f1f5e5..4028239e67 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorModel.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorModel.java
@@ -33,7 +33,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class ScaledColorModel extends ComponentColorModel {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpace.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpace.java
index f858dba42b..b197f91468 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpace.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpace.java
@@ -35,7 +35,6 @@ import org.apache.sis.util.Debug;
  * @see ColorModelFactory#createGrayScale(int, int, int, double, double)
  *
  * @since 1.0
- * @module
  */
 final class ScaledColorSpace extends ColorSpace {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileErrorHandler.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileErrorHandler.java
index 1f294b42aa..720a9a1872 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileErrorHandler.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileErrorHandler.java
@@ -29,7 +29,6 @@ import org.apache.sis.internal.system.Modules;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final class TileErrorHandler {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileOpExecutor.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileOpExecutor.java
index fd26717186..49d3b8399a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileOpExecutor.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileOpExecutor.java
@@ -80,7 +80,6 @@ import static java.lang.Math.floorDiv;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public class TileOpExecutor {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TilePlaceholder.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TilePlaceholder.java
index d9ba96a15f..aa168ca50e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TilePlaceholder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TilePlaceholder.java
@@ -42,7 +42,6 @@ import org.apache.sis.internal.system.ReferenceQueueConsumer;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public class TilePlaceholder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TiledImage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TiledImage.java
index c850435090..8265fe0b73 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TiledImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TiledImage.java
@@ -38,7 +38,6 @@ import org.apache.sis.util.resources.Errors;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public class TiledImage extends PlanarImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/WritableTiledImage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/WritableTiledImage.java
index 494a1b4dec..88f9de5e94 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/WritableTiledImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/WritableTiledImage.java
@@ -34,7 +34,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public class WritableTiledImage extends TiledImage implements WritableRenderedImage {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/WriteSupport.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/WriteSupport.java
index 5990430d03..547120e467 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/WriteSupport.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/WriteSupport.java
@@ -31,7 +31,6 @@ import org.apache.sis.util.ArraysExt;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final class WriteSupport {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/package-info.java
index ec09f80080..c51476548f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/package-info.java
@@ -29,6 +29,5 @@
  * @author  Johann Sorel (Geomatys)
  * @version 1.4
  * @since   1.0
- * @module
  */
 package org.apache.sis.internal.coverage.j2d;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/package-info.java
index 533312ceef..6c075d95e7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/package-info.java
@@ -26,6 +26,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 package org.apache.sis.internal.coverage;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AbstractGeometry.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AbstractGeometry.java
index 1ec205586b..ee88dd259e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AbstractGeometry.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AbstractGeometry.java
@@ -30,7 +30,6 @@ package org.apache.sis.internal.feature;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public abstract class AbstractGeometry {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java
index 5062863567..9c87512524 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java
@@ -71,7 +71,6 @@ import org.opengis.feature.PropertyNotFoundException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.7
- * @module
  */
 public final class AttributeConvention extends Static {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/FeatureExpression.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/FeatureExpression.java
index f40345f45c..cc81863b73 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/FeatureExpression.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/FeatureExpression.java
@@ -42,7 +42,6 @@ import org.apache.sis.feature.builder.PropertyTypeBuilder;
  * @param  <V>  the type of values computed by the expression.
  *
  * @since 1.0
- * @module
  */
 public interface FeatureExpression<R,V> extends Expression<R,V> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/FeatureUtilities.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/FeatureUtilities.java
index 9bed7a3504..1fae090ec6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/FeatureUtilities.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/FeatureUtilities.java
@@ -40,7 +40,6 @@ import org.opengis.feature.PropertyType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.8
- * @module
  */
 public final class FeatureUtilities extends Static {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Geometries.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Geometries.java
index 246da30056..042f496dd6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Geometries.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Geometries.java
@@ -57,7 +57,6 @@ import org.apache.sis.util.Classes;
  * @author  Alexis Manin (Geomatys)
  * @version 1.3
  * @since   0.7
- * @module
  */
 public abstract class Geometries<G> implements Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryFactories.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryFactories.java
index c1e28d6fac..b86e7be949 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryFactories.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryFactories.java
@@ -34,7 +34,6 @@ import org.apache.sis.util.logging.Logging;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class GeometryFactories {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryType.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryType.java
index dbc774606a..ed6c4e73a8 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryType.java
@@ -28,7 +28,6 @@ import java.util.Locale;
  * @see Geometries#getGeometryClass(GeometryType)
  *
  * @since 1.1
- * @module
  */
 public enum GeometryType {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWithCRS.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWithCRS.java
index bb99e20864..4216eae572 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWithCRS.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWithCRS.java
@@ -31,7 +31,6 @@ import org.apache.sis.util.ArgumentChecks;
  * @param  <G>  root class of geometry instances of the underlying library.
  *
  * @since 1.1
- * @module
  */
 public abstract class GeometryWithCRS<G> extends GeometryWrapper<G> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWrapper.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWrapper.java
index 98bceb8341..9644e35484 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWrapper.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWrapper.java
@@ -65,7 +65,6 @@ import org.opengis.filter.InvalidFilterValueException;
  * @see Geometries#wrap(Object)
  *
  * @since 0.8
- * @module
  */
 public abstract class GeometryWrapper<G> extends AbstractGeometry implements Geometry {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/InstantList.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/InstantList.java
index fc0d566245..88c1f031f2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/InstantList.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/InstantList.java
@@ -28,7 +28,6 @@ import org.apache.sis.util.collection.CheckedContainer;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.8
- * @module
  */
 final class InstantList extends AbstractList<Instant> implements CheckedContainer<Instant> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeatures.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeatures.java
index fec27f404f..e219a70312 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeatures.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeatures.java
@@ -39,7 +39,6 @@ import org.opengis.feature.AttributeType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.8
- * @module
  */
 public class MovingFeatures {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources.java
index f643c483cd..6e5e148385 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Resources.java
@@ -34,7 +34,6 @@ import org.apache.sis.util.resources.IndexedResourceBundle;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.1
  * @since   0.8
- * @module
  */
 public final class Resources extends IndexedResourceBundle {
     /**
@@ -45,7 +44,6 @@ public final class Resources extends IndexedResourceBundle {
      *
      * @author  Martin Desruisseaux (IRD, Geomatys)
      * @since   1.1
-     * @module
      */
     public static final class Keys extends KeyConstants {
         /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/SpatialOperationContext.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/SpatialOperationContext.java
index abdb6eb1a9..62bc8f1dcc 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/SpatialOperationContext.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/SpatialOperationContext.java
@@ -62,7 +62,6 @@ import org.opengis.filter.DistanceOperatorName;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final class SpatialOperationContext implements Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/Factory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/Factory.java
index 297e7582fc..dd07c04892 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/Factory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/Factory.java
@@ -49,7 +49,6 @@ import org.apache.sis.math.Vector;
  * @author  Alexis Manin (Geomatys)
  * @version 1.1
  * @since   0.7
- * @module
  */
 public final class Factory extends Geometries<Geometry> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/Wrapper.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/Wrapper.java
index 60dc2b75f7..c4c5d63885 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/Wrapper.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/Wrapper.java
@@ -56,7 +56,6 @@ import org.opengis.filter.SpatialOperatorName;
  * @author  Alexis Manin (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class Wrapper extends GeometryWithCRS<Geometry> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/package-info.java
index 4e9a7a5310..780c0b8f9c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/esri/package-info.java
@@ -30,6 +30,5 @@
  * @see org.apache.sis.internal.referencing.j2d
  *
  * @since 1.1
- * @module
  */
 package org.apache.sis.internal.feature.esri;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/DecimatedPathIterator.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/DecimatedPathIterator.java
index c1a94dffaa..4a62e0b155 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/DecimatedPathIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/DecimatedPathIterator.java
@@ -28,7 +28,6 @@ import java.awt.geom.PathIterator;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class DecimatedPathIterator implements PathIterator {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/DecimatedShape.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/DecimatedShape.java
index a29d253b39..1a3e23afc0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/DecimatedShape.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/DecimatedShape.java
@@ -33,7 +33,6 @@ import java.awt.geom.AffineTransform;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final class DecimatedShape extends ShapeWrapper {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/EmptyShape.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/EmptyShape.java
index 41768f42c4..de3335e7e6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/EmptyShape.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/EmptyShape.java
@@ -33,7 +33,6 @@ import org.apache.sis.internal.referencing.j2d.AbstractShape;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final class EmptyShape extends AbstractShape implements Serializable, PathIterator {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Factory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Factory.java
index 0376a8b10b..1868495b8a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Factory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Factory.java
@@ -44,7 +44,6 @@ import org.apache.sis.util.UnsupportedImplementationException;
  * @author  Alexis Manin (Geomatys)
  * @version 1.1
  * @since   0.7
- * @module
  */
 public final class Factory extends Geometries<Shape> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/FlatShape.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/FlatShape.java
index dbd6c7979e..58ed4b9ede 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/FlatShape.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/FlatShape.java
@@ -33,7 +33,6 @@ import org.apache.sis.internal.referencing.j2d.IntervalRectangle;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public abstract class FlatShape extends AbstractGeometry implements Shape {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/MultiPolylines.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/MultiPolylines.java
index 1139819964..109147da3b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/MultiPolylines.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/MultiPolylines.java
@@ -39,7 +39,6 @@ import org.apache.sis.util.Classes;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class MultiPolylines extends FlatShape {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/PathBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/PathBuilder.java
index 6141f4984b..eb55300cda 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/PathBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/PathBuilder.java
@@ -29,7 +29,6 @@ import org.opengis.referencing.operation.TransformException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public class PathBuilder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/PointWrapper.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/PointWrapper.java
index 7c238a71d4..37a8fd710c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/PointWrapper.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/PointWrapper.java
@@ -41,7 +41,6 @@ import org.opengis.filter.SpatialOperatorName;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class PointWrapper extends GeometryWithCRS<Shape> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Polygon.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Polygon.java
index 0184b83e60..caa0e3ee5b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Polygon.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Polygon.java
@@ -23,7 +23,6 @@ package org.apache.sis.internal.feature.j2d;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class Polygon extends Polyline {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Polyline.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Polyline.java
index db57823a53..da87513ad4 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Polyline.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Polyline.java
@@ -60,7 +60,6 @@ import org.apache.sis.util.Classes;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 class Polyline extends FlatShape {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/ShapeProperties.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/ShapeProperties.java
index 24749b6806..5b4a499175 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/ShapeProperties.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/ShapeProperties.java
@@ -33,7 +33,6 @@ import org.apache.sis.util.StringBuilders;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 final class ShapeProperties {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/ShapeWrapper.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/ShapeWrapper.java
index ad823fd504..232c6b5a6b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/ShapeWrapper.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/ShapeWrapper.java
@@ -33,7 +33,6 @@ import org.apache.sis.internal.referencing.j2d.AbstractShape;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 abstract class ShapeWrapper extends AbstractShape implements Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Wrapper.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Wrapper.java
index 63b7f46d6e..42014eb964 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Wrapper.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Wrapper.java
@@ -51,7 +51,6 @@ import org.opengis.filter.SpatialOperatorName;
  * @author  Alexis Manin (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class Wrapper extends GeometryWithCRS<Shape> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/package-info.java
index f88948692d..4e0478e17f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/package-info.java
@@ -30,6 +30,5 @@
  * @see org.apache.sis.internal.referencing.j2d
  *
  * @since 1.0
- * @module
  */
 package org.apache.sis.internal.feature.j2d;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/Factory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/Factory.java
index 375db159d7..bd1510b0b1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/Factory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/Factory.java
@@ -59,7 +59,6 @@ import org.locationtech.jts.io.WKTReader;
  * @author  Alexis Manin (Geomatys)
  * @version 1.2
  * @since   0.7
- * @module
  */
 public final class Factory extends Geometries<Geometry> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/FilteringContext.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/FilteringContext.java
index d2aee62469..831396e8f5 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/FilteringContext.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/FilteringContext.java
@@ -40,7 +40,6 @@ import org.locationtech.jts.io.WKBWriter;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class FilteringContext {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/GeometryCoordinateTransform.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/GeometryCoordinateTransform.java
index 56a4b426d1..67a79b7480 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/GeometryCoordinateTransform.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/GeometryCoordinateTransform.java
@@ -30,7 +30,6 @@ import org.opengis.referencing.operation.TransformException;
  * @author  Johann Sorel (Geomatys)
  * @version 1.2
  * @since   1.0
- * @module
  */
 final class GeometryCoordinateTransform extends GeometryTransform {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/GeometryTransform.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/GeometryTransform.java
index eafb9c29f1..b72499aba2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/GeometryTransform.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/GeometryTransform.java
@@ -42,7 +42,6 @@ import org.apache.sis.util.Classes;
  * @author  Johann Sorel (Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public abstract class GeometryTransform {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/JTS.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/JTS.java
index 1eb7826534..1167eda43c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/JTS.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/JTS.java
@@ -54,7 +54,6 @@ import static java.util.logging.Logger.getLogger;
  * @author  Alexis Manin (Geomatys)
  * @version 1.2
  * @since   1.0
- * @module
  */
 public final class JTS extends Static {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PackedCoordinateSequence.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PackedCoordinateSequence.java
index b59b621928..64d8660bf9 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PackedCoordinateSequence.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PackedCoordinateSequence.java
@@ -36,7 +36,6 @@ import org.locationtech.jts.geom.CoordinateSequences;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 abstract class PackedCoordinateSequence implements CoordinateSequence, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PackedCoordinateSequenceFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PackedCoordinateSequenceFactory.java
index b8946f73d7..bc72c77a73 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PackedCoordinateSequenceFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PackedCoordinateSequenceFactory.java
@@ -31,7 +31,6 @@ import org.locationtech.jts.geom.CoordinateSequenceFactory;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class PackedCoordinateSequenceFactory implements CoordinateSequenceFactory, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PathIteratorAdapter.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PathIteratorAdapter.java
index 4774d606e6..fa0ce7d48d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PathIteratorAdapter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/PathIteratorAdapter.java
@@ -39,7 +39,6 @@ import org.locationtech.jts.geom.Point;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class PathIteratorAdapter implements PathIterator {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/ShapeAdapter.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/ShapeAdapter.java
index d6427ee4b7..ec8a1b66e2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/ShapeAdapter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/ShapeAdapter.java
@@ -46,7 +46,6 @@ import org.locationtech.jts.geom.Point;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 final class ShapeAdapter extends AbstractShape implements Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/ShapeConverter.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/ShapeConverter.java
index dd2ec5992f..0e5df1a104 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/ShapeConverter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/ShapeConverter.java
@@ -36,7 +36,6 @@ import org.locationtech.jts.geom.GeometryFactory;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 abstract class ShapeConverter {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/Wrapper.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/Wrapper.java
index 69783a8bae..547543d23e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/Wrapper.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/Wrapper.java
@@ -75,7 +75,6 @@ import org.opengis.filter.DistanceOperatorName;
  * @author  Alexis Manin (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 final class Wrapper extends GeometryWrapper<Geometry> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/package-info.java
index 5afdd4cf8d..cbe4cf39b0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/jts/package-info.java
@@ -26,6 +26,5 @@
  * @author  Johann Sorel (Geomatys)
  * @version 1.2
  * @since   1.0
- * @module
  */
 package org.apache.sis.internal.feature.jts;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/package-info.java
index 7f28f03124..c21aa8d9b1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/package-info.java
@@ -30,6 +30,5 @@
  * @author  Alexis Manin (Geomatys)
  * @version 1.3
  * @since   0.7
- * @module
  */
 package org.apache.sis.internal.feature;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/FunctionNames.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/FunctionNames.java
index cff9c0cadd..f79fa4c64a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/FunctionNames.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/FunctionNames.java
@@ -27,7 +27,6 @@ import org.apache.sis.internal.filter.sqlmm.SQLMM;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final class FunctionNames extends Static {
     /** Value of {@link org.opengis.filter.NullOperator#getOperatorType()}. */
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/FunctionRegister.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/FunctionRegister.java
index d7abeb4678..426b490844 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/FunctionRegister.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/FunctionRegister.java
@@ -34,7 +34,6 @@ import org.opengis.filter.Expression;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  *
  * @see org.opengis.filter.FilterFactory#function(String, Expression...)
  *
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/GeometryConverter.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/GeometryConverter.java
index 8e56d67ece..a39c920b2f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/GeometryConverter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/GeometryConverter.java
@@ -51,7 +51,6 @@ import org.opengis.filter.InvalidFilterValueException;
  * @see org.apache.sis.filter.ConvertFunction
  *
  * @since 1.1
- * @module
  */
 final class GeometryConverter<R,G> extends Node implements Optimization.OnExpression<R, GeometryWrapper<G>> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/Node.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/Node.java
index 4fe8e0e1f7..aa009f2c2c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/Node.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/Node.java
@@ -54,7 +54,6 @@ import org.opengis.feature.AttributeType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public abstract class Node implements Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/SortByComparator.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/SortByComparator.java
index 5487a2ebd5..2d4b2787a9 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/SortByComparator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/SortByComparator.java
@@ -41,7 +41,6 @@ import org.opengis.filter.ValueReference;
  * @param  <R>  the type of resources (typically {@code Feature}) to sort.
  *
  * @since 1.0
- * @module
  */
 public final class SortByComparator<R> implements SortBy<R>, Serializable {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/Visitor.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/Visitor.java
index 7e08dcf92c..ee069b57b7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/Visitor.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/Visitor.java
@@ -56,7 +56,6 @@ import org.opengis.filter.ComparisonOperatorName;
  * @param  <A>  type of the accumulator object where actions will write their results.
  *
  * @since 1.1
- * @module
  */
 public abstract class Visitor<R,A> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/package-info.java
index bf70a5ca86..67864b3b8d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/package-info.java
@@ -22,6 +22,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.internal.filter;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/FunctionWithSRID.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/FunctionWithSRID.java
index 08a167efe8..6b4931546c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/FunctionWithSRID.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/FunctionWithSRID.java
@@ -49,7 +49,6 @@ import org.opengis.filter.InvalidFilterValueException;
  * @param  <R>  the type of resources (e.g. {@link org.opengis.feature.Feature}) used as inputs.
  *
  * @since 1.1
- * @module
  */
 abstract class FunctionWithSRID<R> extends SpatialFunction<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/GeometryConstructor.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/GeometryConstructor.java
index 909d5a779c..620280cc3b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/GeometryConstructor.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/GeometryConstructor.java
@@ -41,7 +41,6 @@ import org.opengis.filter.InvalidFilterValueException;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 class GeometryConstructor<R,G> extends FunctionWithSRID<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/GeometryParser.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/GeometryParser.java
index 1678f6f6a9..29cfb13914 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/GeometryParser.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/GeometryParser.java
@@ -39,7 +39,6 @@ import org.opengis.filter.InvalidFilterValueException;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 abstract class GeometryParser<R,G> extends GeometryConstructor<R,G> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java
index fbac788e5e..bb6fb1ac7c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java
@@ -37,7 +37,6 @@ import org.opengis.filter.Expression;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 class OneGeometry<R,G> extends SpatialFunction<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/Registry.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/Registry.java
index 397f181b00..87cf874b2b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/Registry.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/Registry.java
@@ -34,7 +34,6 @@ import org.opengis.filter.Expression;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final class Registry implements FunctionRegister {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SQLMM.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SQLMM.java
index 49a2b8d4e6..3fddb3bfcb 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SQLMM.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SQLMM.java
@@ -39,7 +39,6 @@ import org.opengis.filter.SpatialOperatorName;
  * @see <a href="https://www.iso.org/standard/60343.html">ISO 13249-3 - SQLMM</a>
  *
  * @since 1.1
- * @module
  */
 public enum SQLMM {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_FromBinary.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_FromBinary.java
index 301eda0653..c79ad894fc 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_FromBinary.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_FromBinary.java
@@ -35,7 +35,6 @@ import org.opengis.filter.Expression;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 final class ST_FromBinary<R,G> extends GeometryParser<R,G> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_FromText.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_FromText.java
index 5f4772cd8a..9f9cb1841f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_FromText.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_FromText.java
@@ -34,7 +34,6 @@ import org.opengis.filter.Expression;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 final class ST_FromText<R,G> extends GeometryParser<R,G> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Point.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Point.java
index 56864f1980..be91be1b5f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Point.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Point.java
@@ -51,7 +51,6 @@ import org.opengis.filter.InvalidFilterValueException;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 final class ST_Point<R,G> extends FunctionWithSRID<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Transform.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Transform.java
index a7bbb3de7d..4e93fa066e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Transform.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Transform.java
@@ -60,7 +60,6 @@ import org.opengis.filter.InvalidFilterValueException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class ST_Transform<R,G> extends FunctionWithSRID<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SpatialFunction.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SpatialFunction.java
index 5c08e49ba9..91d83a5e22 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SpatialFunction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SpatialFunction.java
@@ -47,7 +47,6 @@ import org.opengis.filter.InvalidFilterValueException;
  * @param  <R>  the type of resources (e.g. {@link org.opengis.feature.Feature}) used as inputs.
  *
  * @since 1.1
- * @module
  */
 abstract class SpatialFunction<R> extends Node implements FeatureExpression<R,Object>, Optimization.OnExpression<R,Object> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java
index 8a29bdf3c5..d80cc93ed3 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java
@@ -43,7 +43,6 @@ import org.opengis.filter.ValueReference;
  * @param  <G>  the implementation type of geometry objects.
  *
  * @since 1.1
- * @module
  */
 class TwoGeometries<R,G> extends SpatialFunction<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/package-info.java
index 573e57912c..576b0eb55d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/package-info.java
@@ -33,6 +33,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.internal.filter.sqlmm;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/CompoundFuture.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/CompoundFuture.java
index c75710836a..80e100d10c 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/CompoundFuture.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/CompoundFuture.java
@@ -34,7 +34,6 @@ import org.apache.sis.internal.feature.Resources;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 final class CompoundFuture<R> implements Future<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/TiledProcess.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/TiledProcess.java
index 80c5b076cb..626137657a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/TiledProcess.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/TiledProcess.java
@@ -60,7 +60,6 @@ import org.apache.sis.util.ArgumentChecks;
  * @param  <R>  the type of value computed as a result of this process.
  *
  * @since 1.1
- * @module
  */
 public abstract class TiledProcess<R> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/package-info.java
index 6dd6be1b79..6581b5f45a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/image/package-info.java
@@ -27,6 +27,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.internal.processing.image;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Fragments.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Fragments.java
index 2392046df1..0e684512b1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Fragments.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Fragments.java
@@ -43,7 +43,6 @@ import org.apache.sis.internal.util.Numerics;
  * @see Tracer.Level#partialPaths
  *
  * @since 1.1
- * @module
  */
 @SuppressWarnings({"CloneableImplementsClone", "serial"})           // Not intended to be cloned or serialized.
 final class Fragments extends ArrayList<double[]> {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java
index e12fb14fc6..00f10d0c3b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java
@@ -51,7 +51,6 @@ import static org.apache.sis.internal.processing.isoline.Tracer.LOWER_RIGHT;
  * @see <a href="https://en.wikipedia.org/wiki/Marching_squares">Marching squares on Wikipedia</a>
  *
  * @since 1.1
- * @module
  */
 public final class Isolines {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Joiner.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Joiner.java
index 24b38d8aaa..a5185a4a49 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Joiner.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Joiner.java
@@ -64,7 +64,6 @@ import org.opengis.referencing.operation.TransformException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class Joiner extends PathBuilder {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Parallelized.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Parallelized.java
index eab25143e5..b23f10a0d7 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Parallelized.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Parallelized.java
@@ -30,7 +30,6 @@ import org.apache.sis.internal.processing.image.TiledProcess;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class Parallelized extends TiledProcess<Isolines[]> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineBuffer.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineBuffer.java
index 0c468a016e..964f86d6d5 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineBuffer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineBuffer.java
@@ -36,7 +36,6 @@ import org.apache.sis.util.Debug;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class PolylineBuffer {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineStage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineStage.java
index 477aa3a583..9d654766e2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineStage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/PolylineStage.java
@@ -34,7 +34,6 @@ import org.apache.sis.util.Debug;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 @Debug
 enum PolylineStage {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Result.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Result.java
index 9f3e797a36..a1b1a0f04e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Result.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Result.java
@@ -32,7 +32,6 @@ import org.apache.sis.util.resources.Errors;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 final class Result extends AbstractList<NavigableMap<Double,Shape>> {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Tracer.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Tracer.java
index b84025223a..45395145cd 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Tracer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Tracer.java
@@ -41,7 +41,6 @@ import org.apache.sis.util.Debug;
  * @see <a href="https://en.wikipedia.org/wiki/Marching_squares">Marching squares on Wikipedia</a>
  *
  * @since 1.1
- * @module
  */
 final class Tracer {
     /**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/package-info.java
index 8f337f51b9..d2f6dd2573 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/package-info.java
@@ -27,6 +27,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 package org.apache.sis.internal.processing.isoline;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java
index 55e5d3b165..22c77b4e35 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java
@@ -39,7 +39,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 @DependsOn(CategoryTest.class)
 public final strictfp class CategoryListTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
index 3e789e994f..33f2800761 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
@@ -35,7 +35,6 @@ import static org.opengis.test.Assert.*;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public final strictfp class CategoryTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
index 0d19aed0ea..bc31356641 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
@@ -37,7 +37,6 @@ import static org.opengis.test.Assert.*;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public final strictfp class SampleDimensionTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java
index c88cd31f02..8c23afe696 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java
@@ -31,7 +31,6 @@ import static org.apache.sis.test.Assert.*;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class SampleRangeFormatTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
index 391e4a5b52..1b0c6c8ac6 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
@@ -41,7 +41,6 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public final strictfp class BufferedGridCoverageTest extends GridCoverage2DTest {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
index eec32d8683..d50a54b7cf 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
@@ -41,7 +41,6 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final strictfp class ConvertedGridCoverageTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java
index 9e8170b826..ff238b3eaf 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class FractionalGridCoordinatesTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index c61ba8efff..b2f9cc0a56 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@ -54,7 +54,6 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @author  Alexis Manin (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public strictfp class GridCoverage2DTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
index 4773cc20dd..92aa535102 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
@@ -58,7 +58,6 @@ import static org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals;
  * @author  Johann Sorel (Geomatys)
  * @version 1.3
  * @since   1.0
- * @module
  */
 @DependsOn(GridGeometryTest.class)
 public final strictfp class GridDerivationTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
index bc401d52fb..c35aebe807 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
@@ -50,7 +50,6 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @author  Johann Sorel (Geomatys)
  * @version 1.3
  * @since   1.0
- * @module
  */
 public final strictfp class GridExtentTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
index ec1cbf7e9f..d75eaceb16 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
@@ -47,7 +47,6 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @author  Johann Sorel (Geomatys)
  * @version 1.3
  * @since   1.0
- * @module
  */
 @DependsOn(GridExtentTest.class)
 public final strictfp class GridGeometryTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridOrientationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridOrientationTest.java
index 82eda570ca..d9fb80ebe0 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridOrientationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridOrientationTest.java
@@ -29,7 +29,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class GridOrientationTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
index 994cb2b484..0acadf7bf4 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
@@ -35,7 +35,6 @@ import static org.opengis.test.Assert.*;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public final strictfp class PixelTranslationTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
index d48a6d67a6..dac6014dd1 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
@@ -69,7 +69,6 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @author  Johann Sorel (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 @DependsOn(org.apache.sis.image.ResampledImageTest.class)
 public final strictfp class ResampledGridCoverageTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java
index b155e6c7e6..2feeb1209c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java
@@ -36,7 +36,6 @@ import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @DependsOn(org.apache.sis.image.PlanarImageTest.class)
 public final strictfp class ReshapedImageTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
index ea1216eb26..07c368ac60 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
@@ -36,7 +36,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public final strictfp class TranslatedGridCoverageTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java
index 4a24092d68..e314d86d79 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java
@@ -40,7 +40,6 @@ import org.opengis.feature.PropertyType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.8
- * @module
  */
 @DependsOn({
     DenseFeatureTest.class,
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
index 853d4a4dd6..9effddfb90 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
@@ -32,7 +32,6 @@ import static org.apache.sis.test.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.6
- * @module
  */
 @DependsOn(SingletonAttributeTest.class)
 public final strictfp class AbstractOperationTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
index 841275eb8d..0b3fc76f59 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
@@ -36,7 +36,6 @@ import org.opengis.feature.Attribute;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 @DependsOn(CharacteristicTypeMapTest.class)
 public final strictfp class CharacteristicMapTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
index 8246b7add6..2461e0fb28 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
@@ -36,7 +36,6 @@ import org.apache.sis.util.iso.Names;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.5
- * @module
  */
 @DependsOn(DefaultAttributeTypeTest.class)
 public final strictfp class CharacteristicTypeMapTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CustomAttribute.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CustomAttribute.java
index d2fd163eb4..7e9a20f52b 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CustomAttribute.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CustomAttribute.java
@@ -35,7 +35,6 @@ import org.opengis.feature.AttributeType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 @SuppressWarnings("serial")
 final strictfp class CustomAttribute<V> extends AbstractAttribute<V> {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
index 614b81cfe0..9ae5936e95 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
@@ -40,7 +40,6 @@ import org.opengis.feature.FeatureType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 @DependsOn(DefaultFeatureTypeTest.class)
 public final strictfp class DefaultAssociationRoleTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
index 0aaec41d8d..8c0748f33a 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
@@ -37,7 +37,6 @@ import static org.apache.sis.test.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 public final strictfp class DefaultAttributeTypeTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
index ccd058b601..d22990782d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
@@ -42,7 +42,6 @@ import org.opengis.feature.AttributeType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.5
- * @module
  */
 @DependsOn(DefaultAttributeTypeTest.class)
 public final strictfp class DefaultFeatureTypeTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DenseFeatureTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DenseFeatureTest.java
index 234d9587ff..471b576352 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DenseFeatureTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DenseFeatureTest.java
@@ -26,7 +26,6 @@ import org.apache.sis.test.DependsOn;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 @DependsOn({
     DefaultFeatureTypeTest.class,
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
index cecab78e54..303d7a8e74 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
@@ -54,7 +54,6 @@ import org.opengis.feature.FeatureType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.7
- * @module
  */
 public final strictfp class EnvelopeOperationTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
index 1d1c9365a2..4e5eef725f 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
@@ -39,7 +39,6 @@ import org.opengis.feature.PropertyType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.5
- * @module
  */
 @DependsOn({
     DenseFeatureTest.class,
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java
index ffef9b6a91..5f28a1b131 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java
@@ -48,7 +48,6 @@ import org.opengis.feature.PropertyType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.7
- * @module
  */
 @DependsOn({LinkOperationTest.class, EnvelopeOperationTest.class})
 public final strictfp class FeatureOperationsTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
index 001bceadb6..513c0f1cc0 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
@@ -45,7 +45,6 @@ import org.opengis.feature.Property;
  * @author  Marc le Bihan
  * @version 0.8
  * @since   0.5
- * @module
  */
 public abstract strictfp class FeatureTestCase extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
index 73972bb925..f155ca5535 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
@@ -34,7 +34,6 @@ import org.opengis.feature.InvalidPropertyValueException;
  * @author  Johann Sorel (Geomatys)
  * @version 0.7
  * @since   0.5
- * @module
  */
 @DependsOn(SingletonAttributeTest.class)
 public final strictfp class FeaturesTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
index a49cc17f31..0ceda93737 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
@@ -30,7 +30,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.6
  * @since   0.6
- * @module
  */
 @DependsOn({
     AbstractOperationTest.class,
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
index e4c8f1e2e5..a4c9bec5b7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
@@ -32,7 +32,6 @@ import static org.apache.sis.test.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 @DependsOn(SingletonAttributeTest.class)
 public final strictfp class MultiValuedAttributeTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java b/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java
index f680a4faf1..e9c798ed4c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java
@@ -33,7 +33,6 @@ import org.opengis.feature.Property;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.6
  * @since   0.6
- * @module
  */
 @SuppressWarnings("serial")
 final strictfp class NoOperation extends AbstractOperation {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java
index 2b66a07715..b83613a28c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java
@@ -32,7 +32,6 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 public final strictfp class PropertySingletonTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
index c5fdd6cc7d..58b854304d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
@@ -30,7 +30,6 @@ import static org.apache.sis.test.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 @DependsOn({
     DefaultAssociationRoleTest.class,
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
index 2c177f62ff..e757711f55 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
@@ -37,7 +37,6 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 @DependsOn({
     DefaultAttributeTypeTest.class,
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SparseFeatureTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SparseFeatureTest.java
index 8517a3fb26..c26572b59b 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SparseFeatureTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SparseFeatureTest.java
@@ -26,7 +26,6 @@ import org.apache.sis.test.DependsOn;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5
- * @module
  */
 @DependsOn({
     DefaultFeatureTypeTest.class,
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
index 894a818565..af9cd422d1 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
@@ -39,7 +39,6 @@ import org.opengis.feature.InvalidPropertyValueException;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.7
- * @module
  */
 @DependsOn(LinkOperationTest.class)
 public final strictfp class StringJoinOperationTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
index 605af1b91e..982481b3f2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
@@ -33,7 +33,6 @@ import org.opengis.feature.FeatureAssociationRole;
  * @author  Michael Hausegger
  * @version 0.8
  * @since   0.8
- * @module
  */
 public final strictfp class AssociationRoleBuilderTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
index 533ada5a76..b1aa1ae723 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
@@ -48,7 +48,6 @@ import org.opengis.feature.PropertyType;
  * @author  Alexis Manin (Geomatys)
  * @version 1.1
  * @since   0.8
- * @module
  */
 @DependsOn(CharacteristicTypeBuilderTest.class)
 public final strictfp class AttributeTypeBuilderTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
index fc8476196f..72b50d9ae7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
@@ -34,7 +34,6 @@ import org.opengis.feature.AttributeType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.8
- * @module
  */
 public final strictfp class CharacteristicTypeBuilderTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
index a6a8b8b5bf..431eed053e 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
@@ -50,7 +50,6 @@ import org.opengis.feature.Operation;
  * @author  Michael Hausegger
  * @version 0.8
  * @since   0.8
- * @module
  */
 @DependsOn(AttributeTypeBuilderTest.class)
 public final strictfp class FeatureTypeBuilderTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
index 966cbef3c2..b5ea8bb107 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
@@ -33,7 +33,6 @@ import org.opengis.filter.FilterFactory;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class ArithmeticFunctionTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java
index 0526fc1c7a..b5894ab7e6 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java
@@ -62,7 +62,6 @@ import org.opengis.filter.BinarySpatialOperator;
  * @param  <G> root class of geometry implementation.
  *
  * @since 1.1
- * @module
  */
 public abstract strictfp class BinarySpatialFilterTestCase<G> extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java
index bb7332439e..7d19342b52 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java
@@ -28,7 +28,6 @@ import org.junit.Test;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final strictfp class BinarySpatialFilterUsingESRI_Test extends BinarySpatialFilterTestCase<Geometry> {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java
index b228739f1c..b01fd934f2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java
@@ -26,7 +26,6 @@ import org.locationtech.jts.geom.Geometry;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class BinarySpatialFilterUsingJTS_Test extends BinarySpatialFilterTestCase<Geometry> {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java
index 0dd298f1bc..b94bd0f654 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java
@@ -27,7 +27,6 @@ import org.junit.Test;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final strictfp class BinarySpatialFilterUsingJava2D_Test extends BinarySpatialFilterTestCase<Shape> {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/CapabilitiesTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/CapabilitiesTest.java
index b7501dd306..bdf654ff17 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/CapabilitiesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/CapabilitiesTest.java
@@ -37,7 +37,6 @@ import org.opengis.filter.capability.ScalarCapabilities;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class CapabilitiesTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
index 0be250d056..4190e74b0e 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
@@ -39,7 +39,6 @@ import org.opengis.filter.BetweenComparisonOperator;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class ComparisonFilterTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java
index 8387f00a34..b3e53114e4 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java
@@ -37,7 +37,6 @@ import org.opengis.filter.FilterFactory;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class IdentifierFilterTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
index 7c89590a90..54621d8e82 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
@@ -35,7 +35,6 @@ import org.opengis.filter.ValueReference;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class LeafExpressionTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/LikeFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/LikeFilterTest.java
index 1ebe6d4b04..fa4332a712 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/LikeFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LikeFilterTest.java
@@ -33,7 +33,6 @@ import org.opengis.filter.Literal;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class LikeFilterTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java
index 7faabe4268..a4199feda8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java
@@ -44,7 +44,6 @@ import org.opengis.filter.LogicalOperator;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final strictfp class LogicalFilterTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/PeriodLiteral.java b/core/sis-feature/src/test/java/org/apache/sis/filter/PeriodLiteral.java
index cee59c2b09..6248e0f298 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/PeriodLiteral.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/PeriodLiteral.java
@@ -40,7 +40,6 @@ import org.opengis.temporal.TemporalGeometricPrimitive;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @SuppressWarnings("serial")
 final strictfp class PeriodLiteral implements Period, Literal<Feature,Period>, Serializable {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java
index c601b2040d..1bde107eec 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java
@@ -39,7 +39,6 @@ import org.opengis.filter.TemporalOperatorName;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class TemporalFilterTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java
index 3c3ae24b24..4c61c4c5ab 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   0.4
- * @module
  */
 public final strictfp class XPathTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java
index e7d1ab8e93..0e6dfbd077 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java
@@ -39,7 +39,6 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class BandSelectImageTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java
index 3b7727ae64..1b195cc18a 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java
@@ -33,7 +33,6 @@ import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class BandedSampleConverterTest extends ImageTestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java
index 7870728b27..b6995e9796 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java
@@ -39,7 +39,6 @@ import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @DependsOn(PlanarImageTest.class)
 public final strictfp class ComputedImageTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java
index b427c1c649..4e2504c474 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java
@@ -30,7 +30,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final strictfp class DataTypeTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java
index e1f320c332..8692beaaa8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java
@@ -36,7 +36,6 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @DependsOn(ResampledImageTest.class)
 public final strictfp class ImageCombinerTest extends ImageTestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ImageProcessorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ImageProcessorTest.java
index 6a123ba60c..4faf834da9 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ImageProcessorTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ImageProcessorTest.java
@@ -36,7 +36,6 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @DependsOn(org.apache.sis.internal.processing.isoline.IsolinesTest.class)
 public final strictfp class ImageProcessorTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java
index c48e96f727..48349f7f18 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java
@@ -41,7 +41,6 @@ import static org.junit.Assert.assertNotNull;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public abstract strictfp class ImageTestCase extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java
index 0f9eeb8712..71e29b10f2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java
@@ -44,7 +44,6 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @author  Alexis Manin (Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final strictfp class MaskedImageTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/PixelIteratorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/PixelIteratorTest.java
index f06ea62306..948ca0be23 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/PixelIteratorTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/PixelIteratorTest.java
@@ -52,7 +52,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public strictfp class PixelIteratorTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java
index 112f3e6f6d..71c32c0cf0 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java
@@ -33,7 +33,6 @@ import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class PlanarImageTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java
index cf6eea202f..95ad62a8cc 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java
@@ -44,7 +44,6 @@ import static org.opengis.test.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class ResamplingGridTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java
index bdcc504fb7..a88fecdd8f 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java
@@ -42,7 +42,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final strictfp class StatisticsCalculatorTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java b/core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java
index 5fbdbf24b3..ebcdc48861 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java
@@ -48,7 +48,6 @@ import static java.lang.StrictMath.*;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 final strictfp class TestViewer {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java b/core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java
index a12ed0edf2..a85a0aadc1 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java
@@ -51,7 +51,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.8
- * @module
  */
 public final strictfp class TiledImageMock extends PlanarImage implements WritableRenderedImage {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java
index 233812219f..6e51d11040 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java
@@ -30,7 +30,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   0.1
- * @module
  */
 public final strictfp class PointTreeNodeTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java
index 8954bf1a8b..a131f92cd1 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java
@@ -41,7 +41,6 @@ import static org.apache.sis.test.Assert.assertSetEquals;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 @DependsOn(PointTreeNodeTest.class)
 public final strictfp class PointTreeTest extends TestCase {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java
index 41049e7805..0af6ca9140 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java
@@ -40,7 +40,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final strictfp class ColorizerTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java
index c5467c02cb..b5cc556048 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java
@@ -29,7 +29,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class ImageLayoutTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java
index eaa094f507..1023da680d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java
@@ -40,7 +40,6 @@ import static org.apache.sis.internal.util.Numerics.COMPARISON_THRESHOLD;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.2
  * @since   1.1
- * @module
  */
 public final strictfp class ImageUtilitiesTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java
index c9e3007437..51f0aa84d8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java
@@ -36,7 +36,6 @@ import static org.opengis.test.Assert.assertInstanceOf;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class SampleModelFactoryTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java
index 95c0452996..40998b2771 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java
@@ -38,7 +38,6 @@ import static java.lang.StrictMath.*;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public final strictfp class ScaledColorSpaceTest extends ImageTestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
index a13bd75df7..7e4f69c0f9 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
@@ -42,7 +42,6 @@ import org.opengis.feature.IdentifiedType;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
  * @since   0.7
- * @module
  */
 public final strictfp class AttributeConventionTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java
index a6cec06868..e2b297dc8e 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java
@@ -41,7 +41,6 @@ import static org.junit.Assert.*;
  * @author  Alexis Manin (Geomatys)
  * @version 1.3
  * @since   1.0
- * @module
  */
 public abstract strictfp class GeometriesTestCase extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometryTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometryTypeTest.java
index 713a613cf3..faa7f8cce8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometryTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometryTypeTest.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class GeometryTypeTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/esri/FactoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/esri/FactoryTest.java
index 8a5b270c05..6c5319f9c4 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/esri/FactoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/esri/FactoryTest.java
@@ -30,7 +30,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public final strictfp class FactoryTest extends GeometriesTestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java
index dd405bb982..eb542d71c3 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java
@@ -29,7 +29,6 @@ import static org.opengis.test.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 public final strictfp class FactoryTest extends GeometriesTestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java
index 90669087cc..9dfb0bbeeb 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java
@@ -30,7 +30,6 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class FlatShapeTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java
index 367b833f0e..db5d4f5c64 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java
@@ -31,7 +31,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public final strictfp class ShapePropertiesTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/FactoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/FactoryTest.java
index 0af94332b3..8862669f53 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/FactoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/FactoryTest.java
@@ -31,7 +31,6 @@ import static org.junit.Assert.*;
  * @author  Johann Sorel (Geomatys)
  * @version 1.2
  * @since   1.0
- * @module
  */
 public final strictfp class FactoryTest extends GeometriesTestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java
index 03b24de83c..b8a78b850c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java
@@ -43,7 +43,6 @@ import static org.junit.Assert.*;
  * @author  Johann Sorel (Geomatys)
  * @version 1.2
  * @since   1.0
- * @module
  */
 public final strictfp class JTSTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java
index 4ae3a90024..26eecc27dc 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java
@@ -37,7 +37,6 @@ import static org.junit.Assert.*;
  * @author  Johann Sorel (Puzzle-GIS, Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final strictfp class ShapeAdapterTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java
index 31079f1575..8ed60ccfd5 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java
@@ -47,7 +47,6 @@ import static org.opengis.test.Assert.*;
  * @author  Johann Sorel (Puzzle-GIS, Geomatys)
  * @version 1.2
  * @since   1.2
- * @module
  */
 public final strictfp class ShapeConverterTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/FunctionNamesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/FunctionNamesTest.java
index fc0b8f82e2..fcd6db6ece 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/FunctionNamesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/FunctionNamesTest.java
@@ -41,7 +41,6 @@ import org.opengis.filter.Expression;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class FunctionNamesTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java
index a8e303d2bf..6cf97d62ad 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java
@@ -64,7 +64,6 @@ import org.opengis.filter.ValueReference;
  * @param  <G> root class of geometry implementation.
  *
  * @since 1.1
- * @module
  */
 public abstract strictfp class RegistryTestCase<G> extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java
index 8c6a236c98..0cf4095dd9 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java
@@ -28,7 +28,6 @@ import org.junit.Test;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class RegistryUsingESRI_Test extends RegistryTestCase<Geometry> {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java
index 117a40ebda..760d166222 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java
@@ -26,7 +26,6 @@ import org.locationtech.jts.geom.Geometry;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class RegistryUsingJTS_Test extends RegistryTestCase<Geometry> {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java
index 2f9b1f7217..d8401eab38 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java
@@ -28,7 +28,6 @@ import org.junit.Test;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class RegistryUsingJava2D_Test extends RegistryTestCase<Shape> {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
index 9d889701dc..6bcf098fde 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
@@ -45,7 +45,6 @@ import org.opengis.filter.FilterFactory;
  * @author  Alexis Manin (Geomatys)
  * @version 1.3
  * @since   1.1
- * @module
  */
 public final strictfp class SQLMMTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/IsolinesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/IsolinesTest.java
index 303a3ee8be..8f11d77b2a 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/IsolinesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/IsolinesTest.java
@@ -37,7 +37,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public final strictfp class IsolinesTest extends TestCase {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/StepsViewer.java b/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/StepsViewer.java
index 9003ee3d97..d012bccfb2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/StepsViewer.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/StepsViewer.java
@@ -61,7 +61,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 @SuppressWarnings("serial")
 public final class StepsViewer extends JComponent implements BiConsumer<String,Isolines>, ChangeListener, ActionListener {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java b/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java
index 0444535461..c63b0e8391 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java
@@ -34,7 +34,6 @@ import static org.junit.Assert.*;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public strictfp class FeatureAssert extends ReferencingAssert {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java b/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
index 316f6ad478..91e9b8c2d6 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
@@ -50,7 +50,6 @@ import org.opengis.feature.Operation;
  * @author  Johann Sorel (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 public strictfp class FeatureComparator {
     /**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/feature/package-info.java b/core/sis-feature/src/test/java/org/apache/sis/test/feature/package-info.java
index 01c55cae38..72933c1d54 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/feature/package-info.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/feature/package-info.java
@@ -25,6 +25,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.1
- * @module
  */
 package org.apache.sis.test.feature;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
index 78e4a38b3e..9cc8089804 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
@@ -28,7 +28,6 @@ import org.junit.runners.Suite;
  * @author  Johann Sorel (Geomatys)
  * @version 1.3
  * @since   0.5
- * @module
  */
 @Suite.SuiteClasses({
     org.apache.sis.feature.DefaultAttributeTypeTest.class,
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
index 7a803659bd..82f78faa8b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
@@ -43,7 +43,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
  * @see Unmarshaller#setAdapter(XmlAdapter)
  *
  * @since 0.3
- * @module
  */
 public interface AdapterReplacement {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
index ffce49e72f..17ce6488c0 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
@@ -54,7 +54,6 @@ import org.apache.sis.xml.ReferenceResolver;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class Context extends MarshalContext {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
index 164b199afc..bb54faf283 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
@@ -28,7 +28,6 @@ package org.apache.sis.internal.jaxb;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public enum FilterByVersion {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
index 1cf8530f66..cc92d21399 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
@@ -86,7 +86,6 @@ import static org.apache.sis.util.collection.Containers.hashMapCapacity;
  * @see org.apache.sis.xml.IdentifiedObject
  *
  * @since 0.3
- * @module
  */
 public class IdentifierMapAdapter extends AbstractMap<Citation,String> implements IdentifierMap, Serializable {
     /**
@@ -420,7 +419,6 @@ public class IdentifierMapAdapter extends AbstractMap<Citation,String> implement
      * @author  Martin Desruisseaux (Geomatys)
      * @version 0.7
      * @since   0.3
-     * @module
      */
     @SuppressWarnings("serial")                 // Not intended to be serialized.
     private static final class Iter extends HashMap<Citation,Boolean> implements Iterator<Entry<Citation,String>> {
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
index b33c925b04..9c9c50afed 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
@@ -30,7 +30,6 @@ import org.apache.sis.metadata.iso.citation.Citations;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.3
- * @module
  */
 final class IdentifierMapEntry extends AbstractMap.SimpleEntry<Citation,String> implements Identifier {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
index 67ee3534d4..e85ade772f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
@@ -41,7 +41,6 @@ import org.apache.sis.xml.XLink;
  * @see org.apache.sis.xml.IdentifiedObject
  *
  * @since 0.7
- * @module
  */
 public final class ModifiableIdentifierMap extends IdentifierMapAdapter {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
index 7a65d3dee4..33010e5040 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
@@ -67,7 +67,6 @@ import org.apache.sis.xml.IdentifierSpace;
  * @see IdentifierSpace
  *
  * @since 0.3
- * @module
  */
 public final class NonMarshalledAuthority<T> extends CitationConstant.Authority<T> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java
index de65d2600a..a27bf1f424 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java
@@ -34,7 +34,6 @@ import org.apache.sis.xml.NilReason;
  * @see NilReason#createNilObject(Class)
  *
  * @since 0.4
- * @module
  */
 public final class PrimitiveTypeProperties {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
index 1f6f91b95d..d285d5b499 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
@@ -45,7 +45,6 @@ import org.opengis.metadata.Identifier;
  * @param <T>  the value type, typically {@link XLink}, {@link UUID} or {@link String}.
  *
  * @since 0.3
- * @module
  */
 public final class SpecializedIdentifier<T> implements Identifier, Cloneable, Serializable {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
index 4206b65103..67440f2ee2 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
@@ -50,7 +50,6 @@ import org.apache.sis.internal.system.DelayedRunnable;
  * @see org.apache.sis.xml.MarshallerPool
  *
  * @since 0.3
- * @module
  */
 public abstract class TypeRegistration {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java
index be4c44ebec..b3479e31e8 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java
@@ -34,7 +34,6 @@ import java.lang.annotation.RetentionPolicy;
  * @see <a href="https://issues.apache.org/jira/browse/SIS-401">SIS-401</a>
  *
  * @since 1.0
- * @module
  */
 @Inherited
 @Target(ElementType.TYPE)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
index ccb56b90cc..49c15ff277 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
@@ -47,7 +47,6 @@ import org.apache.sis.internal.jaxb.FilterByVersion;
  * @param <BoundType> The code list being adapted.
  *
  * @since 0.3
- * @module
  */
 public abstract class CodeListAdapter<ValueType extends CodeListAdapter<ValueType,BoundType>,
         BoundType extends CodeList<BoundType>> extends XmlAdapter<ValueType,BoundType>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
index c4a05ac983..15cdb550d1 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
@@ -80,7 +80,6 @@ import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPAC
  * @see CodeListAdapter
  *
  * @since 0.3
- * @module
  */
 @XmlType(name = "CodeList", propOrder = {"codeList", "codeListValue", "codeSpace"})
 public final class CodeListUID {
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
index 4f6614e1f1..c5bdc31a98 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
@@ -40,7 +40,6 @@ import org.opengis.util.ControlledVocabulary;
  * @param <BoundType>  the enum being adapted.
  *
  * @since 0.5
- * @module
  */
 public abstract class EnumAdapter<ValueType extends EnumAdapter<ValueType,BoundType>,
         BoundType extends Enum<BoundType>> extends XmlAdapter<ValueType,BoundType>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/package-info.java
index c1ded97e82..322e6d979b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/package-info.java
@@ -22,6 +22,5 @@
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
  * @since   1.0
- * @module
  */
 package org.apache.sis.internal.jaxb.cat;
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
index d5ea009349..066d4c4d12 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class CI_DateTypeCode extends CodeListAdapter<CI_DateTypeCode, DateType> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
index 03dd852851..93a0da7bf5 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class CI_OnLineFunctionCode extends CodeListAdapter<CI_OnLineFunctionCode, OnLineFunction> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
index 76e9df920c..5196a9d131 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class CI_PresentationFormCode extends CodeListAdapter<CI_PresentationFormCode, PresentationForm> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
index 3be0170aec..973b4d9146 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
@@ -33,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public class CI_RoleCode extends CodeListAdapter<CI_RoleCode, Role> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
index 003229dd9f..81ae057286 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   1.0
- * @module
  */
 public class CI_TelephoneTypeCode extends CodeListAdapter<CI_TelephoneTypeCode, TelephoneType> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
index 6b97cc389b..ab0186abb4 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
@@ -31,7 +31,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.5
- * @module
  */
 public final class DCPList extends CodeListAdapter<DCPList, DistributedComputingPlatform> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQM_ValueStructure.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQM_ValueStructure.java
index d07cfabd67..021b39fc99 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQM_ValueStructure.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQM_ValueStructure.java
@@ -31,7 +31,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.3
  * @since   1.3
- * @module
  */
 public final class DQM_ValueStructure extends CodeListAdapter<DQM_ValueStructure, ValueStructure> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
index 7032129785..a86dae9927 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
@@ -31,7 +31,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cédric Briançon (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class DQ_EvaluationMethodTypeCode
         extends CodeListAdapter<DQ_EvaluationMethodTypeCode, EvaluationMethodType>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
index 435d757d2e..93782db69a 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public class DS_AssociationTypeCode extends CodeListAdapter<DS_AssociationTypeCode, AssociationType> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
index f51692db0d..3dbcfbbf7e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public class DS_InitiativeTypeCode extends CodeListAdapter<DS_InitiativeTypeCode, InitiativeType> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
index b79ae1fa32..f15d950201 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
@@ -31,7 +31,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cédric Briançon (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_CellGeometryCode extends CodeListAdapter<MD_CellGeometryCode, CellGeometry> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
index 6962f0337c..9efc26a8cd 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
@@ -37,7 +37,6 @@ import org.apache.sis.internal.jaxb.cat.CodeListUID;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_CharacterSetCode extends XmlAdapter<MD_CharacterSetCode, Charset> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
index e9bae67700..68c0bd3fd5 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_ClassificationCode extends CodeListAdapter<MD_ClassificationCode, Classification> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
index e032d36e13..a915dcf1cc 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_CoverageContentTypeCode
         extends CodeListAdapter<MD_CoverageContentTypeCode, CoverageContentType>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
index 800da29971..aeb67d5774 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_DatatypeCode extends CodeListAdapter<MD_DatatypeCode, Datatype> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
index 852c9dd062..8e051d7047 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_DimensionNameTypeCode
         extends CodeListAdapter<MD_DimensionNameTypeCode, DimensionNameType>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
index 8bc658856a..5fe61990da 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
@@ -31,7 +31,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cédric Briançon (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_GeometricObjectTypeCode
         extends CodeListAdapter<MD_GeometricObjectTypeCode, GeometricObjectType>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
index c0f24884e4..4cd0dd7e88 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
@@ -31,7 +31,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cédric Briançon (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_ImagingConditionCode
         extends CodeListAdapter<MD_ImagingConditionCode, ImagingCondition>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
index 8b424db4f0..777ee1f13b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
@@ -31,7 +31,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cédric Briançon (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_KeywordTypeCode extends CodeListAdapter<MD_KeywordTypeCode, KeywordType> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
index 02a8595b39..fdafa7b10c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
@@ -32,7 +32,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_MaintenanceFrequencyCode
         extends CodeListAdapter<MD_MaintenanceFrequencyCode, MaintenanceFrequency>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
index b46aae3c0c..422a177d2b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
@@ -31,7 +31,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cédric Briançon (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_MediumFormatCode extends CodeListAdapter<MD_MediumFormatCode, MediumFormat> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
index b2f18be9b3..2f3faa3c3f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
@@ -31,7 +31,6 @@ import org.apache.sis.internal.metadata.legacy.MediumName;
  * @author  Cédric Briançon (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_MediumNameCode extends CodeListAdapter<MD_MediumNameCode, MediumName> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
index 3f1ae673ba..d81b2e9643 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
@@ -30,7 +30,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cédric Briançon (Geomatys)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_ObligationCode extends EnumAdapter<MD_ObligationCode, Obligation> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
index 4b88e53c74..8293bb9859 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
@@ -31,7 +31,6 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cullen Rombach (Image Matters)
  * @version 1.0
  * @since   0.3
- * @module
  */
 public final class MD_PixelOrientationCode extends EnumAdapter<MD_PixelOrientationCode, PixelOrientation> {
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
index 8843ab8a10..792fa8cedf 100644
... 27675 lines suppressed ...


[sis] 01/06: Set the build requirement to Java 18, but the compilation target stay Java 11. The intent is to replace our custom @preformat javadoc tag by the @snippet tag, which is new in Java 18.

Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 21add5df507b7791990a3a1683118e5547810e6b
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Dec 27 14:24:24 2022 +0100

    Set the build requirement to Java 18, but the compilation target stay Java 11.
    The intent is to replace our custom @preformat javadoc tag by the @snippet tag,
    which is new in Java 18.
---
 README                                                              | 4 ++--
 application/sis-javafx/doc/readme.txt                               | 2 --
 .../src/main/java/org/apache/sis/measure/UnitServices.java          | 2 +-
 ide-project/NetBeans/nbproject/project.properties                   | 4 ++--
 pom.xml                                                             | 6 +++---
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 6d6ccb228f..309a01c880 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Welcome to Apache SIS <https://sis.apache.org>
 ==============================================
 
 SIS is a Java language library for developing geospatial applications.
-The library is an implementation of GeoAPI 3.0.1 interfaces and can be used
+The library is an implementation of GeoAPI 3.0.2 interfaces and can be used
 for desktop or server applications. Apache SIS provides data structures for
 geographic features and associated metadata along with methods to manipulate
 those data structures. The SIS metadata module forms the base of the library
@@ -26,7 +26,7 @@ Getting Started
 
 Running the library part of Apache SIS requires Java 11 or higher.
 Running the JavaFX application part requires Java 16 or higher.
-Building SIS requires Java 17 or higher
+Building SIS requires Java 18 or higher
 together with Maven 3 <https://maven.apache.org/> build system.
 To build SIS, use the following command in this directory:
 
diff --git a/application/sis-javafx/doc/readme.txt b/application/sis-javafx/doc/readme.txt
index ba6acfbc71..d6afa19a94 100644
--- a/application/sis-javafx/doc/readme.txt
+++ b/application/sis-javafx/doc/readme.txt
@@ -12,8 +12,6 @@ NetBeans Ant project, open the following file:
 
 And add the following lines:
 
-    javac.source     = 17
-    javac.target     = 17
     javac.modulepath = /path/to/my/install/javafx-sdk/lib
     javafx.options   = --add-modules javafx.graphics,javafx.controls,javafx.web
     src.javafx.dir   = ${project.root}/application/sis-javafx/src/main/java
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java b/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
index 86a65df55a..93622e2134 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
@@ -211,7 +211,7 @@ public class UnitServices extends ServiceProvider implements SystemOfUnitsServic
     /**
      * Returns a quantity format for the default locale.
      *
-     * @return a {@link tech.uom.seshat.QuantityFormat} instance for quantities.
+     * @return a {@link org.apache.sis.measure.QuantityFormat} instance for quantities.
      * @since  1.4
      */
     @Override
diff --git a/ide-project/NetBeans/nbproject/project.properties b/ide-project/NetBeans/nbproject/project.properties
index 7a129754dd..d68acf9ea8 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -37,8 +37,8 @@ project.license      = apache20
 project.licensePath  = ../LicenseHeader.txt
 no.dependencies      = true
 source.encoding      = UTF-8
-javac.source         = 11
-javac.target         = 11
+javac.source         = 18
+javac.target         = 18
 platform.active      = default_platform
 junit.forkmode       = once
 run.jvmargs          = -enableassertions ${javafx.options} \
diff --git a/pom.xml b/pom.xml
index 1d1a67e75c..48a80bf84c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
      Maven project configuration file
      http://maven.apache.org/
 
-     Apache SIS build requires Java 17 or higher, but compiled files can be executed on Java 11.
+     Apache SIS build requires Java 18 or higher, but compiled files can be executed on Java 11.
      Setting the SIS_DATA environment variable before build is optional but recommended.
 
      Build development snapshot:        mvn clean install
@@ -58,7 +58,7 @@
   <description>
     Apache Spatial Information System (SIS) is a free software, Java language library for developing geospatial applications.
     SIS provides data structures for geographic features and associated metadata along with methods to manipulate those data structures.
-    The library is an implementation of GeoAPI 3.0.1 interfaces and can be used for desktop or server applications.
+    The library is an implementation of GeoAPI 3.0.2 interfaces and can be used for desktop or server applications.
     The SIS metadata module forms the base of the library and enables the creation of metadata objects which comply with the ISO 19115 international standard.
     The SIS referencing module enable the construction of geodetic data structures for geospatial referencing as defined by ISO 19111 standard,
     along with the associated operations which enable the transformation of coordinates between different reference systems.
@@ -625,7 +625,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>17</version>
+                  <version>18</version>
                 </requireJavaVersion>
               </rules>
             </configuration>


[sis] 05/06: Remove `strictfp` keyword in test classes. It has no effect since tests are executed with Java 18, which ignores this keyword.

Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit ed3307ddde7f58721f12b8e5478665ea1b98dd92
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Dec 28 16:54:47 2022 +0100

    Remove `strictfp` keyword in test classes.
    It has no effect since tests are executed with Java 18, which ignores this keyword.
---
 .../src/test/java/org/apache/sis/console/AboutCommandTest.java        | 2 +-
 .../src/test/java/org/apache/sis/console/CRSCommandTest.java          | 2 +-
 .../src/test/java/org/apache/sis/console/CommandRunnerTest.java       | 2 +-
 .../src/test/java/org/apache/sis/console/HelpCommandTest.java         | 2 +-
 .../src/test/java/org/apache/sis/console/MetadataCommandTest.java     | 2 +-
 .../src/test/java/org/apache/sis/console/MimeTypeCommandTest.java     | 2 +-
 .../src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java     | 2 +-
 .../src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java | 2 +-
 .../test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java   | 2 +-
 .../src/test/java/org/apache/sis/gui/coverage/GridViewApp.java        | 2 +-
 .../src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java   | 2 +-
 .../src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java   | 2 +-
 .../java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java | 2 +-
 .../src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java | 2 +-
 .../test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java | 2 +-
 .../src/test/java/org/apache/sis/openoffice/TransformerTest.java      | 2 +-
 .../src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java  | 2 +-
 .../test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java   | 2 +-
 .../src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java | 2 +-
 .../src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java        | 2 +-
 .../src/test/java/org/apache/sis/test/suite/AWSTestSuite.java         | 2 +-
 .../java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java  | 2 +-
 core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java        | 2 +-
 core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java       | 2 +-
 .../src/test/java/org/apache/sis/cql/ExpressionReadingTest.java       | 2 +-
 .../src/test/java/org/apache/sis/cql/ExpressionWritingTest.java       | 2 +-
 core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java  | 2 +-
 core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java  | 2 +-
 core/sis-cql/src/test/java/org/apache/sis/cql/QueryReadingTest.java   | 2 +-
 core/sis-cql/src/test/java/org/apache/sis/cql/QueryWritingTest.java   | 2 +-
 .../src/test/java/org/apache/sis/coverage/CategoryListTest.java       | 2 +-
 .../src/test/java/org/apache/sis/coverage/CategoryTest.java           | 2 +-
 .../src/test/java/org/apache/sis/coverage/SampleDimensionTest.java    | 2 +-
 .../src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java  | 2 +-
 .../java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java   | 2 +-
 .../java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java  | 2 +-
 .../org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java   | 2 +-
 .../test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java    | 2 +-
 .../java/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java    | 2 +-
 .../test/java/org/apache/sis/coverage/grid/GridDerivationTest.java    | 2 +-
 .../src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java    | 2 +-
 .../src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java  | 2 +-
 .../test/java/org/apache/sis/coverage/grid/GridOrientationTest.java   | 2 +-
 .../test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java  | 2 +-
 .../java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java  | 2 +-
 .../src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java | 2 +-
 .../java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java | 2 +-
 .../src/test/java/org/apache/sis/feature/AbstractFeatureTest.java     | 2 +-
 .../src/test/java/org/apache/sis/feature/AbstractOperationTest.java   | 2 +-
 .../src/test/java/org/apache/sis/feature/CharacteristicMapTest.java   | 2 +-
 .../test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java   | 2 +-
 .../src/test/java/org/apache/sis/feature/CustomAttribute.java         | 2 +-
 .../test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java  | 2 +-
 .../test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java    | 2 +-
 .../src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java  | 2 +-
 .../src/test/java/org/apache/sis/feature/DenseFeatureTest.java        | 2 +-
 .../src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java   | 2 +-
 .../src/test/java/org/apache/sis/feature/FeatureFormatTest.java       | 2 +-
 .../src/test/java/org/apache/sis/feature/FeatureOperationsTest.java   | 2 +-
 .../src/test/java/org/apache/sis/feature/FeatureTestCase.java         | 2 +-
 .../src/test/java/org/apache/sis/feature/FeaturesTest.java            | 2 +-
 .../src/test/java/org/apache/sis/feature/LinkOperationTest.java       | 2 +-
 .../test/java/org/apache/sis/feature/MultiValuedAttributeTest.java    | 2 +-
 .../sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java | 2 +-
 .../src/test/java/org/apache/sis/feature/PropertySingletonTest.java   | 2 +-
 .../test/java/org/apache/sis/feature/SingletonAssociationTest.java    | 2 +-
 .../src/test/java/org/apache/sis/feature/SingletonAttributeTest.java  | 2 +-
 .../src/test/java/org/apache/sis/feature/SparseFeatureTest.java       | 2 +-
 .../src/test/java/org/apache/sis/feature/StringJoinOperationTest.java | 2 +-
 .../org/apache/sis/feature/builder/AssociationRoleBuilderTest.java    | 2 +-
 .../java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java | 2 +-
 .../org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java | 2 +-
 .../java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java   | 2 +-
 .../src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java   | 2 +-
 .../test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java  | 2 +-
 .../java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java | 2 +-
 .../java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java  | 2 +-
 .../org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java    | 2 +-
 .../src/test/java/org/apache/sis/filter/CapabilitiesTest.java         | 2 +-
 .../src/test/java/org/apache/sis/filter/ComparisonFilterTest.java     | 2 +-
 .../src/test/java/org/apache/sis/filter/IdentifierFilterTest.java     | 2 +-
 .../src/test/java/org/apache/sis/filter/LeafExpressionTest.java       | 2 +-
 .../src/test/java/org/apache/sis/filter/LikeFilterTest.java           | 2 +-
 .../src/test/java/org/apache/sis/filter/LogicalFilterTest.java        | 2 +-
 .../src/test/java/org/apache/sis/filter/PeriodLiteral.java            | 2 +-
 .../src/test/java/org/apache/sis/filter/TemporalFilterTest.java       | 2 +-
 core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java   | 2 +-
 .../src/test/java/org/apache/sis/image/BandSelectImageTest.java       | 2 +-
 .../src/test/java/org/apache/sis/image/BandedIteratorTest.java        | 2 +-
 .../src/test/java/org/apache/sis/image/BandedSampleConverterTest.java | 2 +-
 .../src/test/java/org/apache/sis/image/ComputedImageTest.java         | 2 +-
 core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java | 2 +-
 .../src/test/java/org/apache/sis/image/ImageCombinerTest.java         | 2 +-
 .../src/test/java/org/apache/sis/image/ImageProcessorTest.java        | 2 +-
 .../sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java | 2 +-
 .../src/test/java/org/apache/sis/image/InterpolationTest.java         | 2 +-
 .../src/test/java/org/apache/sis/image/LinearIteratorTest.java        | 2 +-
 .../src/test/java/org/apache/sis/image/MaskedImageTest.java           | 2 +-
 .../src/test/java/org/apache/sis/image/PixelIteratorTest.java         | 2 +-
 .../src/test/java/org/apache/sis/image/PlanarImageTest.java           | 2 +-
 .../src/test/java/org/apache/sis/image/ResampledImageTest.java        | 2 +-
 .../src/test/java/org/apache/sis/image/ResamplingGridTest.java        | 2 +-
 .../src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java  | 2 +-
 core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java   | 4 ++--
 .../src/test/java/org/apache/sis/image/TiledImageMock.java            | 2 +-
 .../src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java    | 2 +-
 .../src/test/java/org/apache/sis/index/tree/PointTreeTest.java        | 2 +-
 .../test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java | 2 +-
 .../java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java    | 2 +-
 .../java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java | 2 +-
 .../org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java  | 2 +-
 .../org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java    | 2 +-
 .../java/org/apache/sis/internal/feature/AttributeConventionTest.java | 2 +-
 .../test/java/org/apache/sis/internal/feature/GeometriesTestCase.java | 2 +-
 .../test/java/org/apache/sis/internal/feature/GeometryTypeTest.java   | 2 +-
 .../test/java/org/apache/sis/internal/feature/esri/FactoryTest.java   | 2 +-
 .../test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java    | 2 +-
 .../test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java  | 2 +-
 .../java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java | 2 +-
 .../test/java/org/apache/sis/internal/feature/jts/FactoryTest.java    | 2 +-
 .../src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java    | 2 +-
 .../java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java    | 2 +-
 .../java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/filter/FunctionNamesTest.java   | 2 +-
 .../java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java   | 2 +-
 .../org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java  | 2 +-
 .../org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java   | 2 +-
 .../apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java    | 2 +-
 .../src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java | 2 +-
 .../java/org/apache/sis/internal/processing/isoline/IsolinesTest.java | 2 +-
 core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java | 2 +-
 .../src/test/java/org/apache/sis/test/feature/FeatureComparator.java  | 2 +-
 .../src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java     | 2 +-
 .../java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java   | 2 +-
 .../org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java     | 2 +-
 .../org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java     | 2 +-
 .../test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java   | 2 +-
 .../java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java    | 2 +-
 .../test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java  | 2 +-
 .../test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java | 2 +-
 .../src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java   | 2 +-
 .../test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java    | 2 +-
 .../org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java     | 2 +-
 .../test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java  | 2 +-
 .../src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java | 2 +-
 .../sis/internal/jaxb/metadata/replace/QualityParameterTest.java      | 2 +-
 .../sis/internal/jaxb/metadata/replace/ServiceParameterTest.java      | 2 +-
 .../src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java | 2 +-
 .../test/java/org/apache/sis/internal/metadata/IdentifiersTest.java   | 2 +-
 .../org/apache/sis/internal/metadata/ImplementationHelperTest.java    | 2 +-
 .../src/test/java/org/apache/sis/internal/metadata/MergerTest.java    | 2 +-
 .../test/java/org/apache/sis/internal/metadata/NameMeaningTest.java   | 2 +-
 .../java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java   | 2 +-
 .../java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java   | 2 +-
 .../java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java     | 2 +-
 .../java/org/apache/sis/internal/simple/SimpleIdentifierTest.java     | 2 +-
 .../java/org/apache/sis/internal/test/DocumentComparatorTest.java     | 2 +-
 .../src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java   | 2 +-
 .../src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java   | 2 +-
 .../src/test/java/org/apache/sis/metadata/HashCodeTest.java           | 2 +-
 .../src/test/java/org/apache/sis/metadata/InformationMapTest.java     | 2 +-
 .../src/test/java/org/apache/sis/metadata/MetadataCopierTest.java     | 2 +-
 .../src/test/java/org/apache/sis/metadata/MetadataStandardTest.java   | 2 +-
 .../src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java | 2 +-
 .../src/test/java/org/apache/sis/metadata/NameMapTest.java            | 2 +-
 .../src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java   | 2 +-
 .../test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java   | 2 +-
 .../test/java/org/apache/sis/metadata/PropertyInformationTest.java    | 2 +-
 .../src/test/java/org/apache/sis/metadata/PrunerTest.java             | 2 +-
 .../src/test/java/org/apache/sis/metadata/SpecialCasesTest.java       | 2 +-
 .../src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java   | 2 +-
 .../src/test/java/org/apache/sis/metadata/TreeNodeTest.java           | 2 +-
 .../src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java    | 2 +-
 .../src/test/java/org/apache/sis/metadata/TreeTableViewTest.java      | 2 +-
 .../src/test/java/org/apache/sis/metadata/TypeMapTest.java            | 2 +-
 .../src/test/java/org/apache/sis/metadata/ValueMapTest.java           | 2 +-
 .../src/test/java/org/apache/sis/metadata/iso/APIVerifier.java        | 2 +-
 .../src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java    | 2 +-
 .../src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java | 2 +-
 .../test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java  | 2 +-
 .../test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java    | 2 +-
 .../test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java | 2 +-
 .../org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java | 2 +-
 .../org/apache/sis/metadata/iso/citation/DefaultCitationTest.java     | 2 +-
 .../java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java | 2 +-
 .../apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java   | 2 +-
 .../java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java | 2 +-
 .../sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java      | 2 +-
 .../java/org/apache/sis/metadata/iso/content/DefaultBandTest.java     | 2 +-
 .../java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java    | 2 +-
 .../sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java     | 2 +-
 .../src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 2 +-
 .../sis/metadata/iso/identification/DefaultBrowseGraphicTest.java     | 2 +-
 .../sis/metadata/iso/identification/DefaultCoupledResourceTest.java   | 2 +-
 .../metadata/iso/identification/DefaultDataIdentificationTest.java    | 2 +-
 .../apache/sis/metadata/iso/identification/DefaultKeywordsTest.java   | 2 +-
 .../iso/identification/DefaultRepresentativeFractionTest.java         | 2 +-
 .../apache/sis/metadata/iso/identification/DefaultResolutionTest.java | 2 +-
 .../metadata/iso/identification/DefaultServiceIdentificationTest.java | 2 +-
 .../java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java  | 2 +-
 .../org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java   | 2 +-
 .../sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java     | 2 +-
 .../java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java | 2 +-
 .../sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java      | 2 +-
 .../apache/sis/metadata/iso/quality/DefaultDomainConsistencyTest.java | 2 +-
 .../apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java  | 2 +-
 .../sis/metadata/iso/quality/DefaultQuantitativeResultTest.java       | 2 +-
 .../test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java  | 2 +-
 .../org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java  | 2 +-
 .../java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java     | 2 +-
 .../java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java    | 2 +-
 .../src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java | 2 +-
 .../src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java | 2 +-
 .../test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java   | 2 +-
 .../src/test/java/org/apache/sis/metadata/xml/TestUsingFile.java      | 2 +-
 .../src/test/java/org/apache/sis/test/MetadataAssert.java             | 2 +-
 .../test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java  | 2 +-
 .../src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java  | 2 +-
 .../src/test/java/org/apache/sis/test/mock/MetadataMock.java          | 2 +-
 .../src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java       | 2 +-
 .../src/test/java/org/apache/sis/test/sql/TestDatabase.java           | 2 +-
 .../src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java    | 2 +-
 .../test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java | 2 +-
 .../src/test/java/org/apache/sis/test/xml/DocumentComparator.java     | 2 +-
 .../src/test/java/org/apache/sis/test/xml/PackageVerifier.java        | 2 +-
 .../src/test/java/org/apache/sis/test/xml/SchemaCompliance.java       | 2 +-
 core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java | 2 +-
 .../src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java   | 2 +-
 .../src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java | 2 +-
 .../test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java    | 2 +-
 .../src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java      | 2 +-
 .../src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java  | 2 +-
 .../src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java  | 2 +-
 .../src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java    | 2 +-
 .../sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java | 2 +-
 .../src/test/java/org/apache/sis/util/iso/TypeNamesTest.java          | 2 +-
 .../sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java | 2 +-
 .../test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java    | 2 +-
 .../src/test/java/org/apache/sis/xml/LegacyCodesTest.java             | 2 +-
 .../src/test/java/org/apache/sis/xml/MarshallerPoolTest.java          | 2 +-
 .../sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java | 2 +-
 .../src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java    | 2 +-
 core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java | 2 +-
 .../src/test/java/org/apache/sis/xml/ReferenceResolverMock.java       | 2 +-
 .../src/test/java/org/apache/sis/xml/TransformerTest.java             | 2 +-
 .../src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java  | 2 +-
 .../src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java         | 2 +-
 .../src/test/java/org/apache/sis/xml/ValueConverterTest.java          | 2 +-
 .../src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java        | 2 +-
 core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java     | 2 +-
 core/sis-metadata/src/test/java/org/apache/sis/xml/XPointerTest.java  | 2 +-
 .../sis/internal/map/coverage/MultiResolutionCoverageLoaderTest.java  | 2 +-
 .../src/test/java/org/apache/sis/test/suite/PortrayalTestSuite.java   | 2 +-
 .../org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java    | 2 +-
 .../apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java  | 2 +-
 .../java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java | 2 +-
 .../java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java   | 2 +-
 .../sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java    | 2 +-
 .../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java       | 2 +-
 .../org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java  | 2 +-
 .../test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java | 2 +-
 .../src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java   | 2 +-
 .../src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java      | 2 +-
 .../src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java   | 2 +-
 .../src/test/java/org/apache/sis/geometry/CurveExtremumTest.java      | 2 +-
 .../src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java   | 2 +-
 .../src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java   | 2 +-
 .../src/test/java/org/apache/sis/geometry/Envelope2DTest.java         | 2 +-
 .../src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java    | 2 +-
 .../src/test/java/org/apache/sis/geometry/EnvelopesTest.java          | 2 +-
 .../test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java  | 2 +-
 .../src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java    | 2 +-
 .../src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java  | 2 +-
 .../src/test/java/org/apache/sis/geometry/Shapes2DTest.java           | 2 +-
 .../src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java        | 2 +-
 .../src/test/java/org/apache/sis/geometry/TransformTestCase.java      | 2 +-
 .../test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java   | 2 +-
 .../internal/jaxb/referencing/CC_GeneralOperationParameterTest.java   | 2 +-
 .../sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java | 2 +-
 .../test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java  | 2 +-
 .../sis/internal/jaxb/referencing/SecondDefiningParameterTest.java    | 2 +-
 .../test/java/org/apache/sis/internal/referencing/AxesMapperTest.java | 2 +-
 .../java/org/apache/sis/internal/referencing/AxisDirectionsTest.java  | 2 +-
 .../org/apache/sis/internal/referencing/CoordinateOperationsTest.java | 2 +-
 .../org/apache/sis/internal/referencing/DefinitionVerifierTest.java   | 2 +-
 .../sis/internal/referencing/EllipsoidalHeightCombinerTest.java       | 2 +-
 .../java/org/apache/sis/internal/referencing/ExtentSelectorTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/referencing/FormulasTest.java   | 2 +-
 .../apache/sis/internal/referencing/GeodeticObjectBuilderTest.java    | 2 +-
 .../test/java/org/apache/sis/internal/referencing/LazySetTest.java    | 2 +-
 .../sis/internal/referencing/PositionalAccuracyConstantTest.java      | 2 +-
 .../org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java | 2 +-
 .../org/apache/sis/internal/referencing/ServicesForMetadataTest.java  | 2 +-
 .../org/apache/sis/internal/referencing/VerticalDatumTypesTest.java   | 2 +-
 .../java/org/apache/sis/internal/referencing/WKTKeywordsTest.java     | 2 +-
 .../java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java    | 2 +-
 .../org/apache/sis/internal/referencing/WraparoundApplicatorTest.java | 2 +-
 .../org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java    | 2 +-
 .../org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java   | 2 +-
 .../org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java | 2 +-
 .../java/org/apache/sis/internal/referencing/provider/AffineTest.java | 2 +-
 .../internal/referencing/provider/CoordinateFrameRotationTest.java    | 2 +-
 .../internal/referencing/provider/DatumShiftGridCompressedTest.java   | 2 +-
 .../sis/internal/referencing/provider/DatumShiftGridFileTest.java     | 2 +-
 .../apache/sis/internal/referencing/provider/DatumShiftTestCase.java  | 2 +-
 .../referencing/provider/FranceGeocentricInterpolationTest.java       | 2 +-
 .../sis/internal/referencing/provider/GeocentricTranslationTest.java  | 2 +-
 .../sis/internal/referencing/provider/Geographic3Dto2DTest.java       | 2 +-
 .../sis/internal/referencing/provider/GeographicOffsetsTest.java      | 2 +-
 .../sis/internal/referencing/provider/LongitudeRotationTest.java      | 2 +-
 .../apache/sis/internal/referencing/provider/MapProjectionTest.java   | 2 +-
 .../org/apache/sis/internal/referencing/provider/MolodenskyTest.java  | 2 +-
 .../java/org/apache/sis/internal/referencing/provider/NADCONTest.java | 2 +-
 .../java/org/apache/sis/internal/referencing/provider/NTv2Test.java   | 2 +-
 .../sis/internal/referencing/provider/PositionVector7ParamTest.java   | 2 +-
 .../org/apache/sis/internal/referencing/provider/ProviderMock.java    | 2 +-
 .../org/apache/sis/internal/referencing/provider/ProvidersTest.java   | 2 +-
 .../apache/sis/internal/referencing/provider/SeismicBinGridMock.java  | 2 +-
 .../sis/internal/referencing/provider/TransverseMercatorTest.java     | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/ColorsTest.java               | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java       | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/ConventionTest.java           | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/ElementTest.java              | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/FormatterTest.java            | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java  | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/SymbolsTest.java              | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java       | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java        | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java            | 2 +-
 .../src/test/java/org/apache/sis/io/wkt/WKTParserTest.java            | 2 +-
 .../org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java | 2 +-
 .../java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java | 2 +-
 .../java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java | 2 +-
 .../test/java/org/apache/sis/parameter/DefaultParameterValueTest.java | 4 ++--
 .../java/org/apache/sis/parameter/MapProjectionParametersTest.java    | 2 +-
 .../java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java   | 2 +-
 .../src/test/java/org/apache/sis/parameter/MatrixParametersTest.java  | 2 +-
 .../src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java  | 2 +-
 .../src/test/java/org/apache/sis/parameter/ParameterFormatTest.java   | 2 +-
 .../test/java/org/apache/sis/parameter/ParameterMarshallingTest.java  | 2 +-
 .../java/org/apache/sis/parameter/ParameterValueGroupWrapper.java     | 2 +-
 .../src/test/java/org/apache/sis/parameter/ParametersTest.java        | 2 +-
 .../src/test/java/org/apache/sis/parameter/TensorParametersTest.java  | 2 +-
 .../src/test/java/org/apache/sis/parameter/TensorValuesTest.java      | 2 +-
 .../org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java | 2 +-
 .../java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java | 2 +-
 .../java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java | 2 +-
 .../java/org/apache/sis/referencing/AbstractReferenceSystemTest.java  | 2 +-
 .../test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java  | 2 +-
 .../src/test/java/org/apache/sis/referencing/BuilderMock.java         | 2 +-
 .../src/test/java/org/apache/sis/referencing/BuilderTest.java         | 2 +-
 .../src/test/java/org/apache/sis/referencing/CRSTest.java             | 2 +-
 .../src/test/java/org/apache/sis/referencing/CommonCRSTest.java       | 2 +-
 .../test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java | 2 +-
 .../java/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java     | 2 +-
 .../test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java  | 2 +-
 .../test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java  | 2 +-
 .../test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java   | 2 +-
 .../test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java | 2 +-
 .../src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java | 2 +-
 .../test/java/org/apache/sis/referencing/StandardDefinitionsTest.java | 2 +-
 .../src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java | 2 +-
 .../java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java   | 2 +-
 .../java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java    | 2 +-
 .../org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java     | 2 +-
 .../java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java | 2 +-
 .../java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java   | 2 +-
 .../java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java | 2 +-
 .../test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
 .../java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java  | 2 +-
 .../java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java   | 2 +-
 .../java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java   | 2 +-
 .../src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java    | 2 +-
 .../test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java    | 2 +-
 .../src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java    | 2 +-
 .../src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java   | 2 +-
 .../src/test/java/org/apache/sis/referencing/cs/CodesTest.java        | 2 +-
 .../java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java     | 2 +-
 .../java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java    | 2 +-
 .../java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java     | 2 +-
 .../apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java    | 2 +-
 .../java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java  | 2 +-
 .../java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java  | 2 +-
 .../test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java   | 2 +-
 .../java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java    | 2 +-
 .../org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java     | 2 +-
 .../src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java    | 2 +-
 .../src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java      | 2 +-
 .../src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java  | 2 +-
 .../src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java   | 2 +-
 .../org/apache/sis/referencing/datum/BursaWolfParametersTest.java     | 2 +-
 .../java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java   | 2 +-
 .../org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java    | 2 +-
 .../org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java    | 2 +-
 .../org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java    | 2 +-
 .../org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java    | 2 +-
 .../test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java | 2 +-
 .../test/java/org/apache/sis/referencing/datum/HardCodedDatum.java    | 2 +-
 .../test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java | 2 +-
 .../java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java   | 2 +-
 .../java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java | 2 +-
 .../org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java | 2 +-
 .../apache/sis/referencing/factory/CommonAuthorityFactoryTest.java    | 2 +-
 .../sis/referencing/factory/ConcurrentAuthorityFactoryTest.java       | 4 ++--
 .../org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java | 2 +-
 .../apache/sis/referencing/factory/IdentifiedObjectFinderTest.java    | 4 ++--
 .../apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java   | 2 +-
 .../java/org/apache/sis/referencing/factory/TestFactorySource.java    | 2 +-
 .../java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java  | 2 +-
 .../org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java     | 2 +-
 .../java/org/apache/sis/referencing/factory/sql/TableInfoTest.java    | 2 +-
 .../sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java     | 2 +-
 .../java/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java  | 2 +-
 .../org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java | 2 +-
 .../sis/referencing/operation/CoordinateOperationFinderTest.java      | 2 +-
 .../sis/referencing/operation/CoordinateOperationRegistryTest.java    | 2 +-
 .../sis/referencing/operation/DefaultConcatenatedOperationTest.java   | 2 +-
 .../org/apache/sis/referencing/operation/DefaultConversionTest.java   | 2 +-
 .../referencing/operation/DefaultCoordinateOperationFactoryTest.java  | 2 +-
 .../java/org/apache/sis/referencing/operation/DefaultFormulaTest.java | 2 +-
 .../apache/sis/referencing/operation/DefaultOperationMethodTest.java  | 2 +-
 .../sis/referencing/operation/DefaultPassThroughOperationTest.java    | 2 +-
 .../apache/sis/referencing/operation/DefaultTransformationTest.java   | 2 +-
 .../org/apache/sis/referencing/operation/HardCodedConversions.java    | 2 +-
 .../sis/referencing/operation/SingleOperationMarshallingTest.java     | 2 +-
 .../sis/referencing/operation/builder/LinearTransformBuilderTest.java | 2 +-
 .../org/apache/sis/referencing/operation/builder/LinearizerTest.java  | 2 +-
 .../referencing/operation/builder/LocalizationGridBuilderTest.java    | 2 +-
 .../apache/sis/referencing/operation/builder/NonLinearTransform.java  | 2 +-
 .../apache/sis/referencing/operation/builder/ResidualGridTest.java    | 2 +-
 .../sis/referencing/operation/matrix/AffineTransforms2DTest.java      | 2 +-
 .../apache/sis/referencing/operation/matrix/GeneralMatrixTest.java    | 2 +-
 .../org/apache/sis/referencing/operation/matrix/MatricesTest.java     | 2 +-
 .../java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java | 2 +-
 .../java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java | 2 +-
 .../java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java | 2 +-
 .../java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java | 2 +-
 .../org/apache/sis/referencing/operation/matrix/MatrixTestCase.java   | 2 +-
 .../apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java  | 2 +-
 .../java/org/apache/sis/referencing/operation/matrix/SolverTest.java  | 2 +-
 .../sis/referencing/operation/projection/AlbersEqualAreaTest.java     | 2 +-
 .../sis/referencing/operation/projection/AuthalicConversionTest.java  | 2 +-
 .../referencing/operation/projection/AzimuthalEquidistantTest.java    | 2 +-
 .../sis/referencing/operation/projection/CassiniSoldnerTest.java      | 2 +-
 .../sis/referencing/operation/projection/ConformalProjectionTest.java | 2 +-
 .../referencing/operation/projection/CylindricalEqualAreaTest.java    | 2 +-
 .../sis/referencing/operation/projection/EquirectangularTest.java     | 2 +-
 .../apache/sis/referencing/operation/projection/InitializerTest.java  | 2 +-
 .../operation/projection/LambertAzimuthalEqualAreaTest.java           | 2 +-
 .../referencing/operation/projection/LambertConicConformalTest.java   | 2 +-
 .../sis/referencing/operation/projection/MapProjectionTestCase.java   | 2 +-
 .../referencing/operation/projection/MercatorMethodComparison.java    | 2 +-
 .../org/apache/sis/referencing/operation/projection/MercatorTest.java | 2 +-
 .../apache/sis/referencing/operation/projection/MeridianArcTest.java  | 2 +-
 .../operation/projection/ModifiedAzimuthalEquidistantTest.java        | 2 +-
 .../apache/sis/referencing/operation/projection/MollweideTest.java    | 2 +-
 .../java/org/apache/sis/referencing/operation/projection/NoOp.java    | 2 +-
 .../referencing/operation/projection/NormalizedProjectionTest.java    | 2 +-
 .../sis/referencing/operation/projection/ObliqueMercatorTest.java     | 2 +-
 .../referencing/operation/projection/ObliqueStereographicTest.java    | 2 +-
 .../apache/sis/referencing/operation/projection/OrthographicTest.java | 2 +-
 .../sis/referencing/operation/projection/PolarStereographicTest.java  | 2 +-
 .../apache/sis/referencing/operation/projection/PolyconicTest.java    | 2 +-
 .../referencing/operation/projection/ProjectionResultComparator.java  | 2 +-
 .../sis/referencing/operation/projection/SatelliteTrackingTest.java   | 2 +-
 .../apache/sis/referencing/operation/projection/SinusoidalTest.java   | 2 +-
 .../sis/referencing/operation/projection/TransverseMercatorTest.java  | 2 +-
 .../sis/referencing/operation/projection/ZonedGridSystemTest.java     | 2 +-
 .../operation/transform/AbridgedMolodenskyTransformTest.java          | 2 +-
 .../referencing/operation/transform/AbstractMathTransformTest.java    | 2 +-
 .../sis/referencing/operation/transform/CartesianToPolarTest.java     | 2 +-
 .../sis/referencing/operation/transform/CartesianToSphericalTest.java | 2 +-
 .../referencing/operation/transform/ConcatenatedTransformTest.java    | 2 +-
 .../sis/referencing/operation/transform/ContextualParametersTest.java | 2 +-
 .../apache/sis/referencing/operation/transform/CoordinateDomain.java  | 2 +-
 .../sis/referencing/operation/transform/CoordinateDomainTest.java     | 2 +-
 .../operation/transform/CoordinateSystemTransformTest.java            | 2 +-
 .../apache/sis/referencing/operation/transform/CopyTransformTest.java | 2 +-
 .../operation/transform/DefaultMathTransformFactoryTest.java          | 2 +-
 .../sis/referencing/operation/transform/DomainDefinitionTest.java     | 2 +-
 .../operation/transform/EllipsoidToCentricTransformTest.java          | 2 +-
 .../referencing/operation/transform/ExponentialTransform1DTest.java   | 2 +-
 .../operation/transform/InterpolatedGeocentricTransformTest.java      | 2 +-
 .../operation/transform/InterpolatedMolodenskyTransformTest.java      | 2 +-
 .../referencing/operation/transform/InterpolatedTransformTest.java    | 2 +-
 .../sis/referencing/operation/transform/IterationStrategyTest.java    | 2 +-
 .../sis/referencing/operation/transform/LinearInterpolator1DTest.java | 2 +-
 .../sis/referencing/operation/transform/LinearTransformTest.java      | 2 +-
 .../referencing/operation/transform/LogarithmicTransform1DTest.java   | 2 +-
 .../sis/referencing/operation/transform/MathTransformFactoryBase.java | 2 +-
 .../sis/referencing/operation/transform/MathTransformFactoryMock.java | 2 +-
 .../sis/referencing/operation/transform/MathTransformTestCase.java    | 2 +-
 .../sis/referencing/operation/transform/MathTransformWrapper.java     | 2 +-
 .../sis/referencing/operation/transform/MathTransformsTest.java       | 2 +-
 .../sis/referencing/operation/transform/MolodenskyTransformTest.java  | 2 +-
 .../sis/referencing/operation/transform/OperationMethodSetTest.java   | 2 +-
 .../sis/referencing/operation/transform/PassThroughTransformTest.java | 2 +-
 .../sis/referencing/operation/transform/PolarToCartesianTest.java     | 2 +-
 .../apache/sis/referencing/operation/transform/PoleRotationTest.java  | 2 +-
 .../sis/referencing/operation/transform/ProjectiveTransformTest.java  | 2 +-
 .../apache/sis/referencing/operation/transform/PseudoTransform.java   | 2 +-
 .../sis/referencing/operation/transform/RandomFailureTransform.java   | 2 +-
 .../sis/referencing/operation/transform/ScaleTransformTest.java       | 2 +-
 .../sis/referencing/operation/transform/SinusoidalShiftGrid.java      | 2 +-
 .../referencing/operation/transform/SpecializableTransformTest.java   | 2 +-
 .../sis/referencing/operation/transform/SphericalToCartesianTest.java | 2 +-
 .../sis/referencing/operation/transform/TransferFunctionTest.java     | 2 +-
 .../referencing/operation/transform/TransformResultComparator.java    | 2 +-
 .../sis/referencing/operation/transform/TransformSeparatorTest.java   | 2 +-
 .../sis/referencing/operation/transform/TranslationTransformTest.java | 2 +-
 .../sis/referencing/operation/transform/WraparoundTransformTest.java  | 2 +-
 .../org/apache/sis/referencing/report/CoordinateOperationMethods.java | 2 +-
 .../org/apache/sis/referencing/report/CoordinateReferenceSystems.java | 2 +-
 .../test/java/org/apache/sis/referencing/report/HTMLGenerator.java    | 2 +-
 .../src/test/java/org/apache/sis/test/ReferencingAssert.java          | 2 +-
 .../test/java/org/apache/sis/test/integration/ConsistencyTest.java    | 2 +-
 .../java/org/apache/sis/test/integration/CoordinateOperationTest.java | 2 +-
 .../apache/sis/test/integration/CoordinateReferenceSystemTest.java    | 2 +-
 .../src/test/java/org/apache/sis/test/integration/DatumShiftTest.java | 2 +-
 .../src/test/java/org/apache/sis/test/integration/MetadataTest.java   | 2 +-
 .../java/org/apache/sis/test/integration/MetadataVerticalTest.java    | 2 +-
 .../src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java | 2 +-
 .../src/test/java/org/apache/sis/test/widget/ShapeViewer.java         | 2 +-
 .../src/test/java/org/apache/sis/test/widget/SwingAssertions.java     | 2 +-
 .../src/test/java/org/apache/sis/test/widget/VisualCheck.java         | 2 +-
 .../java/org/apache/sis/internal/converter/AngleConverterTest.java    | 2 +-
 .../java/org/apache/sis/internal/converter/ArrayConverterTest.java    | 2 +-
 .../java/org/apache/sis/internal/converter/ConverterRegistryTest.java | 2 +-
 .../java/org/apache/sis/internal/converter/FallbackConverterTest.java | 2 +-
 .../java/org/apache/sis/internal/converter/NumberConverterTest.java   | 2 +-
 .../java/org/apache/sis/internal/converter/PathConverterTest.java     | 2 +-
 .../java/org/apache/sis/internal/converter/StringConverterTest.java   | 2 +-
 .../java/org/apache/sis/internal/converter/SystemRegistryTest.java    | 2 +-
 .../src/test/java/org/apache/sis/internal/system/LoggersTest.java     | 2 +-
 .../org/apache/sis/internal/system/ReferenceQueueConsumerTest.java    | 2 +-
 .../src/test/java/org/apache/sis/internal/test/AssertTest.java        | 2 +-
 .../src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java | 2 +-
 .../src/test/java/org/apache/sis/internal/util/AbstractMapTest.java   | 2 +-
 .../src/test/java/org/apache/sis/internal/util/BagTest.java           | 2 +-
 .../test/java/org/apache/sis/internal/util/CheckedArrayListTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/util/CollectionsExtTest.java    | 2 +-
 .../src/test/java/org/apache/sis/internal/util/DefinitionURITest.java | 2 +-
 .../src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java | 2 +-
 .../org/apache/sis/internal/util/LocalizedParseExceptionTest.java     | 2 +-
 .../src/test/java/org/apache/sis/internal/util/NumericsTest.java      | 2 +-
 .../java/org/apache/sis/internal/util/StandardDateFormatTest.java     | 2 +-
 .../src/test/java/org/apache/sis/internal/util/StringsTest.java       | 2 +-
 .../src/test/java/org/apache/sis/internal/util/X364Test.java          | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java  | 2 +-
 .../sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java | 2 +-
 .../src/test/java/org/apache/sis/io/TableAppenderTest.java            | 2 +-
 .../src/test/java/org/apache/sis/io/TabulationExpansionTest.java      | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java    | 2 +-
 .../test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java    | 2 +-
 .../src/test/java/org/apache/sis/math/DecimalFunctionsTest.java       | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java  | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java      | 2 +-
 .../src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java  | 2 +-
 .../src/test/java/org/apache/sis/math/MathFunctionsTest.java          | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java     | 2 +-
 .../src/test/java/org/apache/sis/math/RepeatedVectorTest.java         | 2 +-
 .../src/test/java/org/apache/sis/math/StatisticsFormatTest.java       | 2 +-
 .../sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java    | 2 +-
 .../src/test/java/org/apache/sis/measure/AngleFormatTest.java         | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java  | 2 +-
 .../src/test/java/org/apache/sis/measure/ConventionalUnitTest.java    | 2 +-
 .../src/test/java/org/apache/sis/measure/DateRangeTest.java           | 2 +-
 .../java/org/apache/sis/measure/FormattedCharacterIteratorTest.java   | 2 +-
 .../src/test/java/org/apache/sis/measure/LinearConverterTest.java     | 2 +-
 .../src/test/java/org/apache/sis/measure/MeasurementRangeTest.java    | 2 +-
 .../src/test/java/org/apache/sis/measure/NumberRangeTest.java         | 2 +-
 .../src/test/java/org/apache/sis/measure/PrefixesTest.java            | 2 +-
 .../src/test/java/org/apache/sis/measure/QuantitiesTest.java          | 2 +-
 .../src/test/java/org/apache/sis/measure/RangeFormatTest.java         | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java  | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java | 2 +-
 .../test/java/org/apache/sis/measure/SexagesimalConverterTest.java    | 2 +-
 .../src/test/java/org/apache/sis/measure/SystemUnitTest.java          | 2 +-
 .../src/test/java/org/apache/sis/measure/UnitDimensionTest.java       | 2 +-
 .../src/test/java/org/apache/sis/measure/UnitFormatTest.java          | 2 +-
 .../src/test/java/org/apache/sis/measure/UnitServicesTest.java        | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java  | 2 +-
 .../sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/test/Assert.java        | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/test/Assume.java        | 2 +-
 .../sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java      | 2 +-
 .../src/test/java/org/apache/sis/test/TestConfiguration.java          | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java     | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java | 2 +-
 .../java/org/apache/sis/test/foreigner/SerializableTableColumn.java   | 2 +-
 .../src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java     | 2 +-
 .../src/test/java/org/apache/sis/util/ArgumentChecksTest.java         | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java | 2 +-
 .../src/test/java/org/apache/sis/util/CharSequencesTest.java          | 2 +-
 .../sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java   | 2 +-
 .../test/java/org/apache/sis/util/DefaultInternationalStringTest.java | 2 +-
 .../sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java   | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java   | 2 +-
 .../test/java/org/apache/sis/util/SimpleInternationalStringTest.java  | 2 +-
 .../src/test/java/org/apache/sis/util/StringBuildersTest.java         | 2 +-
 core/sis-utility/src/test/java/org/apache/sis/util/UtilitiesTest.java | 4 ++--
 core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java   | 2 +-
 .../src/test/java/org/apache/sis/util/collection/CacheTest.java       | 2 +-
 .../src/test/java/org/apache/sis/util/collection/CodeListSetTest.java | 2 +-
 .../java/org/apache/sis/util/collection/DefaultTreeTableTest.java     | 2 +-
 .../src/test/java/org/apache/sis/util/collection/DerivedMapTest.java  | 2 +-
 .../src/test/java/org/apache/sis/util/collection/DerivedSetTest.java  | 2 +-
 .../java/org/apache/sis/util/collection/FrequencySortedSetTest.java   | 2 +-
 .../src/test/java/org/apache/sis/util/collection/IntegerListTest.java | 2 +-
 .../src/test/java/org/apache/sis/util/collection/LargeCodeList.java   | 2 +-
 .../src/test/java/org/apache/sis/util/collection/RangeSetTest.java    | 2 +-
 .../src/test/java/org/apache/sis/util/collection/TableColumnTest.java | 2 +-
 .../test/java/org/apache/sis/util/collection/TreeTableFormatTest.java | 2 +-
 .../src/test/java/org/apache/sis/util/collection/TreeTablesTest.java  | 2 +-
 .../src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java | 2 +-
 .../java/org/apache/sis/util/collection/WeakValueHashMapTest.java     | 2 +-
 .../test/java/org/apache/sis/util/logging/MonolineFormatterTest.java  | 2 +-
 .../test/java/org/apache/sis/util/logging/PerformanceLevelTest.java   | 2 +-
 .../java/org/apache/sis/util/resources/IndexedResourceBundleTest.java | 2 +-
 .../src/test/java/org/apache/sis/util/resources/LoaderTest.java       | 2 +-
 .../org/apache/sis/internal/profile/fra/DataIdentificationTest.java   | 2 +-
 .../apache/sis/internal/profile/fra/DirectReferenceSystemTest.java    | 2 +-
 .../test/java/org/apache/sis/profile/france/FrenchProfileTest.java    | 2 +-
 .../test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java   | 2 +-
 .../src/test/java/org/apache/sis/profile/japan/JapanProfileTest.java  | 2 +-
 .../test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java    | 2 +-
 .../java/org/apache/sis/storage/landsat/LandsatStoreProviderTest.java | 2 +-
 .../java/org/apache/sis/test/suite/EarthObservationTestSuite.java     | 2 +-
 .../test/java/org/apache/sis/internal/geotiff/CompressionTest.java    | 2 +-
 .../java/org/apache/sis/internal/storage/inflater/CCITTRLETest.java   | 2 +-
 .../java/org/apache/sis/internal/storage/inflater/InflaterTest.java   | 2 +-
 .../src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java  | 2 +-
 .../src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java     | 2 +-
 .../test/java/org/apache/sis/storage/geotiff/SelfConsistencyTest.java | 2 +-
 .../src/test/java/org/apache/sis/storage/geotiff/TagsTest.java        | 2 +-
 .../src/test/java/org/apache/sis/storage/geotiff/TypeTest.java        | 2 +-
 .../src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java | 2 +-
 .../src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java     | 2 +-
 .../src/test/java/org/apache/sis/internal/netcdf/AxisTest.java        | 2 +-
 .../src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java    | 2 +-
 .../src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java     | 2 +-
 .../src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java  | 2 +-
 .../src/test/java/org/apache/sis/internal/netcdf/GridTest.java        | 2 +-
 .../src/test/java/org/apache/sis/internal/netcdf/TestCase.java        | 2 +-
 .../src/test/java/org/apache/sis/internal/netcdf/VariableTest.java    | 2 +-
 .../java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/netcdf/impl/FeatureSetTest.java | 2 +-
 .../test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java   | 2 +-
 .../java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java    | 2 +-
 .../test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java   | 2 +-
 .../java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java   | 2 +-
 .../src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java  | 2 +-
 .../test/java/org/apache/sis/storage/netcdf/SelfConsistencyTest.java  | 2 +-
 .../src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java      | 2 +-
 .../src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java | 2 +-
 .../src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java   | 2 +-
 .../java/org/apache/sis/internal/sql/feature/GeometryGetterTest.java  | 2 +-
 .../apache/sis/internal/sql/feature/SelectionClauseWriterTest.java    | 2 +-
 .../src/test/java/org/apache/sis/internal/sql/postgis/BandTest.java   | 2 +-
 .../test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java   | 2 +-
 .../java/org/apache/sis/internal/sql/postgis/RasterReaderTest.java    | 2 +-
 .../java/org/apache/sis/internal/sql/postgis/RasterWriterTest.java    | 2 +-
 .../src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java        | 2 +-
 .../src/test/java/org/apache/sis/test/suite/SQLTestSuite.java         | 2 +-
 .../src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java   | 2 +-
 .../java/org/apache/sis/internal/storage/MemoryGridResourceTest.java  | 2 +-
 .../java/org/apache/sis/internal/storage/MetadataBuilderTest.java     | 2 +-
 .../test/java/org/apache/sis/internal/storage/RangeArgumentTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/storage/StoreUtilitiesTest.java | 2 +-
 .../java/org/apache/sis/internal/storage/csv/StoreProviderTest.java   | 2 +-
 .../src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java  | 2 +-
 .../java/org/apache/sis/internal/storage/esri/AsciiGridStoreTest.java | 2 +-
 .../java/org/apache/sis/internal/storage/esri/BILConsistencyTest.java | 2 +-
 .../java/org/apache/sis/internal/storage/esri/BIPConsistencyTest.java | 2 +-
 .../java/org/apache/sis/internal/storage/esri/BSQConsistencyTest.java | 2 +-
 .../java/org/apache/sis/internal/storage/esri/WritableStoreTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/storage/folder/StoreTest.java   | 2 +-
 .../org/apache/sis/internal/storage/image/SelfConsistencyTest.java    | 2 +-
 .../org/apache/sis/internal/storage/image/WorldFileStoreTest.java     | 2 +-
 .../java/org/apache/sis/internal/storage/io/ByteArrayChannel.java     | 2 +-
 .../java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java | 2 +-
 .../org/apache/sis/internal/storage/io/ChannelDataOutputTest.java     | 2 +-
 .../java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java  | 2 +-
 .../apache/sis/internal/storage/io/ChannelImageInputStreamTest.java   | 2 +-
 .../apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java  | 2 +-
 .../java/org/apache/sis/internal/storage/io/ComputedInputStream.java  | 2 +-
 .../test/java/org/apache/sis/internal/storage/io/DripByteChannel.java | 2 +-
 .../org/apache/sis/internal/storage/io/FileCacheByteChannelTest.java  | 2 +-
 .../org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java | 2 +-
 .../apache/sis/internal/storage/io/MemoryCacheImageOutputStream.java  | 2 +-
 .../org/apache/sis/internal/storage/io/RewindableLineReaderTest.java  | 2 +-
 .../java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java   | 2 +-
 .../src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java  | 2 +-
 .../org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java     | 2 +-
 .../java/org/apache/sis/internal/storage/xml/StoreProviderTest.java   | 2 +-
 .../src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java  | 2 +-
 .../src/test/java/org/apache/sis/storage/CoverageQueryTest.java       | 2 +-
 .../src/test/java/org/apache/sis/storage/DataStoreMock.java           | 2 +-
 .../src/test/java/org/apache/sis/storage/DataStoreProviderTest.java   | 2 +-
 .../src/test/java/org/apache/sis/storage/DataStoresTest.java          | 2 +-
 .../src/test/java/org/apache/sis/storage/FeatureNamingTest.java       | 2 +-
 .../src/test/java/org/apache/sis/storage/FeatureQueryTest.java        | 2 +-
 .../src/test/java/org/apache/sis/storage/GridResourceMock.java        | 2 +-
 .../src/test/java/org/apache/sis/storage/ProbeResultTest.java         | 2 +-
 .../src/test/java/org/apache/sis/storage/StorageConnectorTest.java    | 2 +-
 .../org/apache/sis/storage/aggregate/ConcatenatedFeatureSetTest.java  | 2 +-
 .../java/org/apache/sis/storage/aggregate/CoverageAggregatorTest.java | 2 +-
 .../java/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java     | 2 +-
 .../test/java/org/apache/sis/storage/event/StoreListenersTest.java    | 2 +-
 .../java/org/apache/sis/test/storage/CoverageReadConsistency.java     | 2 +-
 .../src/test/java/org/apache/sis/test/suite/StorageTestSuite.java     | 2 +-
 .../test/java/org/apache/sis/internal/storage/gpx/MetadataTest.java   | 2 +-
 .../src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java | 2 +-
 .../src/test/java/org/apache/sis/internal/storage/gpx/TypesTest.java  | 2 +-
 .../test/java/org/apache/sis/internal/storage/gpx/UpdaterTest.java    | 2 +-
 .../src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java | 2 +-
 .../src/test/java/org/apache/sis/test/suite/GPXTestSuite.java         | 2 +-
 727 files changed, 732 insertions(+), 732 deletions(-)

diff --git a/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
index 1d2120c5ab..0220ddd4d3 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.3
  */
 @DependsOn(CommandRunnerTest.class)
-public final strictfp class AboutCommandTest extends TestCase {
+public final class AboutCommandTest extends TestCase {
     /**
      * Tests the sub-command without option.
      *
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
index 149a3ce10c..62f5957c68 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @since   0.8
  */
 @DependsOn(CommandRunnerTest.class)
-public final strictfp class CRSCommandTest extends TestCase {
+public final class CRSCommandTest extends TestCase {
     /**
      * The Well Known Text for EPSG:4326 as a regular expression.
      * This string uses the native line separator. Consequently, test cases comparing
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java b/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
index 5196744dce..caff08cfb9 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class CommandRunnerTest extends TestCase {
+public final class CommandRunnerTest extends TestCase {
     /**
      * A dummy sub-command for testing purpose.
      */
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
index 6db008d3cb..186cdfc849 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @DependsOn(CommandRunnerTest.class)
-public final strictfp class HelpCommandTest extends TestCase {
+public final class HelpCommandTest extends TestCase {
     /**
      * Tests the sub-command without option.
      *
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
index f58870c8f9..c5d8067510 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @DependsOn(CommandRunnerTest.class)
-public final strictfp class MetadataCommandTest extends TestCase {
+public final class MetadataCommandTest extends TestCase {
     /**
      * Tests the sub-command on a netCDF file.
      *
diff --git a/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java b/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
index 4efc3b36f3..fd54857d7e 100644
--- a/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
+++ b/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.metadata.iso.extent.DefaultExtentTest.FILENAME;
  * @since   0.4
  */
 @DependsOn(CommandRunnerTest.class)
-public final strictfp class MimeTypeCommandTest extends TestUsingFile {
+public final class MimeTypeCommandTest extends TestUsingFile {
     /**
      * Tests the sub-command on a metadata file.
      *
diff --git a/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java b/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
index 611ee640f3..3ee075125d 100644
--- a/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
+++ b/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
@@ -36,7 +36,7 @@ import org.junit.BeforeClass;
     org.apache.sis.console.MetadataCommandTest.class,
     org.apache.sis.console.CRSCommandTest.class
 })
-public final strictfp class ConsoleTestSuite extends TestSuite {
+public final class ConsoleTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java
index fc060db65b..7c66339826 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/CoverageStylingApp.java
@@ -37,7 +37,7 @@ import org.apache.sis.measure.Units;
  * @version 1.2
  * @since   1.1
  */
-public final strictfp class CoverageStylingApp extends Application {
+public final class CoverageStylingApp extends Application {
     /**
      * Starts the test application.
      *
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java
index 49b384c4f6..b78c4313af 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridSliceSelectorApp.java
@@ -33,7 +33,7 @@ import org.opengis.metadata.spatial.DimensionNameType;
  * @version 1.3
  * @since   1.3
  */
-public final strictfp class GridSliceSelectorApp extends Application {
+public final class GridSliceSelectorApp extends Application {
     /**
      * Starts the test application.
      *
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridViewApp.java b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridViewApp.java
index 717e97bf1e..b64fb04018 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridViewApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/gui/coverage/GridViewApp.java
@@ -35,7 +35,7 @@ import org.apache.sis.internal.gui.BackgroundThreads;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class GridViewApp extends Application {
+public final class GridViewApp extends Application {
     /**
      * Size of the artificial tiles. Should be small enough so we can have many of them.
      * Width and height should be different in order to increase the chance to see bugs
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java b/application/sis-javafx/src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java
index 25f8c53f76..2216739d84 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/gui/referencing/CRSChooserApp.java
@@ -36,7 +36,7 @@ import org.apache.sis.referencing.CommonCRS;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class CRSChooserApp extends Application {
+public final class CRSChooserApp extends Application {
     /**
      * Starts the test application.
      *
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java b/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java
index 874a9370fa..8e035815dd 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/GUIUtilitiesTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.1
  */
-public final strictfp class GUIUtilitiesTest extends TestCase {
+public final class GUIUtilitiesTest extends TestCase {
     /**
      * Tests {@link GUIUtilities#appendPathSorted(TreeItem, Comparable...)}
      * and   {@link GUIUtilities#removePathSorted(TreeItem, Comparable...)}.
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java b/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java
index 45e6ebc3be..634ca0d3c7 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/internal/gui/control/ValueColorMapperApp.java
@@ -36,7 +36,7 @@ import org.apache.sis.util.resources.Vocabulary;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class ValueColorMapperApp extends Application {
+public final class ValueColorMapperApp extends Application {
     /**
      * Starts the test application.
      *
diff --git a/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java b/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java
index 51d3474522..e618539d24 100644
--- a/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java
+++ b/application/sis-javafx/src/test/java/org/apache/sis/test/suite/ApplicationTestSuite.java
@@ -31,7 +31,7 @@ import org.junit.BeforeClass;
 @Suite.SuiteClasses({
     org.apache.sis.internal.gui.GUIUtilitiesTest.class
 })
-public final strictfp class ApplicationTestSuite extends TestSuite {
+public final class ApplicationTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
index eb52db29e0..db3d336f9e 100644
--- a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
+++ b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assume.assumeFalse;
  * @since   0.8
  */
 @DependsOn(TransformerTest.class)
-public final strictfp class ReferencingFunctionsTest extends TestCase {
+public final class ReferencingFunctionsTest extends TestCase {
     /**
      * The instance to use for testing purpose.
      */
diff --git a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java
index 8a7f35644d..d1d218764c 100644
--- a/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java
+++ b/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assume.assumeTrue;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class TransformerTest extends TestCase {
+public final class TransformerTest extends TestCase {
     /**
      * The instance to use for testing purpose.
      */
diff --git a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java b/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
index 4bb693b2d6..0e6bd88df3 100644
--- a/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
+++ b/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
@@ -32,7 +32,7 @@ import org.junit.BeforeClass;
     org.apache.sis.openoffice.TransformerTest.class,
     org.apache.sis.openoffice.ReferencingFunctionsTest.class
 })
-public final strictfp class OpenOfficeTestSuite extends TestSuite {
+public final class OpenOfficeTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
index bf329bcfe1..622ddf8eb9 100644
--- a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
+++ b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class ClientFileSystemTest extends TestCase {
+public final class ClientFileSystemTest extends TestCase {
     /**
      * The instance to use for testing purposes.
      */
diff --git a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
index 885e2d4ee7..f9657b9d39 100644
--- a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
+++ b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class KeyPathMatcherTest extends TestCase {
+public final class KeyPathMatcherTest extends TestCase {
     /**
      * Tests a pattern using "glob" syntax.
      */
diff --git a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java
index f9c82f45f9..d5e5517206 100644
--- a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java
+++ b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class KeyPathTest extends TestCase {
+public final class KeyPathTest extends TestCase {
     /**
      * A URI to use for testing purpose.
      */
diff --git a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java
index 15daa2b877..6ac7949849 100644
--- a/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java
+++ b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java
@@ -29,7 +29,7 @@ import org.junit.BeforeClass;
     org.apache.sis.cloud.aws.s3.KeyPathMatcherTest.class,
     org.apache.sis.cloud.aws.s3.ClientFileSystemTest.class
 })
-public final strictfp class AWSTestSuite extends TestSuite {
+public final class AWSTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java b/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
index ebb6e83c7c..0eb7ab9dee 100644
--- a/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
+++ b/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 0.5
  * @since   0.5
  */
-public strictfp class ResourceCompilerMojoTest {
+public class ResourceCompilerMojoTest {
     /**
      * Tests {@link ResourceCompilerMojo#filterLanguages(File[])}.
      */
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
index 2785e7431a..a405b7ea36 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java
@@ -30,7 +30,7 @@ import org.opengis.feature.Feature;
  * @version 1.1
  * @since   1.1
  */
-abstract strictfp class CQLTestCase extends TestCase {
+abstract class CQLTestCase extends TestCase {
     /**
      * The factory to use for creating filter and expressions.
      */
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java
index 82b77dfbf7..75716f0521 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestSuite.java
@@ -36,7 +36,7 @@ import org.junit.runners.Suite;
     org.apache.sis.cql.QueryReadingTest.class,
     org.apache.sis.cql.QueryWritingTest.class,
 })
-public final strictfp class CQLTestSuite extends TestSuite {
+public final class CQLTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionReadingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionReadingTest.java
index 4db11edf9d..bab8d54090 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionReadingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionReadingTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class ExpressionReadingTest extends CQLTestCase {
+public final class ExpressionReadingTest extends CQLTestCase {
     @Test
     public void testValueReference1() throws CQLException {
         final String cql = "geom";
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionWritingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionWritingTest.java
index 63c74c89b6..07de9371d5 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionWritingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/ExpressionWritingTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class ExpressionWritingTest extends CQLTestCase {
+public final class ExpressionWritingTest extends CQLTestCase {
     @Test
     public void testValueReference1() throws CQLException {
         final Expression<Feature,?> exp = FF.property("geom");
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java
index e4b6f82cc5..a08a444169 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/FilterReadingTest.java
@@ -59,7 +59,7 @@ import org.opengis.filter.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class FilterReadingTest extends CQLTestCase {
+public final class FilterReadingTest extends CQLTestCase {
 
     private static final double DELTA = 0.00000001;
 
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java
index b7437d69cd..f0c38cf97b 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/FilterWritingTest.java
@@ -42,7 +42,7 @@ import org.locationtech.jts.geom.LinearRing;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class FilterWritingTest extends CQLTestCase {
+public final class FilterWritingTest extends CQLTestCase {
 
     private final Geometry baseGeometry = GF.createPolygon(
                 GF.createLinearRing(
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/QueryReadingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/QueryReadingTest.java
index 0089fedab6..64a4a0973e 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/QueryReadingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/QueryReadingTest.java
@@ -25,7 +25,7 @@ import org.opengis.filter.SortOrder;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final strictfp class QueryReadingTest extends CQLTestCase {
+public final class QueryReadingTest extends CQLTestCase {
 
     @Test
     public void testEmpty() throws CQLException {
diff --git a/core/sis-cql/src/test/java/org/apache/sis/cql/QueryWritingTest.java b/core/sis-cql/src/test/java/org/apache/sis/cql/QueryWritingTest.java
index 75b0d97f25..8147e69785 100644
--- a/core/sis-cql/src/test/java/org/apache/sis/cql/QueryWritingTest.java
+++ b/core/sis-cql/src/test/java/org/apache/sis/cql/QueryWritingTest.java
@@ -25,7 +25,7 @@ import org.opengis.filter.SortOrder;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final strictfp class QueryWritingTest extends CQLTestCase {
+public final class QueryWritingTest extends CQLTestCase {
 
     @Test
     public void testWrite() throws CQLException {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java
index 22c77b4e35..fdce1d21b8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryListTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
  * @since   1.0
  */
 @DependsOn(CategoryTest.class)
-public final strictfp class CategoryListTest extends TestCase {
+public final class CategoryListTest extends TestCase {
     /**
      * Asserts that the specified categories are sorted.
      * This method ignores {@code NaN} values.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
index 33f2800761..0c4a21a9b2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
@@ -36,7 +36,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class CategoryTest extends TestCase {
+public final class CategoryTest extends TestCase {
     /**
      * Small tolerance value for comparisons.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
index bc31356641..3e67ec0dbf 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
@@ -38,7 +38,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.1
  * @since   1.0
  */
-public final strictfp class SampleDimensionTest extends TestCase {
+public final class SampleDimensionTest extends TestCase {
     /**
      * Tests a sample dimension having only qualitative categories.
      * Expected value:
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java
index 8c23afe696..5e4e879450 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java
@@ -32,7 +32,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class SampleRangeFormatTest extends TestCase {
+public final class SampleRangeFormatTest extends TestCase {
     /**
      * Creates a band for temperature data.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
index 1b0c6c8ac6..ac252f2af5 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @version 1.1
  * @since   1.0
  */
-public final strictfp class BufferedGridCoverageTest extends GridCoverage2DTest {
+public final class BufferedGridCoverageTest extends GridCoverage2DTest {
     /**
      * Creates a {@link GridCoverage} instance to test with fixed sample values.
      * The coverage returned by this method shall contain the following values:
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
index d50a54b7cf..7c98795851 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @version 1.3
  * @since   1.1
  */
-public final strictfp class ConvertedGridCoverageTest extends TestCase {
+public final class ConvertedGridCoverageTest extends TestCase {
     /**
      * Creates a test coverage backed by an image of 2 pixels
      * on a single row with sample values (-1, 3).
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java
index ff238b3eaf..9e9a853f06 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/FractionalGridCoordinatesTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class FractionalGridCoordinatesTest extends TestCase {
+public final class FractionalGridCoordinatesTest extends TestCase {
     /**
      * Creates a test instance with (4 -1.1 7.6) coordinate values.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index b2f9cc0a56..552598e8c7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@ -55,7 +55,7 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @version 1.2
  * @since   1.1
  */
-public strictfp class GridCoverage2DTest extends TestCase {
+public class GridCoverage2DTest extends TestCase {
     /**
      * Width and height of the grid tested in this class.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
index 7c8879467b..59b5e6fe48 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class GridCoverageBuilderTest extends TestCase {
+public final class GridCoverageBuilderTest extends TestCase {
     /**
      * Tests {@link GridCoverageBuilder#setValues(RenderedImage)}.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
index 92aa535102..9d1f538e96 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
@@ -60,7 +60,7 @@ import static org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals;
  * @since   1.0
  */
 @DependsOn(GridGeometryTest.class)
-public final strictfp class GridDerivationTest extends TestCase {
+public final class GridDerivationTest extends TestCase {
     /**
      * Tests {@link GridDerivation#subgrid(Envelope, double...)} using only the
      * {@link GridExtent} result provided by {@link GridDerivation#getIntersection()}.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
index c35aebe807..b1ceb4dc7d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
@@ -51,7 +51,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @version 1.3
  * @since   1.0
  */
-public final strictfp class GridExtentTest extends TestCase {
+public final class GridExtentTest extends TestCase {
     /**
      * Creates a three-dimensional grid extent to be shared by different tests.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
index d75eaceb16..1ad5734cb8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
@@ -49,7 +49,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since   1.0
  */
 @DependsOn(GridExtentTest.class)
-public final strictfp class GridGeometryTest extends TestCase {
+public final class GridGeometryTest extends TestCase {
     /**
      * Verifies grid extent coordinates.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridOrientationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridOrientationTest.java
index d9fb80ebe0..7de4807114 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridOrientationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridOrientationTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class GridOrientationTest extends TestCase {
+public final class GridOrientationTest extends TestCase {
     /**
      * Tests {@link GridOrientation#useVariantOfCRS(AxesConvention)}. This test may fail if new enumeration values
      * are added in {@link AxesConvention} without updating {@link GridOrientation#useVariantOfCRS(AxesConvention)}
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
index 0acadf7bf4..87175dfff4 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
@@ -36,7 +36,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class PixelTranslationTest extends TestCase {
+public final class PixelTranslationTest extends TestCase {
     /**
      * Returns a transform from center to corner with the given number of dimensions.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
index dac6014dd1..ab6cbf0cef 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
@@ -71,7 +71,7 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @since   1.1
  */
 @DependsOn(org.apache.sis.image.ResampledImageTest.class)
-public final strictfp class ResampledGridCoverageTest extends TestCase {
+public final class ResampledGridCoverageTest extends TestCase {
     /**
      * The random number generator used for generating some grid coverage values.
      * Created only if needed.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java
index 2feeb1209c..584c000e4c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
  * @since   1.1
  */
 @DependsOn(org.apache.sis.image.PlanarImageTest.class)
-public final strictfp class ReshapedImageTest extends TestCase {
+public final class ReshapedImageTest extends TestCase {
     /**
      * Size of tiles used in this test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
index 07c368ac60..067852f0ca 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   1.3
  */
-public final strictfp class TranslatedGridCoverageTest extends TestCase {
+public final class TranslatedGridCoverageTest extends TestCase {
     /**
      * Creates a test coverage with grid coordinates starting at (-20, -10).
      * Envelope is BOX(-80 -20, -72 -16).
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java
index e314d86d79..f9e33015d5 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java
@@ -45,7 +45,7 @@ import org.opengis.feature.PropertyType;
     DenseFeatureTest.class,
     SparseFeatureTest.class
 })
-public final strictfp class AbstractFeatureTest extends FeatureTestCase {
+public final class AbstractFeatureTest extends FeatureTestCase {
     /**
      * A feature implementation on top of {@link AbstractFeature}. This class has more code than strictly necessary
      * since we need to reproduce some of the verifications performed by the Apache SIS supported implementations
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
index 9effddfb90..694429808e 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.6
  */
 @DependsOn(SingletonAttributeTest.class)
-public final strictfp class AbstractOperationTest extends TestCase {
+public final class AbstractOperationTest extends TestCase {
     /**
      * Returns an operation that found new cities.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
index 0b3fc76f59..65a10adb56 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
@@ -38,7 +38,7 @@ import org.opengis.feature.Attribute;
  * @since   0.5
  */
 @DependsOn(CharacteristicTypeMapTest.class)
-public final strictfp class CharacteristicMapTest extends TestCase {
+public final class CharacteristicMapTest extends TestCase {
     /**
      * Creates an attribute for a temperature measurement of 20°C with a ±0.1°C accuracy.
      *
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
index 2461e0fb28..7b8d399a45 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
@@ -38,7 +38,7 @@ import org.apache.sis.util.iso.Names;
  * @since   0.5
  */
 @DependsOn(DefaultAttributeTypeTest.class)
-public final strictfp class CharacteristicTypeMapTest extends TestCase {
+public final class CharacteristicTypeMapTest extends TestCase {
     /**
      * Creates an attribute type for a temperature measurement in °C with a ±0.1°C accuracy.
      *
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CustomAttribute.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CustomAttribute.java
index 7e9a20f52b..48fc8926f3 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CustomAttribute.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CustomAttribute.java
@@ -37,7 +37,7 @@ import org.opengis.feature.AttributeType;
  * @since   0.5
  */
 @SuppressWarnings("serial")
-final strictfp class CustomAttribute<V> extends AbstractAttribute<V> {
+final class CustomAttribute<V> extends AbstractAttribute<V> {
     /**
      * A quality information that this attribute will report in addition to the default ones.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
index 9ae5936e95..f95b24c45b 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
@@ -42,7 +42,7 @@ import org.opengis.feature.FeatureType;
  * @since   0.5
  */
 @DependsOn(DefaultFeatureTypeTest.class)
-public final strictfp class DefaultAssociationRoleTest extends TestCase {
+public final class DefaultAssociationRoleTest extends TestCase {
     /**
      * Creates an association to a twin town. We arbitrarily fix the maximum number
      * of occurrences to 1, even if in reality some cities have many twin towns.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
index 8c0748f33a..8a62a92c5c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class DefaultAttributeTypeTest extends TestCase {
+public final class DefaultAttributeTypeTest extends TestCase {
     /**
      * Creates an attribute type for city name.
      *
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
index d22990782d..96d8da7900 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
@@ -44,7 +44,7 @@ import org.opengis.feature.AttributeType;
  * @since   0.5
  */
 @DependsOn(DefaultAttributeTypeTest.class)
-public final strictfp class DefaultFeatureTypeTest extends TestCase {
+public final class DefaultFeatureTypeTest extends TestCase {
     /**
      * Convenience method returning the given name in a a property map
      * to be given to {@link AbstractIdentifiedType} constructor.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DenseFeatureTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DenseFeatureTest.java
index 471b576352..4dcf82b3ef 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DenseFeatureTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DenseFeatureTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.test.DependsOn;
     SingletonAttributeTest.class,
     PropertySingletonTest.class
 })
-public final strictfp class DenseFeatureTest extends FeatureTestCase {
+public final class DenseFeatureTest extends FeatureTestCase {
     /**
      * Creates a new feature for the given type.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
index 303d7a8e74..da3daae016 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
@@ -55,7 +55,7 @@ import org.opengis.feature.FeatureType;
  * @version 1.1
  * @since   0.7
  */
-public final strictfp class EnvelopeOperationTest extends TestCase {
+public final class EnvelopeOperationTest extends TestCase {
     /**
      * The description of a feature with two geometric properties. The properties are named "g1" and "g2"
      * and may or may not have default CRS, depending which {@code initialize(…)} method is invoked.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
index 4e5eef725f..3216f6b9a2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
@@ -44,7 +44,7 @@ import org.opengis.feature.PropertyType;
     DenseFeatureTest.class,
     CharacteristicMapTest.class
 })
-public final strictfp class FeatureFormatTest extends TestCase {
+public final class FeatureFormatTest extends TestCase {
     /**
      * Creates the formatter instance to be used for the tests.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java
index 5f28a1b131..3235dfad10 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java
@@ -50,7 +50,7 @@ import org.opengis.feature.PropertyType;
  * @since   0.7
  */
 @DependsOn({LinkOperationTest.class, EnvelopeOperationTest.class})
-public final strictfp class FeatureOperationsTest extends TestCase {
+public final class FeatureOperationsTest extends TestCase {
     /**
      * Creates a feature type with an envelope operation.
      * The feature contains the following properties:
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
index 513c0f1cc0..592a0e11e7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
@@ -46,7 +46,7 @@ import org.opengis.feature.Property;
  * @version 0.8
  * @since   0.5
  */
-public abstract strictfp class FeatureTestCase extends TestCase {
+public abstract class FeatureTestCase extends TestCase {
     /**
      * The feature being tested.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
index f155ca5535..c1caf0b553 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
@@ -36,7 +36,7 @@ import org.opengis.feature.InvalidPropertyValueException;
  * @since   0.5
  */
 @DependsOn(SingletonAttributeTest.class)
-public final strictfp class FeaturesTest extends TestCase {
+public final class FeaturesTest extends TestCase {
     /**
      * Tests {@link Features#cast(AttributeType, Class)}.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
index 0ceda93737..0134185e63 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
     AbstractOperationTest.class,
     DenseFeatureTest.class
 })
-public final strictfp class LinkOperationTest extends TestCase {
+public final class LinkOperationTest extends TestCase {
     /**
      * Creates a simple feature type with a link operation.
      * The feature contains the following properties:
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
index a4c9bec5b7..61b21065e6 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.5
  */
 @DependsOn(SingletonAttributeTest.class)
-public final strictfp class MultiValuedAttributeTest extends TestCase {
+public final class MultiValuedAttributeTest extends TestCase {
     /**
      * Creates an attribute for a list of universities.
      * The multiplicity is [0 … ∞].
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java b/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java
index e9c798ed4c..409f6589e9 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java
@@ -35,7 +35,7 @@ import org.opengis.feature.Property;
  * @since   0.6
  */
 @SuppressWarnings("serial")
-final strictfp class NoOperation extends AbstractOperation {
+final class NoOperation extends AbstractOperation {
     /**
      * A description of the input parameters.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java
index b83613a28c..e1095b5613 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/PropertySingletonTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class PropertySingletonTest extends TestCase {
+public final class PropertySingletonTest extends TestCase {
     /**
      * The instance to test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
index 58b854304d..c6c032ad37 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.test.Assert.*;
     DefaultAssociationRoleTest.class,
     DenseFeatureTest.class
 })
-public final strictfp class SingletonAssociationTest extends TestCase {
+public final class SingletonAssociationTest extends TestCase {
     /**
      * Returns an association to use for testing purpose.
      *
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
index e757711f55..297a3a6543 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
     DefaultAttributeTypeTest.class,
     PropertySingletonTest.class
 })
-public final strictfp class SingletonAttributeTest extends TestCase {
+public final class SingletonAttributeTest extends TestCase {
     /**
      * Creates an attribute for the city name.
      * This attribute has a default value.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SparseFeatureTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SparseFeatureTest.java
index c26572b59b..c71906685c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SparseFeatureTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SparseFeatureTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.test.DependsOn;
     SingletonAttributeTest.class,
     PropertySingletonTest.class
 })
-public final strictfp class SparseFeatureTest extends FeatureTestCase {
+public final class SparseFeatureTest extends FeatureTestCase {
     /**
      * Creates a new feature for the given type.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
index af9cd422d1..b5f14e7763 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
@@ -41,7 +41,7 @@ import org.opengis.feature.InvalidPropertyValueException;
  * @since   0.7
  */
 @DependsOn(LinkOperationTest.class)
-public final strictfp class StringJoinOperationTest extends TestCase {
+public final class StringJoinOperationTest extends TestCase {
     /**
      * Creates a feature type with an string join operation.
      * The feature contains the following properties:
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
index 982481b3f2..2b26d2b4ae 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AssociationRoleBuilderTest.java
@@ -34,7 +34,7 @@ import org.opengis.feature.FeatureAssociationRole;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class AssociationRoleBuilderTest extends TestCase {
+public final class AssociationRoleBuilderTest extends TestCase {
     /**
      * Tests the name, designation, definition, description and multiplicity associated to the role.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
index b1aa1ae723..5a29b6ef7f 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
@@ -50,7 +50,7 @@ import org.opengis.feature.PropertyType;
  * @since   0.8
  */
 @DependsOn(CharacteristicTypeBuilderTest.class)
-public final strictfp class AttributeTypeBuilderTest extends TestCase {
+public final class AttributeTypeBuilderTest extends TestCase {
     /**
      * Tests with the minimum number of parameters.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
index 72b50d9ae7..e319ab6fed 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
@@ -35,7 +35,7 @@ import org.opengis.feature.AttributeType;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class CharacteristicTypeBuilderTest extends TestCase {
+public final class CharacteristicTypeBuilderTest extends TestCase {
     /**
      * Tests {@link CharacteristicTypeBuilder#setValueClass(Class)}.
      * This implies the replacement of the builder by a new instance.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
index 431eed053e..dcae977fd7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
@@ -52,7 +52,7 @@ import org.opengis.feature.Operation;
  * @since   0.8
  */
 @DependsOn(AttributeTypeBuilderTest.class)
-public final strictfp class FeatureTypeBuilderTest extends TestCase {
+public final class FeatureTypeBuilderTest extends TestCase {
     /**
      * Verifies that {@link FeatureTypeBuilder#setSuperTypes(FeatureType...)} ignores null parents.
      * This method tests only the builder state without creating feature type.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
index b5ea8bb107..7d71a79681 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
@@ -34,7 +34,7 @@ import org.opengis.filter.FilterFactory;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class ArithmeticFunctionTest extends TestCase {
+public final class ArithmeticFunctionTest extends TestCase {
     /**
      * The factory to use for creating the objects to test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java
index b5894ab7e6..69bf3408ee 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java
@@ -63,7 +63,7 @@ import org.opengis.filter.BinarySpatialOperator;
  *
  * @since 1.1
  */
-public abstract strictfp class BinarySpatialFilterTestCase<G> extends TestCase {
+public abstract class BinarySpatialFilterTestCase<G> extends TestCase {
     /**
      * The factory to use for testing purpose.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java
index 7d19342b52..db3b5ac0dd 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingESRI_Test.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * @version 1.3
  * @since   1.1
  */
-public final strictfp class BinarySpatialFilterUsingESRI_Test extends BinarySpatialFilterTestCase<Geometry> {
+public final class BinarySpatialFilterUsingESRI_Test extends BinarySpatialFilterTestCase<Geometry> {
     /**
      * Creates a new test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java
index b01fd934f2..d339975857 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJTS_Test.java
@@ -27,7 +27,7 @@ import org.locationtech.jts.geom.Geometry;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class BinarySpatialFilterUsingJTS_Test extends BinarySpatialFilterTestCase<Geometry> {
+public final class BinarySpatialFilterUsingJTS_Test extends BinarySpatialFilterTestCase<Geometry> {
     /**
      * Creates a new test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java
index b94bd0f654..1da9bc787a 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterUsingJava2D_Test.java
@@ -28,7 +28,7 @@ import org.junit.Test;
  * @version 1.3
  * @since   1.1
  */
-public final strictfp class BinarySpatialFilterUsingJava2D_Test extends BinarySpatialFilterTestCase<Shape> {
+public final class BinarySpatialFilterUsingJava2D_Test extends BinarySpatialFilterTestCase<Shape> {
     /**
      * Creates a new test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/CapabilitiesTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/CapabilitiesTest.java
index bdf654ff17..77b9e699d3 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/CapabilitiesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/CapabilitiesTest.java
@@ -38,7 +38,7 @@ import org.opengis.filter.capability.ScalarCapabilities;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class CapabilitiesTest extends TestCase {
+public final class CapabilitiesTest extends TestCase {
     /**
      * Creates a new test case.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
index 4190e74b0e..7621a4259f 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
@@ -40,7 +40,7 @@ import org.opengis.filter.BetweenComparisonOperator;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class ComparisonFilterTest extends TestCase {
+public final class ComparisonFilterTest extends TestCase {
     /**
      * The factory to use for creating the objects to test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java
index b3e53114e4..10d75b2326 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java
@@ -38,7 +38,7 @@ import org.opengis.filter.FilterFactory;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class IdentifierFilterTest extends TestCase {
+public final class IdentifierFilterTest extends TestCase {
     /**
      * The factory to use for creating the objects to test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
index 54621d8e82..1444efaf01 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
@@ -36,7 +36,7 @@ import org.opengis.filter.ValueReference;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class LeafExpressionTest extends TestCase {
+public final class LeafExpressionTest extends TestCase {
     /**
      * The factory to use for creating the objects to test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/LikeFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/LikeFilterTest.java
index fa4332a712..7b4f876e72 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/LikeFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LikeFilterTest.java
@@ -34,7 +34,7 @@ import org.opengis.filter.Literal;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class LikeFilterTest extends TestCase {
+public final class LikeFilterTest extends TestCase {
     /**
      * Tests {@link LikeFilter#isMetaCharacter(char)}.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java
index a4199feda8..89fb8eb1b7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java
@@ -45,7 +45,7 @@ import org.opengis.filter.LogicalOperator;
  * @version 1.2
  * @since   1.1
  */
-public final strictfp class LogicalFilterTest extends TestCase {
+public final class LogicalFilterTest extends TestCase {
     /**
      * The factory to use for creating the objects to test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/PeriodLiteral.java b/core/sis-feature/src/test/java/org/apache/sis/filter/PeriodLiteral.java
index 6248e0f298..d2a0238353 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/PeriodLiteral.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/PeriodLiteral.java
@@ -42,7 +42,7 @@ import org.opengis.temporal.TemporalGeometricPrimitive;
  * @since   1.1
  */
 @SuppressWarnings("serial")
-final strictfp class PeriodLiteral implements Period, Literal<Feature,Period>, Serializable {
+final class PeriodLiteral implements Period, Literal<Feature,Period>, Serializable {
     /**
      * Period beginning and ending, in milliseconds since Java epoch.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java
index 1bde107eec..99e8cf840d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java
@@ -40,7 +40,7 @@ import org.opengis.filter.TemporalOperatorName;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class TemporalFilterTest extends TestCase {
+public final class TemporalFilterTest extends TestCase {
     /**
      * The factory to use for creating the objects to test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java
index 4c61c4c5ab..2d7e4e599c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/XPathTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   0.4
  */
-public final strictfp class XPathTest extends TestCase {
+public final class XPathTest extends TestCase {
     /**
      * Tests {@link XPath#split(String)}.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java
index 0e6dfbd077..df68cc3d1d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class BandSelectImageTest extends TestCase {
+public final class BandSelectImageTest extends TestCase {
     /**
      * Arbitrary size for the test image.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/BandedIteratorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/BandedIteratorTest.java
index 4d70f46a4d..5b0a6cd67c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/BandedIteratorTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/BandedIteratorTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class BandedIteratorTest extends PixelIteratorTest {
+public final class BandedIteratorTest extends PixelIteratorTest {
     /**
      * Creates a new test case.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java
index 1b195cc18a..7877fbedd8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class BandedSampleConverterTest extends ImageTestCase {
+public final class BandedSampleConverterTest extends ImageTestCase {
     /**
      * Size of tiles in this test. The width should be different than the height
      * for increasing the chances to detect errors in index calculations.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java
index b6995e9796..a228ee2406 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
  * @since   1.1
  */
 @DependsOn(PlanarImageTest.class)
-public final strictfp class ComputedImageTest extends TestCase {
+public final class ComputedImageTest extends TestCase {
     /**
      * Size of tiles in this test. The width should be different than the height
      * for increasing the chances to detect errors in index calculations.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java
index 4e2504c474..12d6dc5680 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/DataTypeTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.1
  */
-public final strictfp class DataTypeTest extends TestCase {
+public final class DataTypeTest extends TestCase {
     /**
      * Verifies that {@link DataType} ordinal values match {@link DataBuffer} constant values.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java
index 8692beaaa8..bf4275d9d2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @since   1.1
  */
 @DependsOn(ResampledImageTest.class)
-public final strictfp class ImageCombinerTest extends ImageTestCase {
+public final class ImageCombinerTest extends ImageTestCase {
     /**
      * The image to add to the {@link ImageCombiner}.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ImageProcessorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ImageProcessorTest.java
index 4faf834da9..4ad4b9f097 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ImageProcessorTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ImageProcessorTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   1.1
  */
 @DependsOn(org.apache.sis.internal.processing.isoline.IsolinesTest.class)
-public final strictfp class ImageProcessorTest extends TestCase {
+public final class ImageProcessorTest extends TestCase {
     /**
      * Tests {@link ImageProcessor#isolines(RenderedImage, double[][], MathTransform)}.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java
index 48349f7f18..e69b621a11 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ImageTestCase.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNotNull;
  * @version 1.0
  * @since   1.0
  */
-public abstract strictfp class ImageTestCase extends TestCase {
+public abstract class ImageTestCase extends TestCase {
     /**
      * Small value for comparisons of sample values. Since most grid coverage implementations in
      * Apache SIS store real values as {@code float} numbers, this {@code SAMPLE_TOLERANCE} value
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/InterpolationTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/InterpolationTest.java
index a129219687..deb676b6fe 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/InterpolationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/InterpolationTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class InterpolationTest extends TestCase {
+public final class InterpolationTest extends TestCase {
     /**
      * Minimal pixel X and Y coordinates used in this test, inclusive.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/LinearIteratorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/LinearIteratorTest.java
index e89f13e9a4..31c4f31fa2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/LinearIteratorTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/LinearIteratorTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.0
  */
-public final strictfp class LinearIteratorTest extends PixelIteratorTest {
+public final class LinearIteratorTest extends PixelIteratorTest {
     /**
      * Creates a new test case.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java
index 71e29b10f2..005d4e5cb5 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class MaskedImageTest extends TestCase {
+public final class MaskedImageTest extends TestCase {
     /**
      * The image width and height in pixels.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/PixelIteratorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/PixelIteratorTest.java
index 948ca0be23..bc8e753886 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/PixelIteratorTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/PixelIteratorTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.0
  */
-public strictfp class PixelIteratorTest extends TestCase {
+public class PixelIteratorTest extends TestCase {
     /**
      * The pixel iterator being tested.
      * This field is initialized by a call to one of the {@code createPixelIterator(…)} methods.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java
index 71c32c0cf0..323fac7c4f 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class PlanarImageTest extends TestCase {
+public final class PlanarImageTest extends TestCase {
     /**
      * Size of tiles in this test. The width should be different than the height
      * for increasing the chances to detect errors in index calculations.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ResampledImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ResampledImageTest.java
index 577fd93845..9cf9182393 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ResampledImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ResampledImageTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class ResampledImageTest extends TestCase {
+public final class ResampledImageTest extends TestCase {
     /**
      * The source image. This is initialized to arbitrary values in two bands.
      * Location and number of tiles are random.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java
index 95ad62a8cc..0191bec70c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java
@@ -45,7 +45,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class ResamplingGridTest extends TestCase {
+public final class ResamplingGridTest extends TestCase {
     /**
      * Tests {@link ResamplingGrid#create(MathTransform2D, Rectangle)} with an affine transform.
      * The method should detect the affine case and return an equal transform (not necessarily the same instance).
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java
index a88fecdd8f..ad822fa29d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/StatisticsCalculatorTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.1
  */
-public final strictfp class StatisticsCalculatorTest extends TestCase {
+public final class StatisticsCalculatorTest extends TestCase {
     /**
      * Size of the artificial tiles. Should be small enough so we can have many of them.
      * Width and height should be different in order to increase the chance to see bugs
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java b/core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java
index ebcdc48861..80ab6e32fd 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/TestViewer.java
@@ -49,7 +49,7 @@ import static java.lang.StrictMath.*;
  * @version 1.0
  * @since   1.0
  */
-final strictfp class TestViewer {
+final class TestViewer {
     /**
      * The global image viewer where to collect all test images.
      */
@@ -152,7 +152,7 @@ final strictfp class TestViewer {
      * A panel showing an image. Created by {@link #addImage(RenderedImage, String)}.
      */
     @SuppressWarnings("serial")
-    private static final strictfp class ImagePanel extends JPanel {
+    private static final class ImagePanel extends JPanel {
         /** The image to show. */
         private final RenderedImage image;
 
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java b/core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java
index a85a0aadc1..bad1958f09 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/TiledImageMock.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.8
  */
-public final strictfp class TiledImageMock extends PlanarImage implements WritableRenderedImage {
+public final class TiledImageMock extends PlanarImage implements WritableRenderedImage {
     /**
      * Inverse of the probability that a tile has failure.
      * This is used only if {@link #failRandomly(Random, boolean)} is invoked.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java
index 6e51d11040..d771bf5f8c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeNodeTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.1
  */
-public final strictfp class PointTreeNodeTest extends TestCase {
+public final class PointTreeNodeTest extends TestCase {
     /**
      * Verifies the value of {@link PointTree#MAXIMUM_DIMENSIONS}.
      * That value is restricted by the maximal capacity of {@code long} type
diff --git a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java
index a131f92cd1..27835bafda 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java
@@ -43,7 +43,7 @@ import static org.apache.sis.test.Assert.assertSetEquals;
  * @since   1.1
  */
 @DependsOn(PointTreeNodeTest.class)
-public final strictfp class PointTreeTest extends TestCase {
+public final class PointTreeTest extends TestCase {
     /**
      * Bounds of the region where to create points. Intentionally use asymmetric bounds
      * for increasing the chances to detect bugs in node region computations.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java
index 0af6ca9140..ee519dcdb6 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.1
  */
-public final strictfp class ColorizerTest extends TestCase {
+public final class ColorizerTest extends TestCase {
     /**
      * Tests the creation of an index color model using {@link Colorizer#Colorizer(Collection)}.
      *
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java
index b5cc556048..e78c14a054 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class ImageLayoutTest extends TestCase {
+public final class ImageLayoutTest extends TestCase {
     /**
      * Tests {@link ImageLayout#suggestTileSize(int, int, boolean)}.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java
index 1023da680d..cfb47b3480 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.internal.util.Numerics.COMPARISON_THRESHOLD;
  * @version 1.2
  * @since   1.1
  */
-public final strictfp class ImageUtilitiesTest extends TestCase {
+public final class ImageUtilitiesTest extends TestCase {
     /**
      * Verifies that {@link ImageUtilities#SUGGESTED_TILE_CACHE_SIZE} is strictly positive.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java
index 51f0aa84d8..b3fdf936d6 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/SampleModelFactoryTest.java
@@ -37,7 +37,7 @@ import static org.opengis.test.Assert.assertInstanceOf;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class SampleModelFactoryTest extends TestCase {
+public final class SampleModelFactoryTest extends TestCase {
     /**
      * Arbitrary width, height and number of bands for the sample models to create.
      * Size does not matter because we will not create data buffer.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java
index 40998b2771..f5f14a08f8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java
@@ -39,7 +39,7 @@ import static java.lang.StrictMath.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class ScaledColorSpaceTest extends ImageTestCase {
+public final class ScaledColorSpaceTest extends ImageTestCase {
     /**
      * The minimal and maximal values to renderer.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
index 7e4f69c0f9..41f99bcd99 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
@@ -43,7 +43,7 @@ import org.opengis.feature.IdentifiedType;
  * @version 0.7
  * @since   0.7
  */
-public final strictfp class AttributeConventionTest extends TestCase {
+public final class AttributeConventionTest extends TestCase {
     /**
      * Tests {@link AttributeConvention#contains(GenericName)} method.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java
index e2b297dc8e..a73c1f30e3 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometriesTestCase.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   1.0
  */
-public abstract strictfp class GeometriesTestCase extends TestCase {
+public abstract class GeometriesTestCase extends TestCase {
     /**
      * The factory to test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometryTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometryTypeTest.java
index faa7f8cce8..0c1b5e6d99 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometryTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/GeometryTypeTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class GeometryTypeTest extends TestCase {
+public final class GeometryTypeTest extends TestCase {
     /**
      * Tests {@link GeometryType#forBinaryType(int)} and verifies {@link GeometryType#binaryType()} values.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/esri/FactoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/esri/FactoryTest.java
index 6c5319f9c4..67b3a5cd9c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/esri/FactoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/esri/FactoryTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.0
  */
-public final strictfp class FactoryTest extends GeometriesTestCase {
+public final class FactoryTest extends GeometriesTestCase {
     /**
      * Creates a new test case.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java
index eb542d71c3..8a040b5c07 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java
@@ -30,7 +30,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.1
  * @since   1.0
  */
-public final strictfp class FactoryTest extends GeometriesTestCase {
+public final class FactoryTest extends GeometriesTestCase {
     /**
      * Creates a new test case.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java
index 9dfb0bbeeb..2df180d944 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.test.FeatureAssert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class FlatShapeTest extends TestCase {
+public final class FlatShapeTest extends TestCase {
     /**
      * Tests {@link Polyline} using {@link Path2D} as a reference implementation.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java
index db5d4f5c64..9dd85a5a55 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/ShapePropertiesTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class ShapePropertiesTest extends TestCase {
+public final class ShapePropertiesTest extends TestCase {
     /**
      * Tests with a line segment.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/FactoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/FactoryTest.java
index 8862669f53..38cb460b79 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/FactoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/FactoryTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.0
  */
-public final strictfp class FactoryTest extends GeometriesTestCase {
+public final class FactoryTest extends GeometriesTestCase {
     /**
      * Creates a new test case.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java
index b8a78b850c..cc60a46e9a 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/JTSTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.0
  */
-public final strictfp class JTSTest extends TestCase {
+public final class JTSTest extends TestCase {
     /**
      * Tests {@link JTS#getCoordinateReferenceSystem(Geometry)}.
      *
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java
index 26eecc27dc..f227217f0d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeAdapterTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class ShapeAdapterTest extends TestCase {
+public final class ShapeAdapterTest extends TestCase {
     /**
      * The geometry factory used by the tests.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java
index 8ed60ccfd5..d1250ffbd1 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java
@@ -48,7 +48,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class ShapeConverterTest extends TestCase {
+public final class ShapeConverterTest extends TestCase {
     /**
      * The geometry factory used by the tests.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/FunctionNamesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/FunctionNamesTest.java
index fcd6db6ece..f3ee5e5c43 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/FunctionNamesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/FunctionNamesTest.java
@@ -42,7 +42,7 @@ import org.opengis.filter.Expression;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class FunctionNamesTest extends TestCase {
+public final class FunctionNamesTest extends TestCase {
     /**
      * Verifies that each field has the same name than its value.
      *
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java
index 6cf97d62ad..ad4a6f1d3b 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java
@@ -65,7 +65,7 @@ import org.opengis.filter.ValueReference;
  *
  * @since 1.1
  */
-public abstract strictfp class RegistryTestCase<G> extends TestCase {
+public abstract class RegistryTestCase<G> extends TestCase {
     /**
      * Name of property value used in test feature instances.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java
index 0cf4095dd9..9592b084d9 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingESRI_Test.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class RegistryUsingESRI_Test extends RegistryTestCase<Geometry> {
+public final class RegistryUsingESRI_Test extends RegistryTestCase<Geometry> {
     /**
      * Creates a new test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java
index 760d166222..e2318912e7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJTS_Test.java
@@ -27,7 +27,7 @@ import org.locationtech.jts.geom.Geometry;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class RegistryUsingJTS_Test extends RegistryTestCase<Geometry> {
+public final class RegistryUsingJTS_Test extends RegistryTestCase<Geometry> {
     /**
      * Creates a new test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java
index d8401eab38..a5da4a7907 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryUsingJava2D_Test.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class RegistryUsingJava2D_Test extends RegistryTestCase<Shape> {
+public final class RegistryUsingJava2D_Test extends RegistryTestCase<Shape> {
     /**
      * Creates a new test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
index 6bcf098fde..4f779b60ae 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
@@ -46,7 +46,7 @@ import org.opengis.filter.FilterFactory;
  * @version 1.3
  * @since   1.1
  */
-public final strictfp class SQLMMTest extends TestCase {
+public final class SQLMMTest extends TestCase {
     /**
      * The factory to use for creating the objects to test.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/IsolinesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/IsolinesTest.java
index 8f11d77b2a..8412838a1c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/IsolinesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/processing/isoline/IsolinesTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class IsolinesTest extends TestCase {
+public final class IsolinesTest extends TestCase {
     /**
      * Tolerance threshold for rounding errors. Needs to take in account that
      * {@link org.apache.sis.internal.feature.j2d.Polyline} stores coordinate
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java b/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java
index c63b0e8391..fdbb19f102 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public strictfp class FeatureAssert extends ReferencingAssert {
+public class FeatureAssert extends ReferencingAssert {
     /**
      * For subclass constructor only.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java b/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
index 91e9b8c2d6..04fead7b0c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
@@ -51,7 +51,7 @@ import org.opengis.feature.Operation;
  * @version 1.1
  * @since   1.1
  */
-public strictfp class FeatureComparator {
+public class FeatureComparator {
     /**
      * The expected feature, or {@code null} if comparing only feature type.
      */
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
index 9cc8089804..2c588d0a13 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
@@ -125,7 +125,7 @@ import org.junit.runners.Suite;
     org.apache.sis.index.tree.PointTreeNodeTest.class,
     org.apache.sis.index.tree.PointTreeTest.class
 })
-public final strictfp class FeatureTestSuite extends TestSuite {
+public final class FeatureTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
index 5509e3a9c9..b8e9795402 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.xml.IdentifierSpace.*;
  * @version 0.7
  * @since   0.3
  */
-public strictfp class IdentifierMapAdapterTest extends TestCase {
+public class IdentifierMapAdapterTest extends TestCase {
     /**
      * Tests serialization.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
index 2e58da4a7d..04ddf39b62 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.xml.IdentifierSpace.*;
  * @since   0.7
  */
 @DependsOn(IdentifierMapAdapterTest.class)
-public final strictfp class ModifiableIdentifierMapTest extends TestCase {
+public final class ModifiableIdentifierMapTest extends TestCase {
     /**
      * The HREF string to replace by {@link XLink#toString()}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
index 2761ac72d3..a686a62d0e 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
@@ -46,7 +46,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.1
  * @since   0.3
  */
-public final strictfp class CodeListMarshallingTest extends TestCase {
+public final class CodeListMarshallingTest extends TestCase {
     /**
      * Returns a XML string to use for testing purpose.
      * Note that responsible party exists only in legacy ISO 19115:2003 model.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java
index ce4018bee7..b258564301 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java
@@ -29,7 +29,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.6
  */
-public final strictfp class EnumAdapterTest extends TestCase {
+public final class EnumAdapterTest extends TestCase {
     /**
      * Tests the {@link EnumAdapter#name(String)} method.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
index 8125f34765..29225057de 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.0
  * @since   0.5
  */
-public final strictfp class EnumMarshallingTest extends TestCase {
+public final class EnumMarshallingTest extends TestCase {
     /**
      * Tests (un)marshalling of an enumeration.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java
index f2c2e8bb12..f59a4b395f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/MultiplicityTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class MultiplicityTest extends TestUsingFile {
+public final class MultiplicityTest extends TestUsingFile {
     /**
      * An XML file containing multiplicity declarations.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java
index d291a22994..42bab79907 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java
@@ -33,7 +33,7 @@ import org.apache.sis.internal.jaxb.ModifiableIdentifierMap;
  * @version 0.3
  * @since   0.3
  */
-final strictfp class PropertyTypeMock extends PropertyType<PropertyTypeMock, Result> {
+final class PropertyTypeMock extends PropertyType<PropertyTypeMock, Result> {
     /**
      * Creates a new adapter. Only the {@link #marshal(Object)}
      * method shall be invoked on that new instance.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
index d55f2aecd1..25efc1247c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @DependsOn(org.apache.sis.internal.jaxb.IdentifierMapAdapterTest.class)
-public final strictfp class PropertyTypeTest extends TestCase {
+public final class PropertyTypeTest extends TestCase {
     /**
      * The pseudo-metadata object to wrap for testing purpose.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
index 29a1a1ebf9..758ec3e11b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @version 0.7
  * @since   0.3
  */
-public final strictfp class StringAdapterTest extends TestCase {
+public final class StringAdapterTest extends TestCase {
     /**
      * Tests {@link StringAdapter#toString(CharSequence)} for the trivial cases.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
index c60d796ece..89ec5f990f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.3
  */
-public final strictfp class MeasureTest extends TestCase {
+public final class MeasureTest extends TestCase {
     /**
      * The URL used in {@code uom} attribute of XML elements which contains a measurements.
      * Example:
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
index f27aece699..91bde13844 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
@@ -49,7 +49,7 @@ import org.opengis.temporal.Instant;
  * @version 1.2
  * @since   0.3
  */
-public final strictfp class TimePeriodTest extends TestCase {
+public final class TimePeriodTest extends TestCase {
     /**
      * A poll of configured {@link Marshaller} and {@link Unmarshaller}, created when first needed.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java
index 1a916f2986..0483303fa1 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class FreeTextMarshallingTest extends TestCase {
+public final class FreeTextMarshallingTest extends TestCase {
     /**
      * Returns the expected string.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
index 8229fd0106..c8d9edf960 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
@@ -52,7 +52,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.UTC;
  * @version 1.1
  * @since   0.3
  */
-public final strictfp class LanguageCodeTest extends TestCase {
+public final class LanguageCodeTest extends TestCase {
     /**
      * XML fragment using the {@code <gco:CharacterString>} construct.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java
index dbcd0830ab..c3323fb68e 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   0.5
  */
-public final strictfp class OtherLocalesTest extends TestCase {
+public final class OtherLocalesTest extends TestCase {
     /**
      * Returns the locales in an array. Character sets are ignored.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java
index fb2cd8d3fd..8cb3210927 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.4
  */
-public final strictfp class PT_LocaleTest extends TestUsingFile {
+public final class PT_LocaleTest extends TestUsingFile {
     /**
      * An XML file containing localized strings.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
index b97fb2f08d..6f98c4074a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.3
  * @since   1.3
  */
-public final strictfp class QualityParameterTest extends TestCase {
+public final class QualityParameterTest extends TestCase {
     /**
      * Creates the parameter to use for testing purpose.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
index 5a7c6b1534..b059c6efb5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.3
  * @since   0.5
  */
-public final strictfp class ServiceParameterTest extends TestCase {
+public final class ServiceParameterTest extends TestCase {
     /**
      * Creates the parameter to use for testing purpose.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java
index 6b458cab03..df34a323e2 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/AxisNamesTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.6
  * @since   0.6
  */
-public final strictfp class AxisNamesTest extends TestCase {
+public final class AxisNamesTest extends TestCase {
     /**
      * Tests {@link AxisNames#toCamelCase(String)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/IdentifiersTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/IdentifiersTest.java
index 2c179a4bed..e78ef48412 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/IdentifiersTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/IdentifiersTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
  * @since  1.0
  * @versio 1.0
  */
-public final strictfp class IdentifiersTest extends TestCase {
+public final class IdentifiersTest extends TestCase {
     /**
      * Creates a citation with the given title and the given identifiers.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/ImplementationHelperTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/ImplementationHelperTest.java
index 418059fe1f..3c0c61d260 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/ImplementationHelperTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/ImplementationHelperTest.java
@@ -36,7 +36,7 @@ import static java.util.Locale.*;
  * @version 1.3
  * @since   0.3
  */
-public final strictfp class ImplementationHelperTest extends TestCase {
+public final class ImplementationHelperTest extends TestCase {
     /**
      * Tests {@link ImplementationHelper#toMilliseconds(Date)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java
index b3e2aa76fc..508a3af152 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java
@@ -47,7 +47,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.8
  */
-public final strictfp class MergerTest extends TestCase {
+public final class MergerTest extends TestCase {
     /**
      * Creates a metadata sample with 3 content information of different kind.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java
index edc2489681..6578c27352 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 0.7
  * @since   0.5 (derived from 0.4)
  */
-public final strictfp class NameMeaningTest extends TestCase {
+public final class NameMeaningTest extends TestCase {
     /**
      * Tests {@link NameMeaning#toObjectType(Class)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java
index 25f8c5d182..127f9942eb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/SQLUtilitiesTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   0.7
  */
-public final strictfp class SQLUtilitiesTest extends TestCase {
+public final class SQLUtilitiesTest extends TestCase {
     /**
      * Tests {@link SQLUtilities#toLikePattern(String, int, int, boolean, boolean, StringBuilder)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java
index 409c78b807..cf3045258a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   0.8
  */
-public final strictfp class ScriptRunnerTest extends TestCase {
+public final class ScriptRunnerTest extends TestCase {
     /**
      * Tests {@link ScriptRunner} with an in-memory Derby database.
      * This method delegates its work to all other methods in this class that expect a {@link ScriptRunner} argument.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java
index b4d527e06c..bb68d5013f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/TypeMapperTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class TypeMapperTest extends TestCase {
+public final class TypeMapperTest extends TestCase {
     /**
      * Tests {@link TypeMapper#toJavaType(int)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java
index addc623708..abf8247d96 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class SimpleIdentifierTest extends TestCase {
+public final class SimpleIdentifierTest extends TestCase {
     /**
      * Tests {@link SimpleIdentifier#toString()}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/test/DocumentComparatorTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/test/DocumentComparatorTest.java
index 30351e4c3d..736906bbbb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/test/DocumentComparatorTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/test/DocumentComparatorTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.4
  * @since   0.3
  */
-public final strictfp class DocumentComparatorTest extends TestCase {
+public final class DocumentComparatorTest extends TestCase {
     /**
      * Tests the {@link DocumentComparator#ignoredAttributes} and {@link DocumentComparator#ignoredNodes} sets.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java
index 7e81ec3892..484aedd3f3 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/xml/XmlUtilitiesTest.java
@@ -43,7 +43,7 @@ import static javax.xml.datatype.DatatypeConstants.FIELD_UNDEFINED;
  * @version 1.3
  * @since   0.3
  */
-public final strictfp class XmlUtilitiesTest extends TestCase {
+public final class XmlUtilitiesTest extends TestCase {
     /**
      * Tests the {@link XmlUtilities#toXML(Context, Date)} method.
      * This test arbitrarily uses the CET timezone.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java
index 92448423b5..fdc0698098 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java
@@ -32,7 +32,7 @@ import static org.apache.sis.test.TestUtilities.toTreeStructure;
  * @since   0.3
  */
 @DependsOn(MetadataStandardTest.class)
-public final strictfp class AbstractMetadataTest extends TestCase {
+public final class AbstractMetadataTest extends TestCase {
     /**
      * Tests the {@link AbstractMetadata#hashCode()} method on an object having cyclic associations.
      * This is the same test than {@link MetadataStandardTest#testHashCodeOnCyclicMetadata()}, with
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/HashCodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/HashCodeTest.java
index f9e28abb75..8e4d2744e1 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/HashCodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/HashCodeTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.*;
  * @since   1.0
  */
 @DependsOn(PropertyAccessorTest.class)
-public final strictfp class HashCodeTest extends TestCase {
+public final class HashCodeTest extends TestCase {
     /**
      * Computes the hash code value of the given object.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
index dd099650a5..d26d518189 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @DependsOn({PropertyAccessorTest.class, PropertyInformationTest.class})
-public final strictfp class InformationMapTest extends TestCase {
+public final class InformationMapTest extends TestCase {
     /**
      * Tests {@link InformationMap#get(Object)} on a few specific properties of the {@link Citation} type.
      * This test duplicates {@link PropertyInformationTest}, but is done here again as an integration test.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
index fbee48f7ea..6607205828 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
@@ -47,7 +47,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since 0.8
  */
 @DependsOn(MetadataStandardTest.class)
-public final strictfp class MetadataCopierTest extends TestCase {
+public final class MetadataCopierTest extends TestCase {
     /**
      * Tests {@link MetadataCopier#copy(Object)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
index 333c5c7d6a..3b764d7eae 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
@@ -67,7 +67,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
     NameMapTest.class,
     TypeMapTest.class,
     ValueMapTest.class})
-public final strictfp class MetadataStandardTest extends TestCase {
+public final class MetadataStandardTest extends TestCase {
     /**
      * The standard being tested.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java
index fa1cacc5be..26381700c9 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   1.0
  */
 @DependsOn(AbstractMetadataTest.class)
-public final strictfp class ModifiableMetadataTest extends TestCase {
+public final class ModifiableMetadataTest extends TestCase {
     /**
      * An arbitrary metadata on which to perform the tests.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
index 9ce52a5b1d..6c0705ed04 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.metadata.KeyNamePolicy.*;
  * @since   0.3
  */
 @DependsOn(PropertyAccessorTest.class)
-public final strictfp class NameMapTest extends TestCase {
+public final class NameMapTest extends TestCase {
     /**
      * Tests {@code NameMap.entrySet()} for an exact match (including iteration order).
      * The properties used in this test are listed in {@link PropertyAccessorTest#testConstructor()}.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
index 109a8bf443..10c5cb88e4 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
@@ -84,7 +84,7 @@ import static org.apache.sis.metadata.PropertyAccessor.RETURN_PREVIOUS;
  */
 @SuppressWarnings("OverlyStrongTypeCast")
 @DependsOn(PropertyInformationTest.class)
-public final strictfp class PropertyAccessorTest extends TestCase {
+public final class PropertyAccessorTest extends TestCase {
     /**
      * Creates a new property accessor for the {@link DefaultCitation} class.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
index a266fea706..0e4adc922e 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@ -53,7 +53,7 @@ import org.junit.Test;
  * @since   0.3
  */
 @DependsOn(PropertyAccessorTest.class)
-public abstract strictfp class PropertyConsistencyCheck extends AnnotationConsistencyCheck {
+public abstract class PropertyConsistencyCheck extends AnnotationConsistencyCheck {
     /**
      * The standard implemented by the metadata objects to test.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java
index a90589c0fc..88a6c5fce4 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class PropertyInformationTest extends TestCase {
+public final class PropertyInformationTest extends TestCase {
     /**
      * Creates a property information instance for the given method of the {@link Citation} interface.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PrunerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PrunerTest.java
index 7432b2cdd9..57434c4dd5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PrunerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PrunerTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.metadata.ValueExistencePolicy.isNullOrEmpty;
  * @since   0.3
  */
 @DependsOn(HashCodeTest.class)
-public final strictfp class PrunerTest extends TestCase {
+public final class PrunerTest extends TestCase {
     /**
      * The root metadata object being tested.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
index 2e764f2cd8..38e6384997 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.4
  */
 @DependsOn(PropertyAccessorTest.class)
-public final strictfp class SpecialCasesTest extends TestCase {
+public final class SpecialCasesTest extends TestCase {
     /**
      * The accessor instance to be tested.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
index db12477415..fd88b2f188 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @DependsOn(PropertyAccessorTest.class)
-public final strictfp class TreeNodeChildrenTest extends TestCase {
+public final class TreeNodeChildrenTest extends TestCase {
     /**
      * Creates a shallow metadata object without collections.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
index a2adc0f9dd..81f5beecd9 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
@@ -53,7 +53,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @since   0.3
  */
 @DependsOn(TreeNodeChildrenTest.class)
-public final strictfp class TreeNodeTest extends TestCase {
+public final class TreeNodeTest extends TestCase {
     /**
      * Creates a metadata hierarchy to be used for the tests.
      * This method creates the following metadata:
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
index cb5e57f8a7..ae045d94e8 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
@@ -47,7 +47,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.3
  */
 @DependsOn(TreeTableViewTest.class)
-public final strictfp class TreeTableFormatTest extends TestCase {
+public final class TreeTableFormatTest extends TestCase {
     /**
      * The formatter to use.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
index 819f0a44f7..cb2357741d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.test.TestUtilities.formatMetadata;
  * @since   0.3
  */
 @DependsOn(TreeNodeTest.class)
-public final strictfp class TreeTableViewTest extends TestCase {
+public final class TreeTableViewTest extends TestCase {
     /**
      * Creates a table to be tested for the given value policy.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java
index 1dc88da141..2b7e78007d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java
@@ -51,7 +51,7 @@ import static java.util.AbstractMap.SimpleEntry;
  * @since   0.3
  */
 @DependsOn(PropertyAccessorTest.class)
-public final strictfp class TypeMapTest extends TestCase {
+public final class TypeMapTest extends TestCase {
     /**
      * Tests {@code TypeMap.entrySet()} for an exact match (including iteration order).
      * The properties used in this test are listed in {@link PropertyAccessorTest#testConstructor()}.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
index 9b53974315..1bfff4f3f0 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
@@ -51,7 +51,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since 0.3
  */
 @DependsOn(PropertyAccessorTest.class)
-public final strictfp class ValueMapTest extends TestCase {
+public final class ValueMapTest extends TestCase {
     /**
      * The citation instance created by {@link #createCitation()}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
index 5ff3b5acda..cc7bd653ca 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
@@ -52,7 +52,7 @@ import static org.junit.Assert.*;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class APIVerifier extends TestCase {
+public final class APIVerifier extends TestCase {
     /**
      * The method being verified.
      * This is used in case of errors for providing information about the problematic method.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
index 41a801621d..34270e84fb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
  * @since   0.3
  */
 @DependsOn(org.apache.sis.metadata.PropertyAccessorTest.class)
-public final strictfp class AllMetadataTest extends PropertyConsistencyCheck {
+public final class AllMetadataTest extends PropertyConsistencyCheck {
     /**
      * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to
      * do so, but should be considered as an implementation details (it should have been a private field).
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
index 4dd9218e8e..dbafd50fb5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.*;
  * @version 0.5
  * @since   0.3
  */
-public final strictfp class CustomMetadataTest extends TestCase {
+public final class CustomMetadataTest extends TestCase {
     /**
      * Tests the marshalling of a metadata implemented by {@link Proxy}.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
index c6f35b5341..be558e4f30 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.metadata.iso.citation.DefaultCitationTest.class)
-public final strictfp class DefaultIdentifierTest extends TestCase {
+public final class DefaultIdentifierTest extends TestCase {
     /**
      * The expected XML representation for this test.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
index 7f8ce3d670..a899c58116 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
@@ -54,7 +54,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.3
  */
 @DependsOn(org.apache.sis.internal.jaxb.lan.OtherLocalesTest.class)
-public final strictfp class DefaultMetadataTest extends TestCase {
+public final class DefaultMetadataTest extends TestCase {
     /**
      * Tests unmarshalling of a metadata having a collection that contains no element.
      * This was used to cause a {@code NullPointerException} prior SIS-139 fix.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
index aba310ad35..dbd8b6da7d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
@@ -48,7 +48,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @since   0.6
  */
 @DependsOn(org.apache.sis.metadata.sql.MetadataSourceTest.class)
-public final strictfp class CitationsTest extends TestCase {
+public final class CitationsTest extends TestCase {
     /**
      * Verifies that {@link Citations#values()} is complete by comparing with the list
      * of constants given by reflection.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java
index f076282b9f..255b74c611 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationDateTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class DefaultCitationDateTest extends TestCase {
+public final class DefaultCitationDateTest extends TestCase {
     /**
      * Tests the copy constructor.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index 12b7a8982d..a62519dd7d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@ -61,7 +61,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class DefaultCitationTest extends TestUsingFile {
+public final class DefaultCitationTest extends TestUsingFile {
     /**
      * An XML file containing a citation.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
index 6b0721c21c..dbfeade154 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class DefaultContactTest extends TestCase implements Filter {
+public final class DefaultContactTest extends TestCase implements Filter {
     /**
      * The resource key for the message of the warning that occurred, or {@code null} if none.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
index 17e6cdedc8..97b8e27f8b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.1
  * @since   0.5
  */
-public final strictfp class DefaultResponsibilityTest extends TestCase {
+public final class DefaultResponsibilityTest extends TestCase {
     /**
      * Tests marshalling with replacement of {@link DefaultResponsibility} by {@link DefaultResponsibleParty}.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
index ddfceee99e..af78248a9c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
@@ -39,7 +39,7 @@ import org.apache.sis.util.Static;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class HardCodedCitations extends Static {
+public final class HardCodedCitations extends Static {
     /**
      * The ISO 19111 standard.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
index 3e795447e2..c551544209 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPAC
  * @version 1.0
  * @since   0.4
  */
-public final strictfp class DefaultLegalConstraintsTest extends TestCase {
+public final class DefaultLegalConstraintsTest extends TestCase {
     /**
      * Tests unmarshalling of an element containing an empty {@code codeListValue} attribute.
      * This was used to cause a {@code NullPointerException} prior SIS-157 fix.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
index f84551e20b..303a2239c5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPAC
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class DefaultBandTest extends TestCase {
+public final class DefaultBandTest extends TestCase {
     /**
      * The XML fragment used for testing.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
index 102014acfc..968cfd271b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.TestUtilities.date;
  * @since   0.3
  */
 @DependsOn(DefaultGeographicBoundingBoxTest.class)
-public final strictfp class DefaultExtentTest extends TestUsingFile {
+public final class DefaultExtentTest extends TestUsingFile {
     /**
      * An XML file containing extent information.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java
index 12937d7930..9b4ad945ea 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.2
  * @since   0.4
  */
-public final strictfp class DefaultGeographicBoundingBoxTest extends TestCase {
+public final class DefaultGeographicBoundingBoxTest extends TestCase {
     /**
      * Asserts that the given geographic bounding box is strictly equals to the given values.
      * The {@link GeographicBoundingBox#getInclusion()} is expected to be {@code true}.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java
index 7739bfdb5d..122699462e 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/ExtentsTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.*;
  * @since   0.4
  */
 @DependsOn({DefaultGeographicBoundingBoxTest.class, DefaultExtentTest.class})
-public final strictfp class ExtentsTest extends TestCase {
+public final class ExtentsTest extends TestCase {
     /**
      * One minute of angle, in degrees.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
index 18d84c740b..18f5477d72 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.0
  * @since   0.4
  */
-public final strictfp class DefaultBrowseGraphicTest extends TestCase {
+public final class DefaultBrowseGraphicTest extends TestCase {
     /**
      * {@code false} if testing ISO 19115-3 document, or {@code true} if testing ISO 19139:2007 document.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
index 9ff73acc08..e04c57beec 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
  * @since   0.5
  */
 @DependsOn(ServiceParameterTest.class)
-public final strictfp class DefaultCoupledResourceTest extends TestCase {
+public final class DefaultCoupledResourceTest extends TestCase {
     /**
      * Creates the resource to use for testing purpose.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
index 38f63fbb80..7fc1a1b194 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
@@ -52,7 +52,7 @@ import static org.apache.sis.test.MetadataAssert.*;
     org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBoxTest.class,
     DefaultKeywordsTest.class
 })
-public final strictfp class DefaultDataIdentificationTest extends TestCase {
+public final class DefaultDataIdentificationTest extends TestCase {
     /**
      * Creates the instance to test.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultKeywordsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultKeywordsTest.java
index ee779be1fe..00df5b88a6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultKeywordsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultKeywordsTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class DefaultKeywordsTest extends TestCase {
+public final class DefaultKeywordsTest extends TestCase {
     /**
      * Tests {@link DefaultKeywords#DefaultKeywords(CharSequence[])}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
index 0204b3903f..58056b0ce8 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.0
  * @since   0.4
  */
-public final strictfp class DefaultRepresentativeFractionTest extends TestCase {
+public final class DefaultRepresentativeFractionTest extends TestCase {
     /**
      * {@code false} if testing ISO 19115-3 document, or {@code true} if testing ISO 19139:2007 document.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
index d52c2256e4..6af779594f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.internal.jaxb.gml.MeasureTest.UOM_URL;
  * @since   0.3
  */
 @DependsOn(DefaultRepresentativeFractionTest.class)
-public final strictfp class DefaultResolutionTest extends TestCase {
+public final class DefaultResolutionTest extends TestCase {
     /**
      * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to
      * do so, but should be considered as an implementation details (it should have been a private field).
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
index 112e2e2428..d09b0196c3 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
@@ -50,7 +50,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
     DefaultCoupledResourceTest.class,
     org.apache.sis.metadata.iso.identification.DefaultDataIdentificationTest.class
 })
-public final strictfp class DefaultServiceIdentificationTest extends TestUsingFile {
+public final class DefaultServiceIdentificationTest extends TestUsingFile {
     /**
      * An XML file containing a service identification.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
index 9bd1a7cb0a..298dd684d2 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class DefaultLineageTest extends TestCase {
+public final class DefaultLineageTest extends TestCase {
     /**
      * Create a lineage to marshal. If {@code extension} is {@code false}, then this method uses
      * only properties defined in ISO 19115-1. If {@code extension} is {@code true}, then this
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
index f7777b4125..0eec1f9e9b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
@@ -35,7 +35,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class DefaultProcessStepTest extends TestUsingFile {
+public final class DefaultProcessStepTest extends TestUsingFile {
     /**
      * An XML file containing process step information.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
index 8183ec39c9..a5bf671948 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.5
  * @since   0.3
  */
-public final strictfp class DefaultScopeDescriptionTest extends TestCase {
+public final class DefaultScopeDescriptionTest extends TestCase {
     /**
      * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to
      * do so, but should be considered as an implementation details (it should have been a private field).
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java
index fc6abc5c92..ec503d61e9 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractElementTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   0.3
  */
-public final strictfp class AbstractElementTest extends TestCase {
+public final class AbstractElementTest extends TestCase {
     /**
      * Tests {@link Element#getDates()}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
index 25f412f6bf..08e31125bb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.3
  */
 @DependsOn(FreeTextMarshallingTest.class)
-public final strictfp class AbstractPositionalAccuracyTest extends TestUsingFile {
+public final class AbstractPositionalAccuracyTest extends TestUsingFile {
     /**
      * An XML file containing quality information.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistencyTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistencyTest.java
index a22437bee1..35c42dd705 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistencyTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistencyTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   1.3
  */
-public final strictfp class DefaultDomainConsistencyTest extends TestCase {
+public final class DefaultDomainConsistencyTest extends TestCase {
     /**
      * Tests {@link DefaultDomainConsistency#asMap()}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java
index 2a75bd66af..d320509c1c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java
@@ -32,7 +32,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.3
  * @since   1.3
  */
-public final strictfp class DefaultEvaluationMethodTest extends TestCase {
+public final class DefaultEvaluationMethodTest extends TestCase {
     /**
      * Tests the {@link DefaultEvaluationMethod#getDates()} list,
      * which is backed by a custom implementation.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java
index d5bea2c983..6ae5339a13 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   1.3
  */
-public final strictfp class DefaultQuantitativeResultTest extends TestCase {
+public final class DefaultQuantitativeResultTest extends TestCase {
     /**
      * Tests {@link DefaultQuantitativeResult#isEmpty()}. The {@code isEmpty()} method needs a special check
      * for the deprecated {@code "errorStatistic"} property because, contrarily to other deprecated properties,
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
index f47c84f5a9..60432b634a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  *
  * @since 1.1
  */
-public final strictfp class ScopeCodeTest extends TestCase {
+public final class ScopeCodeTest extends TestCase {
     /**
      * The XML fragment used for testing.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java
index 091c9cc987..69d597b6f6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class DefaultGeorectifiedTest extends TestCase {
+public final class DefaultGeorectifiedTest extends TestCase {
     /**
      * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to
      * do so, but should be considered as an implementation details (it should have been a private field).
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
index b03efc0656..0223c9a750 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   0.8
  */
-public final strictfp class IdentifierGeneratorTest extends TestCase {
+public final class IdentifierGeneratorTest extends TestCase {
     /**
      * The name of the table to be created for testing purpose.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
index 8df5c6bbd8..4f3e28dd26 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
@@ -41,7 +41,7 @@ import static org.apache.sis.internal.util.CollectionsExt.first;
  * @version 1.0
  * @since   0.8
  */
-public final strictfp class MetadataFallbackVerifier {
+public final class MetadataFallbackVerifier {
     /**
      * Identifier for which {@link MetadataFallback} does not provide hard-coded values.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
index 4e7046f7d6..199df45513 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.8
  */
 @DependsOn(org.apache.sis.internal.metadata.sql.ScriptRunnerTest.class)
-public final strictfp class MetadataSourceTest extends TestCase {
+public final class MetadataSourceTest extends TestCase {
     /**
      * Tests {@link MetadataSource} with an in-memory Derby database.
      * This method delegates its work to all other methods in this class that expect a {@link MetadataSource} argument.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
index 9dbb6c242b..b5a08850ef 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@ -52,7 +52,7 @@ import org.opengis.metadata.citation.Responsibility;
     MetadataSourceTest.class,
     IdentifierGeneratorTest.class
 })
-public final strictfp class MetadataWriterTest extends TestCase {
+public final class MetadataWriterTest extends TestCase {
     /**
      * The data source providing connections to the database.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java
index 4ccfb0812e..cb28fda824 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/SchemaComplianceTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assume.*;
  * @version 1.1
  * @since   1.0
  */
-public final strictfp class SchemaComplianceTest extends TestCase {
+public final class SchemaComplianceTest extends TestCase {
     /**
      * Verifies compliance with metadata schemas.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/TestUsingFile.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/TestUsingFile.java
index 9dd0092487..da335528fb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/TestUsingFile.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/xml/TestUsingFile.java
@@ -28,7 +28,7 @@ import org.apache.sis.test.xml.TestCase;
  * @version 1.0
  * @since   1.0
  */
-public abstract strictfp class TestUsingFile extends TestCase {
+public abstract class TestUsingFile extends TestCase {
     /**
      * The sub-directory of XML files encoded according the ISO 19115-3:2016 schema.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java b/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
index 4c8c18921c..399796cb07 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
@@ -45,7 +45,7 @@ import org.opengis.metadata.citation.Responsibility;
  * @version 1.0
  * @since   0.4
  */
-public strictfp class MetadataAssert extends Assert {
+public class MetadataAssert extends Assert {
     /**
      * For subclass constructor only.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java
index 822f357010..e08d1898d1 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java
@@ -32,7 +32,7 @@ import org.opengis.referencing.cs.RangeMeaning;
  * @since   0.6
  */
 @SuppressWarnings("serial")
-public strictfp class CoordinateSystemAxisMock extends IdentifiedObjectMock
+public class CoordinateSystemAxisMock extends IdentifiedObjectMock
         implements CoordinateSystemAxis, CoordinateSystem
 {
     /**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
index 7dbeafe5f1..a6ec89e80c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
@@ -41,7 +41,7 @@ import org.apache.sis.internal.jaxb.gco.GO_GenericName;
  */
 @SuppressWarnings("serial")
 @XmlRootElement(name = "IO_IdentifiedObject")
-public strictfp class IdentifiedObjectMock implements IdentifiedObject, Identifier, Serializable {
+public class IdentifiedObjectMock implements IdentifiedObject, Identifier, Serializable {
     /**
      * The object name to be returned by {@link #getCode()}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/MetadataMock.java b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/MetadataMock.java
index d260233101..5d904694e6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/MetadataMock.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/MetadataMock.java
@@ -43,7 +43,7 @@ import org.apache.sis.xml.Namespaces;
  * @since   0.4
  */
 @XmlRootElement(name = "MD_Metadata", namespace = Namespaces.MDB)
-public final strictfp class MetadataMock extends SimpleMetadata {
+public final class MetadataMock extends SimpleMetadata {
     /**
      * The language used for documenting metadata.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
index 7b42f71222..5c401d6952 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
@@ -37,7 +37,7 @@ import org.apache.sis.measure.Units;
  * @since   0.4
  */
 @SuppressWarnings("serial")
-public final strictfp class VerticalCRSMock extends IdentifiedObjectMock
+public final class VerticalCRSMock extends IdentifiedObjectMock
         implements VerticalCRS, VerticalDatum, VerticalCS, CoordinateSystemAxis
 {
     /**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/sql/TestDatabase.java b/core/sis-metadata/src/test/java/org/apache/sis/test/sql/TestDatabase.java
index c28dd58a70..57092f54ad 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/sql/TestDatabase.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/sql/TestDatabase.java
@@ -65,7 +65,7 @@ import static org.junit.Assume.assumeTrue;
  * @version 1.2
  * @since   0.7
  */
-public strictfp class TestDatabase implements AutoCloseable {
+public class TestDatabase implements AutoCloseable {
     /**
      * Data source for connection to an alternative database for testing purpose.
      * If {@code null}, an in-memory Derby database will be used.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java b/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
index 66466afc3d..c0139fa9e4 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
@@ -143,7 +143,7 @@ import org.junit.BeforeClass;
     org.apache.sis.metadata.iso.citation.CitationsTest.class,
     org.apache.sis.metadata.xml.SchemaComplianceTest.class
 })
-public final strictfp class MetadataTestSuite extends TestSuite {
+public final class MetadataTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
index a9f4b844c8..1e4cf0b4ba 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
@@ -75,7 +75,7 @@ import junit.framework.AssertionFailedError;
  * @version 1.3
  * @since   0.3
  */
-public abstract strictfp class AnnotationConsistencyCheck extends TestCase {
+public abstract class AnnotationConsistencyCheck extends TestCase {
     /**
      * The {@value} string used in JAXB annotations for default names or namespaces.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java
index a2f849671a..c5c721665d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java
@@ -79,7 +79,7 @@ import static org.apache.sis.util.Characters.NO_BREAK_SPACE;
  *
  * @since 0.3
  */
-public strictfp class DocumentComparator {
+public class DocumentComparator {
     /**
      * Commonly used prefixes for namespaces. Used as shorthands for calls to
      * {@link org.apache.sis.test.MetadataAssert#assertXmlEquals(Object, Object, String[])}.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java
index ea6e405002..7b3fedf8b1 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java
@@ -57,7 +57,7 @@ import static org.apache.sis.test.TestCase.PENDING_FUTURE_SIS_VERSION;
  * @version 1.3
  * @since   1.0
  */
-final strictfp class PackageVerifier {
+final class PackageVerifier {
     /**
      * Sentinel value used in {@link #LEGACY_NAMESPACES} for meaning "all properties in that namespace".
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java
index e5d498d4d8..51af499ad6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java
@@ -56,7 +56,7 @@ import org.apache.sis.util.StringBuilders;
  * @version 1.3
  * @since   1.0
  */
-public final strictfp class SchemaCompliance extends SchemaInformation {
+public final class SchemaCompliance extends SchemaInformation {
     /**
      * The prefix of XML type names for properties. In ISO/OGC schemas, this prefix does not appear
      * in the definition of class types but may appear in the definition of property types.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java
index 2d2c511afa..6b452c19e5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java
@@ -63,7 +63,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  *
  * @since 0.3
  */
-public abstract strictfp class TestCase extends org.apache.sis.test.TestCase {
+public abstract class TestCase extends org.apache.sis.test.TestCase {
     /**
      * Miscellaneous version constants used for ISO standards.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
index 5c51295548..32af7d4193 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.util.iso.DefaultNameSpace.DEFAULT_SEPARATOR_STRING;
  * @version 0.8
  * @since   0.3
  */
-public final strictfp class DefaultLocalNameTest extends TestCase {
+public final class DefaultLocalNameTest extends TestCase {
     /**
      * Tests the creation of a local name in the global namespace.
      * The fully qualified name is {@code "EPSG"}.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java
index b78b8cbaca..b9a48bc56a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
  */
 @RunWith(TestRunner.class)
 @DependsOn({DefaultLocalNameTest.class, DefaultScopedNameTest.class})
-public final strictfp class DefaultNameFactoryTest extends NameTest {
+public final class DefaultNameFactoryTest extends NameTest {
     /**
      * The factory to test.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
index dc10dfd4db..fb65d9acfc 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.*;
     DefaultRecordTypeTest.class,
     NamesTest.class
 })
-public final strictfp class DefaultRecordSchemaTest extends TestCase {
+public final class DefaultRecordSchemaTest extends TestCase {
     /**
      * Tests {@link DefaultRecordSchema#createRecordType(CharSequence, Map)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java
index fabda83c82..27e5fc7d89 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.5
  */
 @DependsOn(DefaultRecordSchemaTest.class)
-public final strictfp class DefaultRecordTest extends TestCase {
+public final class DefaultRecordTest extends TestCase {
     /**
      * The record type to be shared by all tests.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
index a6b908c5a0..fc5834206b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.5
  */
 @DependsOn(TypeNamesTest.class)
-public final strictfp class DefaultRecordTypeTest extends TestCase {
+public final class DefaultRecordTypeTest extends TestCase {
     /** Value of {@link DefaultRecordType#getContainer()}.  */ private DefaultRecordSchema container;
     /** Value of {@link DefaultRecordType#getTypeName()}.   */ private DefaultTypeName     recordTypeName;
     /** Value of {@link DefaultRecordType#getMembers()}.    */ private DefaultMemberName   fieldName;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
index 679d415c29..3a3136790a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.3
  */
 @DependsOn(DefaultLocalNameTest.class)
-public final strictfp class DefaultScopedNameTest extends TestCase {
+public final class DefaultScopedNameTest extends TestCase {
     /**
      * Tests the creation of a scoped name in a new namespace.
      * The fully qualified name is {@code "urn:ogc:def:crs:epsg:4326"}.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
index 4524560ffe..ac16b9b502 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
@@ -50,7 +50,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @since   0.3
  */
 @DependsOn(DefaultNameFactoryTest.class)
-public final strictfp class NameMarshallingTest extends TestCase {
+public final class NameMarshallingTest extends TestCase {
     /**
      * A poll of configured {@link Marshaller} and {@link Unmarshaller}, created when first needed.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java
index 9e9be12906..ec9bef0c84 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NamesTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.*;
  * @since   0.5
  */
 @DependsOn(DefaultNameFactoryTest.class)
-public final strictfp class NamesTest extends TestCase {
+public final class NamesTest extends TestCase {
     /**
      * Tests {@link Names#createScopedName(GenericName, String, CharSequence)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
index 7b795ca6a4..b2cd3d6507 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.internal.util.Constants.OGC;
     TypesTest.class,
     DefaultNameFactoryTest.class
 })
-public final strictfp class TypeNamesTest extends TestCase {
+public final class TypeNamesTest extends TestCase {
     /**
      * Verifies that the call to {@link TypeNames#toTypeName(NameFactory, Class)} returns a {@code TypeName} having the
      * given name and namespace, then tests the reverse operation with {@link TypeNames#toClass(String, String)}.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
index db715cff0b..85531669ce 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
@@ -47,7 +47,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class TypesTest extends TestCase {
+public final class TypesTest extends TestCase {
     /**
      * Tests the {@link Types#toInternationalString(Map, String)} method.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
index 655b9ccdba..d5d7cdddef 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPAC
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class CharSequenceSubstitutionTest extends TestCase {
+public final class CharSequenceSubstitutionTest extends TestCase {
     /**
      * Tests unmarshalling of {@code "RS_Identifier"} element. This element was defined in legacy ISO 19139:2007
      * but has been removed in ISO 19115-3. That element is extensively used for Coordinate Reference Systems in
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
index 83114e5525..b60e028d7f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
@@ -30,7 +30,7 @@ import static org.apache.sis.xml.LegacyCodes.*;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class LegacyCodesTest extends TestCase {
+public final class LegacyCodesTest extends TestCase {
     /**
      * Tests {@link LegacyCodes#fromIANA(String)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
index d7e193d5d1..1155282066 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class MarshallerPoolTest extends TestCase {
+public final class MarshallerPoolTest extends TestCase {
     /**
      * Tests a marshaller which is acquired, then released.
      * The marshaller should be reset to its initial state
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
index c632db2c18..ac586ccb37 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPAC
  * @version 1.1
  * @since   0.8
  */
-public final strictfp class NamespacesTest extends TestCase {
+public final class NamespacesTest extends TestCase {
     /**
      * Tests {@link Namespaces#getPreferredPrefix(String, String)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
index b661553fed..cf5977ba60 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class NilReasonMarshallingTest extends TestCase {
+public final class NilReasonMarshallingTest extends TestCase {
     /**
      * Tests a simple case for a missing data.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
index a84a0f2b87..be542da2ea 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.4
  * @since   0.3
  */
-public final strictfp class NilReasonTest extends TestCase {
+public final class NilReasonTest extends TestCase {
     /**
      * Tests the {@link NilReason#valueOf(String)} method on constants.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
index 2e11692d31..9c0b7a1745 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
@@ -29,7 +29,7 @@ import org.apache.sis.internal.jaxb.Context;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class ReferenceResolverMock extends ReferenceResolver {
+public final class ReferenceResolverMock extends ReferenceResolver {
     /**
      * Creates a new reference resolver.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformerTest.java
index ee72388d0c..d483a6484c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformerTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class TransformerTest extends TestCase {
+public final class TransformerTest extends TestCase {
     /**
      * Tests {@link Transformer#load(boolean, String, Set, int)}.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
index 1bf34d031a..bc94d84956 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class TransformingNamespacesTest extends TestCase implements NamespaceContext {
+public final class TransformingNamespacesTest extends TestCase implements NamespaceContext {
     /**
      * All prefixes declared in this test.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
index c177ec45a9..a1818b7354 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @since   0.3
  */
 @DependsOn(NilReasonMarshallingTest.class)
-public final strictfp class UUIDMarshallingTest extends TestCase {
+public final class UUIDMarshallingTest extends TestCase {
     /**
      * A random UUID for the tests in this class.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
index 4b8f47b15f..dcb74e7e0b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
  * @since   0.4
  */
 @DependsOn(LegacyCodesTest.class)
-public final strictfp class ValueConverterTest extends TestCase {
+public final class ValueConverterTest extends TestCase {
     /**
      * Tests {@link ValueConverter#toLanguageCode(MarshalContext, Locale)}.
      * The results should be ISO 639-2 codes (3 letters language codes).
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
index 349d7f4a34..ab8257a8d1 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.4
  */
 @DependsOn({XLinkTest.class, NilReasonMarshallingTest.class})
-public final strictfp class XLinkMarshallingTest extends TestCase {
+public final class XLinkMarshallingTest extends TestCase {
     /**
      * A XML with a {@code xlink:href} without element definition.
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
index 8a1fe98868..3bedf977ff 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class XLinkTest extends TestCase {
+public final class XLinkTest extends TestCase {
     /**
      * Tests the automatic {@link XLink#getType()} detection.
      *
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/XPointerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/XPointerTest.java
index aa256dfe95..b080121e3e 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/XPointerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/XPointerTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   1.2
  */
-public final strictfp class XPointerTest extends TestCase {
+public final class XPointerTest extends TestCase {
     /**
      * Tests {@link XPointer#UOM}.
      */
diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoaderTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoaderTest.java
index a8572fbf66..a9531b8cc4 100644
--- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoaderTest.java
+++ b/core/sis-portrayal/src/test/java/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoaderTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class MultiResolutionCoverageLoaderTest extends TestCase {
+public final class MultiResolutionCoverageLoaderTest extends TestCase {
     /**
      * The loader being tested.
      */
diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/PortrayalTestSuite.java b/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/PortrayalTestSuite.java
index 421db847fe..58c9254352 100644
--- a/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/PortrayalTestSuite.java
+++ b/core/sis-portrayal/src/test/java/org/apache/sis/test/suite/PortrayalTestSuite.java
@@ -33,7 +33,7 @@ import org.junit.runners.Suite;
     org.apache.sis.internal.map.SEPortrayerTest.class,
     org.apache.sis.internal.map.coverage.MultiResolutionCoverageLoaderTest.class
 })
-public final strictfp class PortrayalTestSuite extends TestSuite {
+public final class PortrayalTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java
index 7dad928f9a..a9732ab9d5 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java
@@ -29,7 +29,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.3
  * @since   1.3
  */
-public final strictfp class GazetteerFactoryTest extends TestCase {
+public final class GazetteerFactoryTest extends TestCase {
     /**
      * Tests {@link ReferencingByIdentifiers#getInstance(String)}.
      *
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
index 1e3e699649..1e7054890f 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystemTest.java
@@ -48,7 +48,7 @@ import org.opengis.referencing.gazetteer.LocationType;
  * @since   0.1
  */
 @DependsOn(ReferencingByIdentifiersTest.class)
-public final strictfp class GeohashReferenceSystemTest extends TestCase {
+public final class GeohashReferenceSystemTest extends TestCase {
     /**
      * Tolerance factor for floating point comparison.
      */
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
index 17249e45bf..75d0ba7725 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class LocationFormatTest extends TestCase {
+public final class LocationFormatTest extends TestCase {
     /**
      * Tests formatting of an instance having only geographic coordinates.
      */
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
index fd7b7f9fcf..6af0a147c2 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
@@ -35,7 +35,7 @@ import org.opengis.referencing.gazetteer.LocationType;
  * @version 1.1
  * @since   0.8
  */
-public final strictfp class LocationTypeTest extends TestCase {
+public final class LocationTypeTest extends TestCase {
     /**
      * Creates the example given in annex B of ISO 19112:2003.
      *
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
index 83dfbf2a04..170f291883 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
@@ -60,7 +60,7 @@ import org.opengis.referencing.gazetteer.LocationType;
  * @since   0.8
  */
 @DependsOn(ReferencingByIdentifiersTest.class)
-public final strictfp class MilitaryGridReferenceSystemTest extends TestCase {
+public final class MilitaryGridReferenceSystemTest extends TestCase {
     /**
      * Verifies the metadata.
      */
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
index 8a8c46d65d..1b65e3cac0 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.8
  */
 @DependsOn(LocationTypeTest.class)
-public final strictfp class ReferencingByIdentifiersTest extends TestCase {
+public final class ReferencingByIdentifiersTest extends TestCase {
     /**
      * Creates the example given in annex B of ISO 19112:2003.
      *
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java
index cb4114904f..8285d1a46d 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/test/suite/ReferencingByIdentifiersTestSuite.java
@@ -36,7 +36,7 @@ import org.junit.BeforeClass;
     org.apache.sis.referencing.gazetteer.MilitaryGridReferenceSystemTest.class,
     org.apache.sis.referencing.gazetteer.GazetteerFactoryTest.class
 })
-public final strictfp class ReferencingByIdentifiersTestSuite extends TestSuite {
+public final class ReferencingByIdentifiersTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
index 841ca7d694..088ac3b31b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
@@ -29,7 +29,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class AbstractDirectPositionTest extends TestCase {
+public final class AbstractDirectPositionTest extends TestCase {
     /**
      * Tests {@link AbstractDirectPosition#parse(CharSequence)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
index 1f50acda1b..a2a237d157 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
  * @since   0.3
  */
 @DependsOn(GeneralDirectPositionTest.class)
-public final strictfp class AbstractEnvelopeTest extends TestCase {
+public final class AbstractEnvelopeTest extends TestCase {
     /**
      * Enumeration of implementations to be tested.
      * The {@code LAST} constant is for stopping the loops.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
index 1735a09e24..0218d0d703 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
  * @since   0.8
  */
 @DependsOn(AbstractEnvelopeTest.class)
-public final strictfp class ArrayEnvelopeTest extends TestCase {
+public final class ArrayEnvelopeTest extends TestCase {
     /**
      * Tests {@link ArrayEnvelope#isEmpty()}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java
index d69ee2308a..3e2d78f424 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.*;
  *
  * @since 0.8
  */
-public final strictfp class CoordinateFormatTest extends TestCase {
+public final class CoordinateFormatTest extends TestCase {
     /**
      * Compares coordinate values from the given positions.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java
index e21c99b280..41eb973782 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class CurveExtremumTest extends TestCase {
+public final class CurveExtremumTest extends TestCase {
     /**
      * Tolerance factor for the tests in this class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java
index 754dda8b98..c1af39e47c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java
@@ -33,7 +33,7 @@ import static org.opengis.test.Validators.*;
  * @since   0.3
  */
 @DependsOn(GeneralDirectPositionTest.class)
-public final strictfp class DirectPosition1DTest extends TestCase {
+public final class DirectPosition1DTest extends TestCase {
     /**
      * Tests the {@link DirectPosition1D#toString()} method.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java
index d2596fa302..38f604577b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java
@@ -33,7 +33,7 @@ import static org.opengis.test.Validators.*;
  * @since   0.3
  */
 @DependsOn(GeneralDirectPositionTest.class)
-public final strictfp class DirectPosition2DTest extends TestCase {
+public final class DirectPosition2DTest extends TestCase {
     /**
      * Tests the {@link DirectPosition2D#toString()} method.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
index b5390106ad..2be8befe13 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
  * @since   0.3
  */
 @DependsOn(AbstractEnvelopeTest.class)
-public final strictfp class Envelope2DTest extends TestCase {
+public final class Envelope2DTest extends TestCase {
     /**
      * Tests {@code Envelope2D} serialization.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java
index c6a71adefa..556274fe7c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since   1.0
  */
 @DependsOn(EnvelopesTest.class)
-public final strictfp class EnvelopeReducerTest extends TestCase {
+public final class EnvelopeReducerTest extends TestCase {
     /**
      * The envelopes on which to perform an operation.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
index f2f54ff295..757cef25a1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
@@ -61,7 +61,7 @@ import static org.opengis.test.Validators.validate;
     GeneralEnvelopeTest.class,
     CurveExtremumTest.class
 })
-public final strictfp class EnvelopesTest extends TransformTestCase<GeneralEnvelope> {
+public final class EnvelopesTest extends TransformTestCase<GeneralEnvelope> {
     /**
      * Creates an envelope for the given CRS and coordinate values.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
index 1a72f57d70..4a1b9ba0f1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
  * @since   0.3
  */
 @DependsOn(AbstractDirectPositionTest.class)
-public final strictfp class GeneralDirectPositionTest extends TestCase {
+public final class GeneralDirectPositionTest extends TestCase {
     /**
      * Tests the {@link GeneralDirectPosition#normalize()} method.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
index d8c04e5e2a..282a0b589e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
@@ -47,7 +47,7 @@ import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84_LATITUDE_FIRST;
  * @since   0.3
  */
 @DependsOn(ArrayEnvelopeTest.class)
-public strictfp class GeneralEnvelopeTest extends TestCase {
+public class GeneralEnvelopeTest extends TestCase {
     /**
      * Tolerance threshold for floating point comparisons.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
index 9e3a9b62be..91fd5f1542 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
  * @since   0.3
  */
 @DependsOn(ArrayEnvelopeTest.class)
-public final strictfp class ImmutableEnvelopeTest extends TestCase {
+public final class ImmutableEnvelopeTest extends TestCase {
     /**
      * Tests {@code ImmutableEnvelope} serialization.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Shapes2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Shapes2DTest.java
index 17b648d2fc..8b3f22179d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Shapes2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Shapes2DTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since   0.8
  */
 @DependsOn(CurveExtremumTest.class)
-public final strictfp class Shapes2DTest extends TransformTestCase<Rectangle2D> {
+public final class Shapes2DTest extends TransformTestCase<Rectangle2D> {
     /**
      * Creates a rectangle for the given CRS and coordinate values.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java
index 3268ef4f3c..661f42b37b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/SubEnvelopeTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
  * @since   0.3
  */
 @DependsOn(GeneralEnvelopeTest.class)
-public final strictfp class SubEnvelopeTest extends GeneralEnvelopeTest {
+public final class SubEnvelopeTest extends GeneralEnvelopeTest {
     /**
      * Creates a new sub-envelope envelope for the given coordinate values.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java
index 653b228578..b8f1b898a5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java
@@ -55,7 +55,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since 0.8
  */
 @DependsOn(CurveExtremumTest.class)
-public abstract strictfp class TransformTestCase<G> extends TestCase {
+public abstract class TransformTestCase<G> extends TestCase {
     /**
      * Creates an envelope or rectangle for the given CRS and coordinate values.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
index deb1f8e6c2..169ab6a2dd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @version 1.2
  * @since   1.0
  */
-public final strictfp class WraparoundAdjustmentTest extends TestCase {
+public final class WraparoundAdjustmentTest extends TestCase {
     /**
      * Tests {@link WraparoundAdjustment#shift(Envelope)}
      * with an envelope crossing the anti-meridian.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java
index 41c31e6833..905d062ec9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.*;
  * @since 0.6
  */
 @DependsOn(org.apache.sis.parameter.DefaultParameterDescriptorTest.class)
-public final strictfp class CC_GeneralOperationParameterTest extends TestCase {
+public final class CC_GeneralOperationParameterTest extends TestCase {
     /**
      * A JUnit rule for listening to log events emitted during execution of {@link #testGroupMergeBecauseExtraParameter()}.
      * This rule is used by test methods for verifying that the log message contains the expected information.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java
index 4acd845636..5bade9cd42 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.*;
  * @since 0.6
  */
 @DependsOn(CC_GeneralOperationParameterTest.class)
-public final strictfp class CC_OperationParameterGroupTest extends TestCase {
+public final class CC_OperationParameterGroupTest extends TestCase {
     /**
      * The remark to associate to the "Latitude of natural origin" parameter.
      * Should be different than the comment stored in {@link Mercator1SP} in
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
index bb6a9d3713..3f35fcd05d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 0.6
  * @since   0.4
  */
-public final strictfp class CodeTest extends TestCase {
+public final class CodeTest extends TestCase {
     /**
      * Tests the {@link Code#Code(Identifier)} constructor with {@code "EPSG:4326"} identifier.
      * This test intentionally uses an identifier with the {@code IOGP} authority instead of
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
index 98f82dc149..9559a06bb9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.MetadataAssert.*;
  * @version 0.8
  * @since   0.4
  */
-public final strictfp class SecondDefiningParameterTest extends TestCase {
+public final class SecondDefiningParameterTest extends TestCase {
     /**
      * XML of an ellipsoid defined by semi-major and semi-minor axes.
      * The numerical values used for this test is the ones of Clarke 1866 (EPSG:7008).
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxesMapperTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxesMapperTest.java
index e7217ca0d6..e39472f14f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxesMapperTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxesMapperTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class AxesMapperTest extends TestCase {
+public final class AxesMapperTest extends TestCase {
     /**
      * Tests with axes having same direction in same order.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxisDirectionsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxisDirectionsTest.java
index 596f1f4641..ce4ad2c400 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxisDirectionsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxisDirectionsTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.internal.referencing.AxisDirections.COUNTER_CLOCKWI
  * @since   0.4
  */
 @DependsOn(AxesMapperTest.class)
-public final strictfp class AxisDirectionsTest extends TestCase {
+public final class AxisDirectionsTest extends TestCase {
     /**
      * Tests {@link AxisDirections#absolute(AxisDirection)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/CoordinateOperationsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/CoordinateOperationsTest.java
index efe54b8120..b5912a609a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/CoordinateOperationsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/CoordinateOperationsTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class CoordinateOperationsTest extends TestCase {
+public final class CoordinateOperationsTest extends TestCase {
     /**
      * Tests {@link CoordinateOperations#isWrapAround(CoordinateSystemAxis)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/DefinitionVerifierTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/DefinitionVerifierTest.java
index 89d59b3c21..c9c7661ab6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/DefinitionVerifierTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/DefinitionVerifierTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.*;
  * @since   0.8
  */
 @DependsOn(org.apache.sis.referencing.CRSTest.class)
-public final strictfp class DefinitionVerifierTest extends TestCase {
+public final class DefinitionVerifierTest extends TestCase {
     /**
      * Tests with a CRS which is conform to the authoritative definition.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java
index ddc3d3d2c2..dbdaff85ad 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java
@@ -54,7 +54,7 @@ import static org.apache.sis.test.Assert.*;
     org.apache.sis.referencing.CRSTest.class,
     org.apache.sis.internal.referencing.ServicesForMetadataTest.class
 })
-public final strictfp class EllipsoidalHeightCombinerTest extends TestCase {
+public final class EllipsoidalHeightCombinerTest extends TestCase {
     /**
      * Creates an instance to be tested.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ExtentSelectorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ExtentSelectorTest.java
index 28cb1984d7..4abac672dc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ExtentSelectorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ExtentSelectorTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.1
  */
-public final strictfp class ExtentSelectorTest extends TestCase {
+public final class ExtentSelectorTest extends TestCase {
     /**
      * Whether to test an alternate ordering where distance to TOI is tested last.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java
index 57e893f8a9..25f1f31016 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   0.4
  */
-public final strictfp class FormulasTest extends TestCase {
+public final class FormulasTest extends TestCase {
     /**
      * Verifies the {@link Formulas#LONGITUDE_MAX} constant.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java
index f1718a4f12..db2c3d9099 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/GeodeticObjectBuilderTest.java
@@ -36,7 +36,7 @@ import static org.opengis.test.Assert.assertAxisDirectionsEqual;
  * @version 1.3
  * @since   1.3
  */
-public final strictfp class GeodeticObjectBuilderTest extends TestCase {
+public final class GeodeticObjectBuilderTest extends TestCase {
     /**
      * Tests {@link GeodeticObjectBuilder#changeConversion(String, BiConsumer)}.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java
index 2a1df24276..c28651963e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 0.6
  * @since   0.6
  */
-public final strictfp class LazySetTest extends TestCase {
+public final class LazySetTest extends TestCase {
     /**
      * The test data.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/PositionalAccuracyConstantTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/PositionalAccuracyConstantTest.java
index 9a739d7bfb..421db8111a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/PositionalAccuracyConstantTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/PositionalAccuracyConstantTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class PositionalAccuracyConstantTest extends TestCase {
+public final class PositionalAccuracyConstantTest extends TestCase {
     /**
      * Tests {@link PositionalAccuracyConstant} constants.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
index 6ce83dfcc5..bf5381616c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.internal.referencing.ReferencingUtilities.*;
  * @version 1.0
  * @since   0.4
  */
-public final strictfp class ReferencingUtilitiesTest extends TestCase {
+public final class ReferencingUtilitiesTest extends TestCase {
     /**
      * Tests {@link ReferencingUtilities#getGreenwichLongitude(PrimeMeridian, Unit)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
index 3211ced7f6..2cb1822d6e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
@@ -49,7 +49,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
 @DependsOn({
     org.apache.sis.referencing.CommonCRSTest.class
 })
-public final strictfp class ServicesForMetadataTest extends TestCase {
+public final class ServicesForMetadataTest extends TestCase {
     /**
      * Tests {@link org.apache.sis.metadata.iso.extent.Extents#centroid(GeographicBoundingBox)}.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/VerticalDatumTypesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/VerticalDatumTypesTest.java
index 409dee7388..5b10025c50 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/VerticalDatumTypesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/VerticalDatumTypesTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 0.7
  * @since   0.4
  */
-public final strictfp class VerticalDatumTypesTest extends TestCase {
+public final class VerticalDatumTypesTest extends TestCase {
     /**
      * Tests the {@link VerticalDatumTypes#fromLegacy(int)} method.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTKeywordsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTKeywordsTest.java
index bca932b79e..3000958702 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTKeywordsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTKeywordsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.6
  */
-public final strictfp class WKTKeywordsTest extends TestCase {
+public final class WKTKeywordsTest extends TestCase {
     /**
      * Ensures that all constants are equal to the name of the field that declare it.
      * The intent is to avoid misleading constant names when reading code.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java
index abb8d15cd3..f1ce242e50 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.internal.referencing.WKTUtilities.*;
  * @since   0.7
  */
 @DependsOn(ReferencingUtilitiesTest.class)
-public final strictfp class WKTUtilitiesTest extends TestCase {
+public final class WKTUtilitiesTest extends TestCase {
     /**
      * Tests {@link WKTUtilities#toType(Class, Class)}.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundApplicatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundApplicatorTest.java
index 033e200217..ecc6f80f4b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundApplicatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundApplicatorTest.java
@@ -30,7 +30,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class WraparoundApplicatorTest extends TestCase {
+public final class WraparoundApplicatorTest extends TestCase {
     /**
      * Tests {@link WraparoundApplicator#range(CoordinateSystem, int)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java
index 98c4d57824..07a1dbe3e7 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java
@@ -31,7 +31,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class AbstractShapeTest extends TestCase {
+public final class AbstractShapeTest extends TestCase {
     /**
      * Tests {@link ShapeUtilities#isFloat(Object)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java
index 2a1453154c..39c8818900 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java
@@ -36,7 +36,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.2
  * @since   0.5
  */
-public final strictfp class ShapeUtilitiesTest extends TestCase {
+public final class ShapeUtilitiesTest extends TestCase {
     /**
      * Tolerance factor for the tests in this class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java
index 4410f6b14e..519bf4179a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java
@@ -44,7 +44,7 @@ import org.apache.sis.util.CharSequences;
  * @since   0.5
  */
 @SuppressWarnings("serial")
-public final strictfp class ShapeUtilitiesViewer extends JPanel {
+public final class ShapeUtilitiesViewer extends JPanel {
     /**
      * The {@link ShapeUtilities} methods to test.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
index ccacd86f4d..07a1926bcf 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since   0.6
  */
 @DependsOn(org.apache.sis.parameter.TensorValuesTest.class)
-public final strictfp class AffineTest extends TestCase {
+public final class AffineTest extends TestCase {
     /**
      * Verifies that {@link Affine#getOperationType()} is {@link SingleOperation}.
      * The {@code Affine} class cannot return one of the above, because we do not
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java
index 06ddf9376f..e4322e894a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
 @DependsOn({
     PositionVector7ParamTest.class
 })
-public final strictfp class CoordinateFrameRotationTest extends MathTransformTestCase {
+public final class CoordinateFrameRotationTest extends MathTransformTestCase {
     /**
      * Creates the transformation from WGS 72 to WGS 84.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressedTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressedTest.java
index 8ff9eb0534..821f6fff58 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressedTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressedTest.java
@@ -30,7 +30,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class DatumShiftGridCompressedTest extends DatumShiftGridFileTest {
+public final class DatumShiftGridCompressedTest extends DatumShiftGridFileTest {
     /**
      * Creates a new grid using an affine transform as a reference.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFileTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFileTest.java
index d01a90fd37..6e98b63cee 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFileTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFileTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public strictfp class DatumShiftGridFileTest extends TestCase {
+public class DatumShiftGridFileTest extends TestCase {
     /**
      * Size of the grid created for testing purpose.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftTestCase.java
index f21d3b91ee..4139f4b352 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftTestCase.java
@@ -36,7 +36,7 @@ import static org.junit.Assume.assumeFalse;
  * @version 0.8
  * @since   0.8
  */
-public abstract strictfp class DatumShiftTestCase extends TestCase {
+public abstract class DatumShiftTestCase extends TestCase {
     /**
      * For subclass constructors only.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
index d87b8beb28..41917c679b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
@@ -45,7 +45,7 @@ import static org.opengis.test.Assert.*;
  *
  * @since 0.7
  */
-public final strictfp class FranceGeocentricInterpolationTest extends DatumShiftTestCase {
+public final class FranceGeocentricInterpolationTest extends DatumShiftTestCase {
     /**
      * Name of the file containing a small extract of the "{@code GR3DF97A.txt}" file.
      * The amount of data in this test file is less than 0.14% of the original file.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
index 57aa73a1d6..88646c6bbd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
@@ -57,7 +57,7 @@ import static org.opengis.test.Assert.*;
     org.apache.sis.referencing.operation.transform.EllipsoidToCentricTransformTest.class,
     org.apache.sis.referencing.datum.BursaWolfParametersTest.class
 })
-public final strictfp class GeocentricTranslationTest extends MathTransformTestCase {
+public final class GeocentricTranslationTest extends MathTransformTestCase {
     /**
      * Geocentric translation parameters for transforming a point in the North Sea from WGS84 to ED50.
      * They are the parameters to use for transformation of the point given by {@link #samplePoint(int)}.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
index 8abd9216a1..eb5d6e8b79 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
@@ -38,7 +38,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.7
  */
 @DependsOn(AffineTest.class)
-public final strictfp class Geographic3Dto2DTest extends TestCase {
+public final class Geographic3Dto2DTest extends TestCase {
     /**
      * Tests {@code Geographic3Dto2D.createMathTransform(…)}.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
index 1499015038..8559f9d35f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
  * @since   0.7
  */
 @DependsOn(AffineTest.class)
-public final strictfp class GeographicOffsetsTest extends TransformTestCase {
+public final class GeographicOffsetsTest extends TransformTestCase {
     /**
      * Tests {@code GeographicOffsets2D.createMathTransform(…)}.
      * This test uses the sample point given in §2.4.4.3 of EPSG guide (April 2015).
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
index 34d8fd3ab2..2d8baf887a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since   0.6
  */
 @DependsOn(AffineTest.class)
-public final strictfp class LongitudeRotationTest extends TestCase {
+public final class LongitudeRotationTest extends TestCase {
     /**
      * Tests {@code LongitudeRotation.createMathTransform(…)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
index 78f47e2be2..39b274dacf 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.internal.util.Constants.*;
  * @version 0.6
  * @since   0.6
  */
-public final strictfp class MapProjectionTest extends TestCase {
+public final class MapProjectionTest extends TestCase {
     /**
      * Verifies {@link MapProjection#SEMI_MAJOR} and {@link MapProjection#SEMI_MINOR} parameter descriptors.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java
index fe3f36991d..4bea39c1a0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MolodenskyTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.7
  * @since   0.7
  */
-public final strictfp class MolodenskyTest extends TestCase {
+public final class MolodenskyTest extends TestCase {
     /**
      * Tests {@link Molodensky#redimension(int, int)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
index 1828f1e02f..7a03e51bc3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
@@ -43,7 +43,7 @@ import static org.opengis.test.Assert.*;
  * @version 0.8
  * @since   0.7
  */
-public final strictfp class NADCONTest extends DatumShiftTestCase {
+public final class NADCONTest extends DatumShiftTestCase {
     /**
      * Returns the sample point for a step in the transformation from NAD27 to NAD83.
      * The sample point is the coordinate of Meades Ranch station, which was the point
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
index 5d236c8b79..c3e6299551 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
@@ -57,7 +57,7 @@ import static org.apache.sis.internal.referencing.provider.DatumShiftGridLoader.
  * @since 0.7
  */
 @DependsOn(DatumShiftGridFileTest.class)
-public final strictfp class NTv2Test extends DatumShiftTestCase {
+public final class NTv2Test extends DatumShiftTestCase {
     /**
      * Name of the file containing a small extract of the "{@code NTF_R93.gsb}" file.
      * The amount of data in this test file is less than 0.14% of the original file.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java
index d7ad502eb7..0cd0138daa 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
 @DependsOn({
     GeocentricTranslationTest.class
 })
-public final strictfp class PositionVector7ParamTest extends MathTransformTestCase {
+public final class PositionVector7ParamTest extends MathTransformTestCase {
     /**
      * Returns the sample point for a step in the example given by the EPSG guidance note.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java
index ff09d398cf..0ac48fd829 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java
@@ -39,7 +39,7 @@ import org.apache.sis.referencing.operation.transform.AbstractMathTransform;
  * @since   0.6
  */
 @SuppressWarnings("serial")
-abstract strictfp class ProviderMock extends AbstractProvider {
+abstract class ProviderMock extends AbstractProvider {
     /**
      * Creates a new mock provider.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java
index 345b4c4015..d34d792b6f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProvidersTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.*;
     LongitudeRotationTest.class,
     MapProjectionTest.class
 })
-public final strictfp class ProvidersTest extends TestCase {
+public final class ProvidersTest extends TestCase {
     /**
      * Returns all providers to test.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java
index bc446c46f1..a70ecfce60 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java
@@ -35,7 +35,7 @@ import org.apache.sis.measure.Units;
  * @since   0.6
  */
 @SuppressWarnings("serial")
-public final strictfp class SeismicBinGridMock extends ProviderMock {
+public final class SeismicBinGridMock extends ProviderMock {
     /**
      * The group of all parameters expected by this coordinate operation.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java
index 1c8a4509a9..da71e2e017 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.7
  */
-public final strictfp class TransverseMercatorTest extends TestCase {
+public final class TransverseMercatorTest extends TestCase {
     /**
      * Tests {@link TransverseMercator.Zoner#zone(double, double)},
      * including the special cases for Norway and Svalbard.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ColorsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
index 744e9c35e2..a012ea27ca 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
@@ -30,7 +30,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.4
  * @since   0.4
  */
-public final strictfp class ColorsTest extends TestCase {
+public final class ColorsTest extends TestCase {
     /**
      * Tests {@link Colors#getName(ElementKind)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java
index 93b6866b6a..1b8bd84bae 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java
@@ -41,7 +41,7 @@ import static org.junit.Assume.assumeNotNull;
  * @since   1.0
  */
 @DependsOn(WKTParserTest.class)
-public final strictfp class ComparisonWithEPSG extends TestCase {
+public final class ComparisonWithEPSG extends TestCase {
     /**
      * Creates the factory to use for all tests in this class.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ConventionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
index b876815ad9..0084fab2f2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.4
  * @since   0.4
  */
-public final strictfp class ConventionTest extends TestCase {
+public final class ConventionTest extends TestCase {
     /**
      * Tests {@link Convention#getNameAuthority()}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ElementTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ElementTest.java
index 92d942278b..5aeaec03dc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ElementTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ElementTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.6
  */
-public final strictfp class ElementTest extends TestCase {
+public final class ElementTest extends TestCase {
     /**
      * A dummy parser to be given to the {@link Element} constructor.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
index 04175ae4b5..12bec31ee4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since   0.4
  */
 @DependsOn({ConventionTest.class, SymbolsTest.class, ColorsTest.class})
-public final strictfp class FormatterTest extends TestCase {
+public final class FormatterTest extends TestCase {
     /**
      * Verifies the ANSI escape sequences hard-coded in {@link Formatter}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
index 0aab07c89f..c2d49a8522 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
@@ -73,7 +73,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_D
     org.apache.sis.referencing.cs.DirectionAlongMeridianTest.class,
     org.apache.sis.referencing.factory.GeodeticObjectFactoryTest.class
 })
-public final strictfp class GeodeticObjectParserTest extends TestCase {
+public final class GeodeticObjectParserTest extends TestCase {
     /**
      * The parser to use for the test.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java
index c7a81ce5f3..800f8fb45d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java
@@ -42,7 +42,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.6
  */
 @DependsOn(org.apache.sis.referencing.operation.transform.MathTransformsTest.class)
-public final strictfp class MathTransformParserTest extends TestCase {
+public final class MathTransformParserTest extends TestCase {
     /**
      * The parser to use for the test.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java
index 6a491fc53b..7e96dc0559 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.1
  * @since   0.4
  */
-public final strictfp class SymbolsTest extends TestCase {
+public final class SymbolsTest extends TestCase {
     /**
      * Tests the {@link Symbols#containsElement(CharSequence, String)} method.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java
index 59e31ea0f9..3f5879c8bd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/TransliteratorTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   0.6
  */
-public final strictfp class TransliteratorTest extends TestCase {
+public final class TransliteratorTest extends TestCase {
     /**
      * Verify the value of the {@link Transliterator#SPACES} constant.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java
index 1d9a53eb3c..0278c858d3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java
@@ -53,7 +53,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   1.1
  */
 @DependsOn(WKTFormatTest.class)
-public final strictfp class WKTDictionaryTest extends TestCase {
+public final class WKTDictionaryTest extends TestCase {
     /**
      * Tests {@link WKTDictionary#addDefinitions(Stream)}. The CRS used in this test are a subset of the
      * ones used by {@link #testLoad()}. One of them is intentionally malformed for testing error index.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
index 4351583fe8..a73fe0e5b3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.5
  */
 @DependsOn(GeodeticObjectParserTest.class)
-public final strictfp class WKTFormatTest extends TestCase {
+public final class WKTFormatTest extends TestCase {
     /**
      * The instance to use for the test, or {@code null} if none.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
index 0434c672e0..dc086db309 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.*;
  */
 @RunWith(TestRunner.class)
 @DependsOn(GeodeticObjectParserTest.class)
-public final strictfp class WKTParserTest extends CRSParserTest {
+public final class WKTParserTest extends CRSParserTest {
     /**
      * Whether the test should replace the curly quotation marks “ and ” by the straight quotation mark ".
      * The ISO 19162 specification uses only straight quotation marks, but SIS supports both.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
index 5a86f4a194..994ea80195 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
@@ -43,7 +43,7 @@ import static org.opengis.referencing.IdentifiedObject.*;
  * @since   0.4
  */
 @DependsOn(DefaultParameterDescriptorTest.class)
-public final strictfp class DefaultParameterDescriptorGroupTest extends TestCase {
+public final class DefaultParameterDescriptorGroupTest extends TestCase {
     /**
      * The default value used by the parameters in the {@link #M1_M1_O1_O2} descriptor.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
index cccb3876e9..60cd70c566 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
@@ -46,7 +46,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.referencing.AbstractIdentifiedObjectTest.class)
-public final strictfp class DefaultParameterDescriptorTest extends TestCase {
+public final class DefaultParameterDescriptorTest extends TestCase {
     /**
      * Creates the map of properties to be given to {@link DefaultParameterDescriptor} constructor.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
index f4753d2ccc..9f0a6e87c4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
@@ -50,7 +50,7 @@ import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
     DefaultParameterDescriptorGroupTest.class,
     DefaultParameterValueTest.class
 })
-public final strictfp class DefaultParameterValueGroupTest extends TestCase {
+public final class DefaultParameterValueGroupTest extends TestCase {
     /**
      * The descriptors of parameters to be tested by this class.
      * The default descriptors are:
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
index 214d84d9ed..51914f8e3c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  */
 @SuppressWarnings("UnnecessaryBoxing")
 @DependsOn(DefaultParameterDescriptorTest.class)
-public final strictfp class DefaultParameterValueTest extends TestCase {
+public final class DefaultParameterValueTest extends TestCase {
     /**
      * Small tolerance factor for floating point comparisons resulting from some calculation.
      */
@@ -55,7 +55,7 @@ public final strictfp class DefaultParameterValueTest extends TestCase {
      * This allows {@link DefaultParameterValueTest} methods to verify the conversion result.
      */
     @SuppressWarnings({"serial", "CloneableImplementsClone"})
-    private static final strictfp class Watcher<T> extends DefaultParameterValue<T> {
+    private static final class Watcher<T> extends DefaultParameterValue<T> {
         /** The value converted by {@link Verifier}. */
         T convertedValue;
 
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java
index 356432958a..91d15cc360 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.internal.util.Constants.STANDARD_PARALLEL_2;
  * @since   0.6
  */
 @DependsOn(ParametersTest.class)
-public final strictfp class MapProjectionParametersTest extends TestCase {
+public final class MapProjectionParametersTest extends TestCase {
     /**
      * Creates a map projection descriptor with semi-major/minor axis lengths
      * and the given amount of standard parallels.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java
index 9f04c8ce40..582ca87fae 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.6
  */
 @DependsOn(MatrixParametersTest.class)
-public final strictfp class MatrixParametersAlphaNumTest extends MatrixParametersTest {
+public final class MatrixParametersAlphaNumTest extends MatrixParametersTest {
     /**
      * The expected parameter identifiers for the matrix elements, or 0 if none.
      * Note that the EPSG database contains A3 and B3 parameters, but they are
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java
index dca0f36043..64679029ee 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java
@@ -32,7 +32,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.6
  */
 @DependsOn(TensorParametersTest.class)
-public strictfp class MatrixParametersTest extends TensorParametersTest {
+public class MatrixParametersTest extends TensorParametersTest {
     /**
      * The expected parameter names according the EPSG convention for the matrix elements.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java
index 6e94d8b136..a473f6c98e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
     DefaultParameterDescriptorTest.class,
     DefaultParameterValueTest.class
 })
-public final strictfp class ParameterBuilderTest extends TestCase {
+public final class ParameterBuilderTest extends TestCase {
     /**
      * Tests various {@code create(…)} methods.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
index bb19b440f9..3467509dfc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
  * @since   0.4
  */
 @DependsOn(ParameterBuilderTest.class)
-public final strictfp class ParameterFormatTest extends TestCase {
+public final class ParameterFormatTest extends TestCase {
     /**
      * The parameter descriptors used for all tests in this class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
index fe687131cc..43eeb96daa 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
@@ -53,7 +53,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     DefaultParameterValueTest.class,
     DefaultParameterValueGroupTest.class
 })
-public final strictfp class ParameterMarshallingTest extends TestCase {
+public final class ParameterMarshallingTest extends TestCase {
     /**
      * Creates a parameter value for marshalling test.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterValueGroupWrapper.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterValueGroupWrapper.java
index 6e7069bd8c..a21b9c42ec 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterValueGroupWrapper.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterValueGroupWrapper.java
@@ -32,7 +32,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
  * @version 0.4
  * @since   0.4
  */
-final strictfp class ParameterValueGroupWrapper implements ParameterValueGroup {
+final class ParameterValueGroupWrapper implements ParameterValueGroup {
     /**
      * The implementation to hide.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParametersTest.java
index 5780164bb2..f25dfce341 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParametersTest.java
@@ -55,7 +55,7 @@ import org.opengis.metadata.Identifier;
     DefaultParameterValueTest.class,
     DefaultParameterValueGroupTest.class
 })
-public final strictfp class ParametersTest extends TestCase {
+public final class ParametersTest extends TestCase {
     /**
      * Tests the {@link Parameters#cast(ParameterDescriptor, Class)} and
      * {@link Parameters#cast(ParameterValue, Class)} methods.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java
index aadccf2a37..d57a0624ba 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java
@@ -47,7 +47,7 @@ import static org.apache.sis.internal.util.Constants.NUM_COL;
     DefaultParameterValueTest.class,
     ParametersTest.class
 })
-public strictfp class TensorParametersTest extends TestCase {
+public class TensorParametersTest extends TestCase {
     /**
      * The parameters to use for testing purpose. Mostly identical to {@link TensorParameters#WKT1},
      * except that it is not an instance of the {@link MatrixParameters} subclass. Those parameters
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
index 5fd2cdce60..2906cac633 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
@@ -48,7 +48,7 @@ import static org.apache.sis.internal.util.Constants.NUM_COL;
  * @since   0.4
  */
 @DependsOn(MatrixParametersTest.class)
-public final strictfp class TensorValuesTest extends TestCase {
+public final class TensorValuesTest extends TestCase {
     /**
      * The name of the parameter group created in this test class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java
index feb6cd8fbd..703d7efb76 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueGroupTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @since   0.7
  */
 @DependsOn(UnmodifiableParameterValueTest.class)
-public final strictfp class UnmodifiableParameterValueGroupTest extends TestCase {
+public final class UnmodifiableParameterValueGroupTest extends TestCase {
     /**
      * Tests creation of an {@link UnmodifiableParameterValueGroup} and verify the values.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java
index f78b9ac0e5..30ed5a13f6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
  * @since   0.6
  */
 @DependsOn(DefaultParameterValueTest.class)
-public final strictfp class UnmodifiableParameterValueTest extends TestCase {
+public final class UnmodifiableParameterValueTest extends TestCase {
     /**
      * Creates an {@link UnmodifiableParameterValue} implementation for the given parameter
      * and asserts that we got a new instance equivalent to the original one.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
index be9f77419a..c2791534fe 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
@@ -47,7 +47,7 @@ import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
     IdentifiedObjectsTest.class, NamedIdentifierTest.class,
     org.apache.sis.internal.jaxb.referencing.CodeTest.class
 })
-public final strictfp class AbstractIdentifiedObjectTest extends TestCase {
+public final class AbstractIdentifiedObjectTest extends TestCase {
     /**
      * Creates a map of properties to be given to the {@link AbstractIdentifiedObject} constructor.
      * The values in the map are consistent with the values expected by the {@link #validate} method.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
index 53ade9f11b..88080445bf 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.test.ReferencingAssert.assertWktEquals;
  * @since   0.4
  */
 @DependsOn(AbstractIdentifiedObjectTest.class)
-public final strictfp class AbstractReferenceSystemTest extends TestCase {
+public final class AbstractReferenceSystemTest extends TestCase {
     /**
      * Tests {@link AbstractReferenceSystem}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
index 51033d8b84..97942ae382 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
@@ -51,7 +51,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.8
  * @since   0.7
  */
-public final strictfp class AuthorityFactoriesTest extends TestCase {
+public final class AuthorityFactoriesTest extends TestCase {
     /**
      * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to
      * do so, but should be considered as an implementation details (it should have been a private field).
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderMock.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderMock.java
index 7f5e538eca..b743bb303b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderMock.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderMock.java
@@ -29,7 +29,7 @@ import org.opengis.util.GenericName;
  * @version 0.6
  * @since   0.4
  */
-final strictfp class BuilderMock extends Builder<BuilderMock> {
+final class BuilderMock extends Builder<BuilderMock> {
     /**
      * Creates a new builder.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
index cdac5ff220..87ac86c256 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
  * @since   0.4
  */
 @DependsOn(AbstractIdentifiedObjectTest.class)
-public final strictfp class BuilderTest extends TestCase {
+public final class BuilderTest extends TestCase {
     /**
      * Tests {@link Builder#verifyParameterizedType(Class)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
index e3cc773d66..365189043c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
@@ -64,7 +64,7 @@ import static org.apache.sis.test.Assert.*;
     CommonCRSTest.class,
     AuthorityFactoriesTest.class
 })
-public final strictfp class CRSTest extends TestCase {
+public final class CRSTest extends TestCase {
     /**
      * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to
      * do so, but should be considered as an implementation details (it should have been a private field).
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
index 3944cd6e48..ce328af450 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
@@ -62,7 +62,7 @@ import static org.apache.sis.test.TestUtilities.*;
   org.apache.sis.referencing.datum.DefaultVerticalDatumTest.class,
   StandardDefinitionsTest.class
 })
-public final strictfp class CommonCRSTest extends TestCase {
+public final class CommonCRSTest extends TestCase {
     /**
      * Length of a day in milliseconds.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
index b4885e3f37..20987936a4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
@@ -59,7 +59,7 @@ import static org.apache.sis.test.Assert.*;
   StandardDefinitionsTest.class,
   CommonCRSTest.class
 })
-public final strictfp class EPSGFactoryFallbackTest extends TestCase {
+public final class EPSGFactoryFallbackTest extends TestCase {
     /**
      * Tests {@link EPSGFactoryFallback#getAuthorityCodes(Class)}.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
index 125fbade82..3f0d52f1c2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
@@ -46,7 +46,7 @@ import static org.apache.sis.internal.metadata.ReferencingServices.NAUTICAL_MILE
  * @since   1.0
  */
 @DependsOn(GeodeticCalculatorTest.class)
-public final strictfp class GeodesicsOnEllipsoidTest extends GeodeticCalculatorTest {
+public final class GeodesicsOnEllipsoidTest extends GeodeticCalculatorTest {
     /**
      * The {@link GeodesicsOnEllipsoid} instance to be tested.
      * A specialized type is used for tracking locale variables.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java
index 31711bfdfd..5bf4a17221 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java
@@ -66,7 +66,7 @@ import static org.apache.sis.internal.metadata.ReferencingServices.AUTHALIC_RADI
  * @version 1.1
  * @since   1.0
  */
-public strictfp class GeodeticCalculatorTest extends TestCase {
+public class GeodeticCalculatorTest extends TestCase {
     /**
      * Creates a new test case.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
index 4ed2744903..b6169c2538 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
@@ -47,7 +47,7 @@ import static org.apache.sis.test.Assert.*;
  *
  * @todo Move this class to GeoAPI.
  */
-public final strictfp class GeodeticObjectVerifier {
+public final class GeodeticObjectVerifier {
     /**
      * The tolerance threshold for strict comparisons of floating point values.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
index ea8de53274..c6bee8f91b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.referencing.IdentifiedObjects.*;
  * @version 0.7
  * @since   0.4
  */
-public final strictfp class IdentifiedObjectsTest extends TestCase {
+public final class IdentifiedObjectsTest extends TestCase {
     /**
      * Tests {@link IdentifiedObjects#isHeuristicMatchForName(IdentifiedObject, String)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java
index 9488404176..adf9a29914 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java
@@ -43,7 +43,7 @@ import static org.opengis.metadata.Identifier.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class ImmutableIdentifierTest extends TestCase {
+public final class ImmutableIdentifierTest extends TestCase {
     /**
      * Returns the properties map to be used in argument to test methods.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
index 3497eea750..1c8ea237b9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.6
  * @since   0.4
  */
-public final strictfp class NamedIdentifierTest extends TestCase {
+public final class NamedIdentifierTest extends TestCase {
     /**
      * Tests the {@link NamedIdentifier#NamedIdentifier(Citation, String, CharSequence, String, InternationalString)}
      * constructor.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
index a2d14e0bb2..9b27903c4d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
@@ -59,7 +59,7 @@ import static org.opengis.test.Assert.*;
     org.apache.sis.referencing.crs.DefaultGeographicCRSTest.class,
     org.apache.sis.internal.referencing.provider.TransverseMercatorTest.class
 })
-public final strictfp class StandardDefinitionsTest extends TestCase {
+public final class StandardDefinitionsTest extends TestCase {
     /**
      * Verifies value of the {@link StandardDefinitions#GREENWICH} code.
      * This method is for ensuring consistency between hard-coded constants.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
index f1b1cc0d7e..bdaed11f46 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.referencing.cs.AbstractCSTest.class)
-public final strictfp class AbstractCRSTest extends TestCase {
+public final class AbstractCRSTest extends TestCase {
     /**
      * Tests {@link AbstractCRS#forConvention(AxesConvention)} with {@link AxesConvention#RIGHT_HANDED}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
index a1bd19413e..99e5b16523 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
@@ -51,7 +51,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     DefaultGeographicCRSTest.class,
     DefaultVerticalCRSTest.class
 })
-public final strictfp class DefaultCompoundCRSTest extends TestCase {
+public final class DefaultCompoundCRSTest extends TestCase {
     /**
      * The vertical CRS arbitrarily chosen in this class for the tests.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
index ebe9027467..7f3439bcd8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
@@ -51,7 +51,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     DefaultProjectedCRSTest.class,          // Has many similarities with DerivedCRS, but is simpler.
     DefaultConversionTest.class
 })
-public final strictfp class DefaultDerivedCRSTest extends TestCase {
+public final class DefaultDerivedCRSTest extends TestCase {
     /**
      * An XML file in this package containing a projected CRS definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
index e21e9f648a..1b367b0e12 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @version 1.3
  * @since   0.6
  */
-public final strictfp class DefaultEngineeringCRSTest extends TestCase {
+public final class DefaultEngineeringCRSTest extends TestCase {
     /**
      * Creates an engineering CRS using a two-dimensional Cartesian coordinate system.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
index 07968138e3..d06aad4082 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
@@ -43,7 +43,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
 @DependsOn({
     DefaultGeodeticCRSTest.class
 })
-public final strictfp class DefaultGeocentricCRSTest extends TestCase {
+public final class DefaultGeocentricCRSTest extends TestCase {
     /**
      * Tests the {@link DefaultGeocentricCRS#forConvention(AxesConvention)} method
      * for {@link AxesConvention#RIGHT_HANDED}.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
index c55ec9cdc1..f24f171855 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.Assert.*;
     org.apache.sis.referencing.cs.DefaultEllipsoidalCSTest.class,
     org.apache.sis.referencing.datum.DefaultGeodeticDatumTest.class
 })
-public final strictfp class DefaultGeodeticCRSTest extends TestCase {
+public final class DefaultGeodeticCRSTest extends TestCase {
     /**
      * An XML file in this package containing a geodetic CRS definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
index ae70f76696..4b0693b1d0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
     DefaultGeodeticCRSTest.class,
     DefaultVerticalCRSTest.class
 })
-public final strictfp class DefaultGeographicCRSTest extends TestCase {
+public final class DefaultGeographicCRSTest extends TestCase {
     /**
      * Tests the {@link DefaultGeographicCRS#forConvention(AxesConvention)} method
      * for {@link AxesConvention#POSITIVE_RANGE}.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
index 6828cd44de..25e09065af 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @version 0.6
  * @since   0.6
  */
-public final strictfp class DefaultImageCRSTest extends TestCase {
+public final class DefaultImageCRSTest extends TestCase {
     /**
      * Creates an image CRS using a two-dimensional affine or Cartesian coordinate system.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
index 8a5dd6c672..2d5ebced85 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
@@ -59,7 +59,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     DefaultGeographicCRSTest.class,
     org.apache.sis.referencing.operation.DefaultConversionTest.class
 })
-public final strictfp class DefaultProjectedCRSTest extends TestCase {
+public final class DefaultProjectedCRSTest extends TestCase {
     /**
      * A JUnit rule for listening to log events emitted during execution of {@link #testWKT1_WithExplicitAxisLength()}.
      * This rule is used by the test methods for verifying that the logged messages contain the expected information.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
index 9f957c3183..16cc6d6b03 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_MILLISEC
  * @version 1.3
  * @since   0.5
  */
-public final strictfp class DefaultTemporalCRSTest extends TestCase {
+public final class DefaultTemporalCRSTest extends TestCase {
     /**
      * Tests WKT 1 pseudo-formatting.
      * This is not part of OGC 01-009 standard.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
index a6a04b802d..35f1e52c10 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @version 0.4
  * @since   0.4
  */
-public final strictfp class DefaultVerticalCRSTest extends TestCase {
+public final class DefaultVerticalCRSTest extends TestCase {
     /**
      * Tests WKT 1 formatting.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java
index 1c2c4b2e69..79e83a003b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java
@@ -43,7 +43,7 @@ import static org.apache.sis.referencing.IdentifiedObjects.getProperties;
  * @version 1.1
  * @since   0.4
  */
-public final strictfp class HardCodedCRS {
+public final class HardCodedCRS {
     /**
      * A two-dimensional geographic coordinate reference system using the WGS84 datum.
      * This CRS uses (<var>latitude</var>, <var>longitude</var>) coordinates with latitude values
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
index 619b2d2519..f5b9d08863 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.referencing.crs.HardCodedCRS.*;
     org.apache.sis.referencing.cs.HardCodedCSTest.class,
     DefaultGeographicCRSTest.class
 })
-public final strictfp class HardCodedCRSTest extends TestCase {
+public final class HardCodedCRSTest extends TestCase {
     /**
      * Validates constants.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java
index 158eead265..643c8d0d8a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/SubTypesTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @since   0.4
  */
 @DependsOn(AbstractCRSTest.class)
-public final strictfp class SubTypesTest extends TestCase {
+public final class SubTypesTest extends TestCase {
     /**
      * Tests the {@link SubTypes#BY_TYPE} comparator.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
index bc96ea7a12..6ecc3aa4e9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.Assert.*;
     DefaultCoordinateSystemAxisTest.class,
     NormalizerTest.class
 })
-public final strictfp class AbstractCSTest extends TestCase {
+public final class AbstractCSTest extends TestCase {
     /**
      * Gets a coordinate system for the given axes convention and compare against the expected values.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CodesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CodesTest.java
index f1637af524..51ead2ab9f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CodesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CodesTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   0.8
  */
-public final strictfp class CodesTest extends TestCase {
+public final class CodesTest extends TestCase {
     /**
      * The unit of measurement of the vertical axis.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
index fe01d65a0f..16006fc411 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
@@ -54,7 +54,7 @@ import static org.apache.sis.test.Assert.*;
     DirectionAlongMeridianTest.class,
     NormalizerTest.class
 })
-public final strictfp class CoordinateSystemsTest extends TestCase {
+public final class CoordinateSystemsTest extends TestCase {
     /**
      * Tests {@link CoordinateSystems#parseAxisDirection(String)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
index 44fe5a69a5..9274767d04 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     DirectionAlongMeridianTest.class,
     AbstractCSTest.class
 })
-public final strictfp class DefaultCartesianCSTest extends TestCase {
+public final class DefaultCartesianCSTest extends TestCase {
     /**
      * An XML file in this package containing a Cartesian coordinate system definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java
index 3ee7f63609..78af730fa1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCompoundCSTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.internal.referencing.AxisDirectionsTest.class)
-public final strictfp class DefaultCompoundCSTest extends TestCase {
+public final class DefaultCompoundCSTest extends TestCase {
     /**
      * Tests {@link DefaultCompoundCS} construction.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
index 503f06d24b..cb2c09ea66 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.referencing.IdentifiedObjects.getProperties;
     DirectionAlongMeridianTest.class,
     org.apache.sis.referencing.AbstractIdentifiedObjectTest.class
 })
-public final strictfp class DefaultCoordinateSystemAxisTest extends TestCase {
+public final class DefaultCoordinateSystemAxisTest extends TestCase {
     /**
      * Validates the {@link HardCodedAxes} constants.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
index c8d70b0396..8315d6b445 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
@@ -36,7 +36,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.7
  */
 @DependsOn(DefaultPolarCSTest.class)
-public final strictfp class DefaultCylindricalCSTest extends TestCase {
+public final class DefaultCylindricalCSTest extends TestCase {
     /**
      * Tests {@link DefaultCylindricalCS#forConvention(AxesConvention)}
      * with a change from clockwise to counterclockwise axis orientation.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
index 4b4fcfc92d..78583bc615 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.4
  */
 @DependsOn(AbstractCSTest.class)
-public final strictfp class DefaultEllipsoidalCSTest extends TestCase {
+public final class DefaultEllipsoidalCSTest extends TestCase {
     /**
      * An XML file in this package containing an ellipsoidal coordinate system definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
index bad4810636..2e18249628 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
@@ -36,7 +36,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.7
  */
 @DependsOn(AbstractCSTest.class)
-public final strictfp class DefaultPolarCSTest extends TestCase {
+public final class DefaultPolarCSTest extends TestCase {
     /**
      * Tests {@link DefaultPolarCS#forConvention(AxesConvention)}
      * with a change from clockwise to counterclockwise axis orientation.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
index 20859a58c4..289ff2441d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
@@ -34,7 +34,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.4
  */
 @DependsOn(AbstractCSTest.class)
-public final strictfp class DefaultSphericalCSTest extends TestCase {
+public final class DefaultSphericalCSTest extends TestCase {
     /**
      * Tests a spherical CRS conforms to EPSG:8.9:6404 definition.
      * Expected axes are:
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
index ad9ebb9700..805575321c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.internal.referencing.AxisDirectionsTest.class)
-public final strictfp class DirectionAlongMeridianTest extends TestCase {
+public final class DirectionAlongMeridianTest extends TestCase {
     /**
      * Tests the {@link DirectionAlongMeridian#parse(AxisDirection)} method.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
index c3d9e0eb13..f98345574d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
@@ -35,7 +35,7 @@ import org.apache.sis.measure.Units;
  * @version 1.1
  * @since   0.4
  */
-public final strictfp class HardCodedAxes {
+public final class HardCodedAxes {
     /**
      * Axis for geodetic longitudes in a {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS}.
      * Increasing coordinate values go {@linkplain AxisDirection#EAST East}
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java
index 9cb2784182..4731a25ccf 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java
@@ -31,7 +31,7 @@ import static org.apache.sis.referencing.IdentifiedObjects.getProperties;
  * @version 1.1
  * @since   0.4
  */
-public final strictfp class HardCodedCS {
+public final class HardCodedCS {
     /**
      * A two-dimensional ellipsoidal CS with
      * <var>{@linkplain HardCodedAxes#GEODETIC_LATITUDE geodetic latitude}</var>,
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
index 6305f884ee..51b8245d24 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.referencing.cs.HardCodedCS.*;
     DefaultCartesianCSTest.class,
     DefaultEllipsoidalCSTest.class
 })
-public final strictfp class HardCodedCSTest extends TestCase {
+public final class HardCodedCSTest extends TestCase {
     /**
      * Validates constants.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
index 29e06b49bb..465bf74d72 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     DirectionAlongMeridianTest.class,
     DefaultCoordinateSystemAxisTest.class
 })
-public final strictfp class NormalizerTest extends TestCase {
+public final class NormalizerTest extends TestCase {
     /**
      * Tests {@link Normalizer#sort(CoordinateSystemAxis[], int)}
      * with axes of an ellipsoidal coordinate system.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
index 9cf322fe8d..31b8e6dbd9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.7
  * @since   0.4
  */
-public final strictfp class BursaWolfParametersTest extends TestCase {
+public final class BursaWolfParametersTest extends TestCase {
     /**
      * The conversion factor from arc-seconds to radians.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
index 99826fa600..3deafefd3c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     org.apache.sis.internal.referencing.FormulasTest.class,
     org.apache.sis.internal.jaxb.referencing.SecondDefiningParameterTest.class
 })
-public final strictfp class DefaultEllipsoidTest extends TestCase {
+public final class DefaultEllipsoidTest extends TestCase {
     /**
      * An XML file in this package containing an ellipsoid definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
index 2cb43b8ae5..99bec7d994 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
@@ -54,7 +54,7 @@ import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
     DefaultEllipsoidTest.class,
     BursaWolfParametersTest.class
 })
-public final strictfp class DefaultGeodeticDatumTest extends TestCase {
+public final class DefaultGeodeticDatumTest extends TestCase {
     /**
      * An XML file in this package containing a geodetic datum definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
index 7d528fd27e..d5ef03edf7 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.referencing.AbstractIdentifiedObjectTest.class)
-public final strictfp class DefaultPrimeMeridianTest extends TestCase {
+public final class DefaultPrimeMeridianTest extends TestCase {
     /**
      * An XML file in this package containing a prime meridian definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
index b024408590..78c8ceafe3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_D
  * @version 0.8
  * @since   0.4
  */
-public final strictfp class DefaultTemporalDatumTest extends TestCase {
+public final class DefaultTemporalDatumTest extends TestCase {
     /**
      * An XML file in this package containing a vertical datum definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
index 84c9cd3f29..426b99d113 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
  * @version 0.4
  * @since   0.4
  */
-public final strictfp class DefaultVerticalDatumTest extends TestCase {
+public final class DefaultVerticalDatumTest extends TestCase {
     /**
      * An XML file in this package containing a vertical datum definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java
index b81ecb110c..7b16729f29 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java
@@ -34,7 +34,7 @@ import org.apache.sis.measure.Units;
  * @since   0.4
  */
 @SuppressWarnings("serial")
-public final strictfp class GeodeticDatumMock extends IdentifiedObjectMock implements GeodeticDatum, Ellipsoid {
+public final class GeodeticDatumMock extends IdentifiedObjectMock implements GeodeticDatum, Ellipsoid {
     /**
      * The "GRS 1980" datum. This is very similar to {@link #WGS84}.
      * Can be used for testing tiny differences between two datum.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java
index 0c07863689..d85b3a3bd2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java
@@ -37,7 +37,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_D
  * @version 1.1
  * @since   0.4
  */
-public final strictfp class HardCodedDatum {
+public final class HardCodedDatum {
     /**
      * Greenwich meridian (EPSG:8901), with angular measurements in decimal degrees.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java
index ad6ea6816e..1659ad7b3f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java
@@ -31,7 +31,7 @@ import org.apache.sis.measure.Units;
  * @since   0.4
  */
 @SuppressWarnings("serial")
-final strictfp class PrimeMeridianMock extends IdentifiedObjectMock implements PrimeMeridian {
+final class PrimeMeridianMock extends IdentifiedObjectMock implements PrimeMeridian {
     /**
      * A mock for the Greenwich prime meridian.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
index e9a59897dc..a532ee0cee 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.internal.referencing.Formulas.JULIAN_YEAR_LENGTH;
  * @since   0.4
  */
 @DependsOn(BursaWolfParametersTest.class)
-public final strictfp class TimeDependentBWPTest extends TestCase {
+public final class TimeDependentBWPTest extends TestCase {
     /**
      * Creates a {@code TimeDependentBWP} using the example given in the EPSG database for operation method EPSG:1053.
      * The target datum given by the EPG example is actually GDA94, but it is coincident with WGS84 to within 1 metre.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
index a38be3e81f..28fdfb7d3e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.7
  */
-public final strictfp class AuthorityFactoryMock extends GeodeticAuthorityFactory implements CRSAuthorityFactory,
+public final class AuthorityFactoryMock extends GeodeticAuthorityFactory implements CRSAuthorityFactory,
         CSAuthorityFactory, DatumAuthorityFactory, CoordinateOperationAuthorityFactory, AutoCloseable
 {
     /**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java
index 86d4d725f7..f947a99959 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryProxyTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.*;
  * @since   0.7
  */
 @DependsOn(CommonAuthorityFactoryTest.class)
-public final strictfp class AuthorityFactoryProxyTest extends TestCase {
+public final class AuthorityFactoryProxyTest extends TestCase {
     /**
      * Ensures that the most specific interfaces appear first in the list of proxies.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
index b0d8840472..9af0eaf882 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
@@ -61,7 +61,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.7
  */
 @DependsOn(org.apache.sis.referencing.CommonCRSTest.class)
-public final strictfp class CommonAuthorityFactoryTest extends TestCase {
+public final class CommonAuthorityFactoryTest extends TestCase {
     /**
      * The factory to test.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactoryTest.java
index ffb23554a2..3a399c8431 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactoryTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assume.assumeTrue;
  * @since   0.7
  */
 @DependsOn(AuthorityFactoryProxyTest.class)
-public final strictfp class ConcurrentAuthorityFactoryTest extends TestCase {
+public final class ConcurrentAuthorityFactoryTest extends TestCase {
     /**
      * The timeout used for this test.
      */
@@ -64,7 +64,7 @@ public final strictfp class ConcurrentAuthorityFactoryTest extends TestCase {
     /**
      * A concurrent factory which creates new instances of {@link AuthorityFactoryMock}.
      */
-    private static final strictfp class Mock extends ConcurrentAuthorityFactory<AuthorityFactoryMock> {
+    private static final class Mock extends ConcurrentAuthorityFactory<AuthorityFactoryMock> {
         /** All factories created by this mock, including any factories having been disposed. */
         private final Queue<AuthorityFactoryMock> allDAOs = new ConcurrentLinkedQueue<>();
 
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
index cf55c6bc2c..7474475b5c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
@@ -70,7 +70,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     org.apache.sis.referencing.crs.DefaultGeographicCRSTest.class,
     org.apache.sis.referencing.crs.DefaultProjectedCRSTest.class
 })
-public final strictfp class GeodeticObjectFactoryTest extends ObjectFactoryTest {
+public final class GeodeticObjectFactoryTest extends ObjectFactoryTest {
     /**
      * Creates a new test suite using the singleton factory instance.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
index 218a376623..9474a5dbbf 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.7
  */
 @DependsOn({CommonAuthorityFactoryTest.class, AuthorityFactoryProxyTest.class})
-public final strictfp class IdentifiedObjectFinderTest extends TestCase {
+public final class IdentifiedObjectFinderTest extends TestCase {
     /**
      * The factory to use for the test.
      */
@@ -108,7 +108,7 @@ public final strictfp class IdentifiedObjectFinderTest extends TestCase {
     /**
      * An authority factory to be used by {@link IdentifiedObjectFinderTest#testFindOnCachingInstance()}.
      */
-    private static final strictfp class Cached extends ConcurrentAuthorityFactory<GeodeticAuthorityFactory>
+    private static final class Cached extends ConcurrentAuthorityFactory<GeodeticAuthorityFactory>
             implements CRSAuthorityFactory
     {
         private final GeodeticAuthorityFactory factory;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
index 20937e4338..c8da7fc4d9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
@@ -59,7 +59,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.7
  */
 @DependsOn(AuthorityFactoryProxyTest.class)
-public final strictfp class MultiAuthoritiesFactoryTest extends TestCase {
+public final class MultiAuthoritiesFactoryTest extends TestCase {
     /**
      * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to
      * do so, but should be considered as an implementation details (it should have been a private field).
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java
index cf63644b54..34578dad92 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java
@@ -59,7 +59,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.0
  * @since   0.8
  */
-public final strictfp class TestFactorySource {
+public final class TestFactorySource {
     /**
      * Whether to use PostgreSQL instead of Derby for the tests. This field should be {@code false};
      * the {@code true} value is used only for temporarily debugging of PostgreSQL-specific features.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
index 017e892f29..25452e825c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
@@ -85,7 +85,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     org.apache.sis.referencing.factory.AuthorityFactoryProxyTest.class,
     org.apache.sis.referencing.factory.IdentifiedObjectFinderTest.class
 })
-public final strictfp class EPSGFactoryTest extends TestCase {
+public final class EPSGFactoryTest extends TestCase {
     /**
      * Creates the factory to use for all tests in this class.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
index e229cb9861..78f8231e23 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
@@ -69,7 +69,7 @@ import static org.junit.Assume.assumeTrue;
  * @since   0.7
  */
 @DependsOn(EPSGFactoryTest.class)
-public final strictfp class EPSGInstallerTest extends TestCase {
+public final class EPSGInstallerTest extends TestCase {
     /**
      * A JUnit rule for listening to log events emitted during execution of tests.
      * This rule is used by tests that verifies the log message content.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/TableInfoTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/TableInfoTest.java
index fd6262070a..66d4c7c304 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/TableInfoTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/TableInfoTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class TableInfoTest extends TestCase {
+public final class TableInfoTest extends TestCase {
     /**
      * Tests {@link TableInfo#tableMatches(String, String)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java
index 974f3c58bf..e69a84f938 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatterTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.7
  */
-public final strictfp class DataScriptFormatterTest extends TestCase {
+public final class DataScriptFormatterTest extends TestCase {
     /**
      * Tests the {@link DataScriptFormatter#removeLF(StringBuilder)} method.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
index 1514ac85b6..d28f814dfe 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/AuthorityFactoryTest.java
@@ -35,7 +35,7 @@ import org.junit.Ignore;
  * @since   1.1
  */
 @RunWith(JUnit4.class)
-public final strictfp class AuthorityFactoryTest extends org.opengis.test.referencing.AuthorityFactoryTest {
+public final class AuthorityFactoryTest extends org.opengis.test.referencing.AuthorityFactoryTest {
     /**
      * Creates a new test suite using the singleton factory instance.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
index 4a71f34003..528188ab1f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
@@ -38,7 +38,7 @@ import static org.opengis.test.Assert.*;
  * @since   1.1
  */
 @RunWith(JUnit4.class)
-public final strictfp class ParameterizedTransformTest extends org.opengis.test.referencing.ParameterizedTransformTest {
+public final class ParameterizedTransformTest extends org.opengis.test.referencing.ParameterizedTransformTest {
     /**
      * Creates a new test suite using the singleton factory instance.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
index ecaff526f3..0fe369f82f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
@@ -86,7 +86,7 @@ import static org.apache.sis.test.Assert.*;
     DefaultPassThroughOperationTest.class,
     DefaultConcatenatedOperationTest.class
 })
-public final strictfp class CoordinateOperationFinderTest extends MathTransformTestCase {
+public final class CoordinateOperationFinderTest extends MathTransformTestCase {
     /**
      * Tolerance threshold for strict comparisons of floating point numbers.
      * This constant can be used like below, where {@code expected} and {@code actual} are {@code double} values:
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
index 14d36e0108..acacc2bead 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
@@ -75,7 +75,7 @@ import static org.junit.Assume.assumeTrue;
     DefaultPassThroughOperationTest.class,
     DefaultConcatenatedOperationTest.class
 })
-public final strictfp class CoordinateOperationRegistryTest extends MathTransformTestCase {
+public final class CoordinateOperationRegistryTest extends MathTransformTestCase {
     /**
      * Tolerance threshold for strict comparisons of floating point numbers.
      * This constant can be used like below, where {@code expected} and {@code actual} are {@code double} values:
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
index d91299722b..8984ac7d42 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
@@ -50,7 +50,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
     DefaultTransformationTest.class,
     SingleOperationMarshallingTest.class
 })
-public final strictfp class DefaultConcatenatedOperationTest extends TestCase {
+public final class DefaultConcatenatedOperationTest extends TestCase {
     /**
      * An XML file in this package containing a projected CRS definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
index 5350c81915..1b2d73236a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
@@ -62,7 +62,7 @@ import static org.apache.sis.test.MetadataAssert.*;
 @DependsOn({
     DefaultTransformationTest.class     // Because similar to DefaultConversion but simpler.
 })
-public final strictfp class DefaultConversionTest extends TestCase {
+public final class DefaultConversionTest extends TestCase {
     /**
      * The rotation from a CRS using the Paris prime meridian to a CRS using the Greenwich prime meridian,
      * in degrees. The definitive value is 2.5969213 grads.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
index bfec3b5ded..63b72be6d3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
@@ -64,7 +64,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     CoordinateOperationRegistryTest.class,
     CoordinateOperationFinderTest.class
 })
-public final strictfp class DefaultCoordinateOperationFactoryTest extends MathTransformTestCase {
+public final class DefaultCoordinateOperationFactoryTest extends MathTransformTestCase {
     /**
      * Tolerance threshold for strict comparisons of floating point numbers.
      * This constant can be used like below, where {@code expected} and {@code actual} are {@code double} values:
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
index 8663797ea2..cae495bd25 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
@@ -30,7 +30,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class DefaultFormulaTest extends TestCase {
+public final class DefaultFormulaTest extends TestCase {
     /**
      * Tests {@link DefaultFormula#toWKT()}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
index 0a8e721d06..80654d7334 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
@@ -48,7 +48,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     org.apache.sis.referencing.AbstractIdentifiedObjectTest.class,
     org.apache.sis.parameter.DefaultParameterDescriptorGroupTest.class
 })
-public final strictfp class DefaultOperationMethodTest extends TestCase {
+public final class DefaultOperationMethodTest extends TestCase {
     /**
      * Creates a new two-dimensional operation method for an operation of the given name and identifier.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
index c82b0b2289..c91cfa8616 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
@@ -42,7 +42,7 @@ import static org.opengis.test.Assert.*;
     DefaultTransformationTest.class,
     SingleOperationMarshallingTest.class
 })
-public final strictfp class DefaultPassThroughOperationTest extends TestCase {
+public final class DefaultPassThroughOperationTest extends TestCase {
     /**
      * An XML file in this package containing a projected CRS definition.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
index 3e0a2bd2e5..17af37cbb2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
@@ -50,7 +50,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
 @DependsOn({
     org.apache.sis.referencing.crs.DefaultGeocentricCRSTest.class
 })
-public final strictfp class DefaultTransformationTest extends TestCase {
+public final class DefaultTransformationTest extends TestCase {
     /**
      * Creates a geocentric CRS using the given datum.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/HardCodedConversions.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/HardCodedConversions.java
index 947bf0df1c..8f78d93b45 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/HardCodedConversions.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/HardCodedConversions.java
@@ -40,7 +40,7 @@ import org.apache.sis.referencing.cs.HardCodedCS;
  * @version 1.1
  * @since   0.8
  */
-public final strictfp class HardCodedConversions {
+public final class HardCodedConversions {
     /**
      * A defining conversion for a <cite>Mercator (variant A)</cite> (also known as "1SP") projection
      * with a scale factor of 1.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
index c9b09c0deb..6e7ed46adb 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
@@ -62,7 +62,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     CC_OperationParameterGroupTest.class,
     org.apache.sis.parameter.ParameterMarshallingTest.class
 })
-public final strictfp class SingleOperationMarshallingTest extends TestCase {
+public final class SingleOperationMarshallingTest extends TestCase {
     /**
      * Creates the test operation method.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
index 0d67712ab5..e3ff1daae5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.1
  * @since   0.5
  */
-public final strictfp class LinearTransformBuilderTest extends TestCase {
+public final class LinearTransformBuilderTest extends TestCase {
     /**
      * Tests a very simple case where an exact answer is expected.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearizerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearizerTest.java
index ffb21d1e2f..f439168913 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearizerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearizerTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @since   1.1
  */
 @DependsOn(LocalizationGridBuilderTest.class)
-public final strictfp class LinearizerTest extends TestCase {
+public final class LinearizerTest extends TestCase {
     /**
      * Tests {@link LinearTransformBuilder#approximate(MathTransform, Envelope)} on a transform created by
      * {@link LocalizationGridBuilder}. We verify that the {@link Linearizer#approximate(MathTransform,
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
index 5cf07a9d1f..fa142b3734 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @since   0.8
  */
 @DependsOn({LinearTransformBuilderTest.class, ResidualGridTest.class})
-public final strictfp class LocalizationGridBuilderTest extends TransformTestCase {
+public final class LocalizationGridBuilderTest extends TransformTestCase {
     /**
      * For floating-point comparisons.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/NonLinearTransform.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/NonLinearTransform.java
index b90d7ad0d8..5a61aad25a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/NonLinearTransform.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/NonLinearTransform.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.transform.AbstractMathTransform2D;
  * @version 1.0
  * @since   1.0
  */
-final strictfp class NonLinearTransform extends AbstractMathTransform2D {
+final class NonLinearTransform extends AbstractMathTransform2D {
     /**
      * Creates a new instance of this class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
index 1ec0696ebf..7fe0f9502d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
@@ -34,7 +34,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.1
  * @since   1.0
  */
-public final strictfp class ResidualGridTest extends TestCase {
+public final class ResidualGridTest extends TestCase {
     /**
      * The grid to test.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2DTest.java
index 45df6ef15a..29f3cefa30 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2DTest.java
@@ -31,7 +31,7 @@ import static java.lang.StrictMath.*;
  * @version 1.1
  * @since   0.4
  */
-public final strictfp class AffineTransforms2DTest extends TestCase {
+public final class AffineTransforms2DTest extends TestCase {
     /**
      * Tolerance value for comparisons.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
index ca85914da1..7321fae51e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   0.4
  */
-public final strictfp class GeneralMatrixTest extends MatrixTestCase {
+public final class GeneralMatrixTest extends MatrixTestCase {
     /**
      * Number of rows and columns.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
index a2984946b0..64bc647065 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
@@ -52,7 +52,7 @@ import static org.opengis.referencing.cs.AxisDirection.*;
     GeneralMatrixTest.class,
     NonSquareMatrixTest.class
 })
-public final strictfp class MatricesTest extends TestCase {
+public final class MatricesTest extends TestCase {
     /**
      * Tests {@link Matrices#create(int, int, Number[])}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java
index 391e3f6db8..90287a3f56 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix1Test.java
@@ -32,7 +32,7 @@ import static org.apache.sis.referencing.operation.matrix.Matrix1.SIZE;
  * @since   0.4
  */
 @DependsOn(SolverTest.class)
-public final strictfp class Matrix1Test extends MatrixTestCase {
+public final class Matrix1Test extends MatrixTestCase {
     /**
      * Returns the size of the matrix of interest for this test class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java
index d0be2421c3..7c7e0fbe57 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix2Test.java
@@ -32,7 +32,7 @@ import static org.apache.sis.referencing.operation.matrix.Matrix2.SIZE;
  * @since   0.4
  */
 @DependsOn(SolverTest.class)
-public final strictfp class Matrix2Test extends MatrixTestCase {
+public final class Matrix2Test extends MatrixTestCase {
     /**
      * Returns the size of the matrix of interest for this test class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java
index 0ed6b8488a..56a13a2bb6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java
@@ -32,7 +32,7 @@ import static org.apache.sis.referencing.operation.matrix.Matrix3.SIZE;
  * @since   0.4
  */
 @DependsOn(SolverTest.class)
-public final strictfp class Matrix3Test extends MatrixTestCase {
+public final class Matrix3Test extends MatrixTestCase {
     /**
      * Returns the size of the matrix of interest for this test class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
index c4863f0772..10efa3830d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
@@ -33,7 +33,7 @@ import static org.apache.sis.referencing.operation.matrix.Matrix4.SIZE;
  * @since   0.4
  */
 @DependsOn(SolverTest.class)
-public final strictfp class Matrix4Test extends MatrixTestCase {
+public final class Matrix4Test extends MatrixTestCase {
     /**
      * Returns the size of the matrix of interest for this test class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
index b724fffd06..9637f91165 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
@@ -48,7 +48,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.1
  * @since   0.4
  */
-public abstract strictfp class MatrixTestCase extends TestCase {
+public abstract class MatrixTestCase extends TestCase {
     /**
      * {@code true} for reusing the same sequences of random numbers in every execution of test cases, or
      * {@code false} for "truly" random sequences of random numbers. This flag can be set to {@code false}
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
index bd40f197a8..3601584b8f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
@@ -41,7 +41,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.4
  */
 @DependsOn(SolverTest.class)
-public final strictfp class NonSquareMatrixTest extends MatrixTestCase {
+public final class NonSquareMatrixTest extends MatrixTestCase {
     /**
      * Number of rows and columns, initialized by {@link #prepareNewMatrixSize(Random)}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
index 72a7717191..4b83fba077 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
@@ -51,7 +51,7 @@ import static org.apache.sis.referencing.operation.matrix.MatrixTestCase.assertE
  * @since   0.4
  */
 @DependsOn(GeneralMatrixTest.class) // See class javadoc
-public final strictfp class SolverTest extends TestCase {
+public final class SolverTest extends TestCase {
     /**
      * The tolerance threshold for this test case, which is {@value}. This value needs to be higher then the
      * {@link MatrixTestCase#TOLERANCE} one because of the increased complexity of {@link Solver} operations.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
index f81ac2b1ed..581b59c3ae 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AlbersEqualAreaTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
  * @since   0.8
  */
 @DependsOn(CylindricalEqualAreaTest.class)
-public final strictfp class AlbersEqualAreaTest extends MapProjectionTestCase {
+public final class AlbersEqualAreaTest extends MapProjectionTestCase {
     /**
      * Returns whether the given projection is the spherical implementation.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AuthalicConversionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AuthalicConversionTest.java
index 34d939bbef..14a3b607a9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AuthalicConversionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AuthalicConversionTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
  * @since   1.0
  */
 @DependsOn(NormalizedProjectionTest.class)
-public final strictfp class AuthalicConversionTest extends MapProjectionTestCase {
+public final class AuthalicConversionTest extends MapProjectionTestCase {
     /**
      * Creates the projection to be tested.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AzimuthalEquidistantTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AzimuthalEquidistantTest.java
index 3a88e7164b..7c9a66fb80 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AzimuthalEquidistantTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/AzimuthalEquidistantTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
  * @since   1.1
  */
 @DependsOn(NormalizedProjectionTest.class)
-public strictfp class AzimuthalEquidistantTest extends MapProjectionTestCase {
+public class AzimuthalEquidistantTest extends MapProjectionTestCase {
     /**
      * Returns the method to be tested.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CassiniSoldnerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CassiniSoldnerTest.java
index 1d5f793c5c..b2a0a8b697 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CassiniSoldnerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CassiniSoldnerTest.java
@@ -37,7 +37,7 @@ import static java.lang.StrictMath.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class CassiniSoldnerTest extends MapProjectionTestCase {
+public final class CassiniSoldnerTest extends MapProjectionTestCase {
     /**
      * Returns the operation method for the projection tested in this class.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
index f7440631ac..0907d076c4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.referencing.operation.projection.NormalizedProjecti
  * @since   0.6
  */
 @DependsOn(NormalizedProjectionTest.class)
-public final strictfp class ConformalProjectionTest extends TransformTestCase {
+public final class ConformalProjectionTest extends TransformTestCase {
     /**
      * Natural logarithm of the pseudo-infinity as returned by Mercator formulas in the spherical
      * case, truncated to nearest integer. This is not a real infinity because there is no exact
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
index 14ff12b6a2..9b9448de6d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/CylindricalEqualAreaTest.java
@@ -37,7 +37,7 @@ import static java.lang.Double.NaN;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class CylindricalEqualAreaTest extends MapProjectionTestCase {
+public final class CylindricalEqualAreaTest extends MapProjectionTestCase {
     /**
      * Tests the derivatives at a few points. This method compares the derivatives computed by
      * the projection with an estimation of derivatives computed by the finite differences method.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
index 59b0323126..da284fb308 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.internal.metadata.ReferencingServices.AUTHALIC_RADI
  * @version 0.8
  * @since   0.6
  */
-public final strictfp class EquirectangularTest extends MapProjectionTestCase {
+public final class EquirectangularTest extends MapProjectionTestCase {
     /**
      * Initializes a simple Equirectangular projection on sphere. This method is different than the
      * {@code createNormalizedProjection(boolean)} method in all other test classes, because it does
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
index 8a767743c9..6d313296a0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
@@ -38,7 +38,7 @@ import static org.opengis.test.Assert.*;
  * @version 0.7
  * @since   0.7
  */
-public final strictfp class InitializerTest extends TestCase{
+public final class InitializerTest extends TestCase{
     /**
      * Tests the {@link Initializer#radiusOfConformalSphere(double)} method.
      * This test computes the Radius of Conformal Sphere using the values given by the
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualAreaTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualAreaTest.java
index bce8f32e91..71f2b9e4bc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualAreaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualAreaTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class LambertAzimuthalEqualAreaTest extends MapProjectionTestCase {
+public final class LambertAzimuthalEqualAreaTest extends MapProjectionTestCase {
     /**
      * The radius of the sphere used in sphere test cases.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
index 39e3501116..aafe94fbaa 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
@@ -52,7 +52,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.6
  */
 @DependsOn(ConformalProjectionTest.class)
-public final strictfp class LambertConicConformalTest extends MapProjectionTestCase {
+public final class LambertConicConformalTest extends MapProjectionTestCase {
     /**
      * Verifies the value of the constant used in <cite>"Lambert Conic Conformal (2SP Belgium)"</cite> projection.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
index 9d54e108a3..ab4e5583f5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.6
  */
-abstract strictfp class MapProjectionTestCase extends MathTransformTestCase {
+abstract class MapProjectionTestCase extends MathTransformTestCase {
     /**
      * Axis length of WGS84 ellipsoid.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
index 591e5159e2..2a8e0f4d5c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
@@ -57,7 +57,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_SECOND;
  * @version 1.0
  * @since   0.6
  */
-public final class MercatorMethodComparison {   // No 'strictfp' keyword here since we want to compare with Mercator class.
+public final class MercatorMethodComparison {
     /**
      * Where to print the outputs of this class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
index 4924e5717f..76998ee776 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
@@ -51,7 +51,7 @@ import static org.apache.sis.referencing.operation.projection.ConformalProjectio
  * @since   0.6
  */
 @DependsOn(ConformalProjectionTest.class)
-public final strictfp class MercatorTest extends MapProjectionTestCase {
+public final class MercatorTest extends MapProjectionTestCase {
     /**
      * Creates a new instance of {@link Mercator} for a sphere or an ellipsoid.
      * The new instance is stored in the inherited {@link #transform} field.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java
index 0277f76fc7..34707355b4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals;
  * @since   1.0
  */
 @DependsOn(NormalizedProjectionTest.class)
-public final strictfp class MeridianArcTest extends MapProjectionTestCase {
+public final class MeridianArcTest extends MapProjectionTestCase {
     /**
      * Threshold for comparison of floating point values.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistantTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistantTest.java
index 77f2708c25..e115c45947 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistantTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistantTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
  * @since   1.1
  */
 @DependsOn(NormalizedProjectionTest.class)
-public final strictfp class ModifiedAzimuthalEquidistantTest extends AzimuthalEquidistantTest {
+public final class ModifiedAzimuthalEquidistantTest extends AzimuthalEquidistantTest {
     /**
      * Returns the method to be tested.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MollweideTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MollweideTest.java
index 60ff6b7b63..baeef5192b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MollweideTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MollweideTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
  * @since   1.0
  */
 @DependsOn(NormalizedProjectionTest.class)
-public final strictfp class MollweideTest extends MapProjectionTestCase {
+public final class MollweideTest extends MapProjectionTestCase {
     /**
      * Creates a new instance of {@link Mollweide} concatenated with the (de)normalization matrices.
      * The new instance is stored in the inherited {@link #transform} field.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java
index bec19aef56..9a36f400ff 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.Workaround;
  * @since   0.6
  */
 @SuppressWarnings("serial")
-final strictfp class NoOp extends ConformalProjection {
+final class NoOp extends ConformalProjection {
     /**
      * Creates a new "no-operation".
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
index ef3f7597c1..f0a19a1dc1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
     org.apache.sis.internal.referencing.provider.MapProjectionTest.class,
     InitializerTest.class
 })
-public final strictfp class NormalizedProjectionTest extends TransformTestCase {
+public final class NormalizedProjectionTest extends TransformTestCase {
     /**
      * Tolerance level for comparing floating point numbers.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
index 7a132b07f7..8e5d585a0f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
@@ -42,7 +42,7 @@ import static java.lang.StrictMath.*;
  * @since   1.0
  */
 @DependsOn(MercatorTest.class)
-public final strictfp class ObliqueMercatorTest extends MapProjectionTestCase {
+public final class ObliqueMercatorTest extends MapProjectionTestCase {
     /**
      * Returns a new instance of {@link ObliqueMercator}.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
index 35c55fa5a1..2eb73b0d27 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.*;
     InitializerTest.class,
     NormalizedProjectionTest.class
 })
-public final strictfp class ObliqueStereographicTest extends MapProjectionTestCase {
+public final class ObliqueStereographicTest extends MapProjectionTestCase {
     /**
      * Parameter values provided by the IOGP Report 373-07-02 –
      * <cite>Coordinate conversions and transformation including formulas</cite>
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/OrthographicTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/OrthographicTest.java
index 700fa6b536..5c0fc96ec4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/OrthographicTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/OrthographicTest.java
@@ -36,7 +36,7 @@ import static java.lang.StrictMath.*;
  * @since   1.1
  */
 @DependsOn(NormalizedProjectionTest.class)
-public final strictfp class OrthographicTest extends MapProjectionTestCase {
+public final class OrthographicTest extends MapProjectionTestCase {
     /**
      * Creates a new instance of {@link Orthographic} using spherical formulas.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
index 413c05a4d1..76b1f5faba 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
@@ -44,7 +44,7 @@ import static java.lang.StrictMath.*;
  * @since   0.6
  */
 @DependsOn(NormalizedProjectionTest.class)
-public final strictfp class PolarStereographicTest extends MapProjectionTestCase {
+public final class PolarStereographicTest extends MapProjectionTestCase {
     /**
      * Creates a new instance of {@link PolarStereographic}.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolyconicTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolyconicTest.java
index a31ad769f4..96d4ad8d46 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolyconicTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolyconicTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
  * @since   1.0
  */
 @DependsOn(MeridianArcTest.class)
-public final strictfp class PolyconicTest extends MapProjectionTestCase {
+public final class PolyconicTest extends MapProjectionTestCase {
     /**
      * Creates a new instance of {@link Polyconic} concatenated with the (de)normalization matrices.
      * The new instance is stored in the inherited {@link #transform} field.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ProjectionResultComparator.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ProjectionResultComparator.java
index b0078c14f6..96cc6bee46 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ProjectionResultComparator.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ProjectionResultComparator.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.*;
  * @since   0.6
  */
 @SuppressWarnings("serial")
-final strictfp class ProjectionResultComparator extends NormalizedProjection {
+final class ProjectionResultComparator extends NormalizedProjection {
     /**
      * Maximum difference allowed when comparing the result of an reverse projections, in radians.
      * A value of 1E-11 radians is approximately 5 centimetres.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SatelliteTrackingTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SatelliteTrackingTest.java
index 0ca8d04001..db71bb6ad8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SatelliteTrackingTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SatelliteTrackingTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class SatelliteTrackingTest extends MapProjectionTestCase {
+public final class SatelliteTrackingTest extends MapProjectionTestCase {
     /**
      * Creates a new instance of {@link SatelliteTracking} concatenated with the (de)normalization matrices.
      * The new instance is stored in the inherited {@link #transform} field.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SinusoidalTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SinusoidalTest.java
index a643b60f77..4a283b6fc4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SinusoidalTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/SinusoidalTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
  * @since   1.0
  */
 @DependsOn(MeridianArcTest.class)
-public final strictfp class SinusoidalTest extends MapProjectionTestCase {
+public final class SinusoidalTest extends MapProjectionTestCase {
     /**
      * Creates a new instance of {@link Sinusoidal} concatenated with the (de)normalization matrices.
      * The new instance is stored in the inherited {@link #transform} field.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
index 1575ebfd6a..08beb8fea3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
@@ -47,7 +47,7 @@ import org.opengis.test.CalculationType;
  * @since   0.6
  */
 @DependsOn(NormalizedProjectionTest.class)
-public final strictfp class TransverseMercatorTest extends MapProjectionTestCase {
+public final class TransverseMercatorTest extends MapProjectionTestCase {
     /**
      * Distance from central meridian, in degrees, at which errors are considered too important.
      * This threshold is determined by comparisons of computed values against values provided by
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java
index 7ede52ee5d..38bb955169 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
  * @since   0.8
  */
 @DependsOn(TransverseMercatorTest.class)
-public final strictfp class ZonedGridSystemTest extends MapProjectionTestCase {
+public final class ZonedGridSystemTest extends MapProjectionTestCase {
     /**
      * Creates a new instance of {@link ZonedGridSystem}.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
index 02f9afd77d..44e909bec2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
@@ -43,7 +43,7 @@ import static java.lang.StrictMath.toRadians;
  * @since   0.8
  */
 @DependsOn(MolodenskyTransformTest.class)
-public final strictfp class AbridgedMolodenskyTransformTest extends MathTransformTestCase {
+public final class AbridgedMolodenskyTransformTest extends MathTransformTestCase {
     /**
      * Creates a new test case.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
index 223a1c3571..5d91904232 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
  * @since   0.5
  */
 @DependsOn(IterationStrategyTest.class)
-public final strictfp class AbstractMathTransformTest extends TestCase {
+public final class AbstractMathTransformTest extends TestCase {
     /**
      * Tests the transform methods expecting at least one argument of type {@code float[]}.
      * We will use the {@link AbstractMathTransform#transform(double[], int, double[], int, int)}
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
index be0e0bff89..7b37af9140 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToPolarTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
  * @since   0.7
  */
 @DependsOn(PolarToCartesianTest.class)
-public final strictfp class CartesianToPolarTest extends TransformTestCase {
+public final class CartesianToPolarTest extends TransformTestCase {
     /**
      * Tests coordinate conversions in the polar case.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
index 0fc87a9124..db80e7cac7 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CartesianToSphericalTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
  * @since   0.7
  */
 @DependsOn(SphericalToCartesianTest.class)
-public final strictfp class CartesianToSphericalTest extends TransformTestCase {
+public final class CartesianToSphericalTest extends TransformTestCase {
     /**
      * Tests coordinate conversions.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
index 49d75e0a10..fd7b92a5da 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
@@ -41,7 +41,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.5
  */
 @DependsOn(ProjectiveTransformTest.class)
-public final strictfp class ConcatenatedTransformTest extends MathTransformTestCase {
+public final class ConcatenatedTransformTest extends MathTransformTestCase {
     /**
      * Tolerance factor for strict equalities.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
index 71e9c44599..f2a4486753 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
@@ -42,7 +42,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.6
  */
 @DependsOn(DefaultParameterDescriptorGroupTest.class)
-public final strictfp class ContextualParametersTest extends TestCase {
+public final class ContextualParametersTest extends TestCase {
     /**
      * Creates an instance to use for testing purpose.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
index c5e064cbce..4a1bea1080 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.datum.GeodeticDatumMock;
  * @version 1.0
  * @since   0.5
  */
-public strictfp class CoordinateDomain {
+public class CoordinateDomain {
     /*
      * Note: this class is not declared as an enum yet because moving ARTICLE_CIRCLE and HEIGHT constants
      *       after the enum declarations causes an "illegal forward reference" compiler error.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java
index 991f5c0004..322b82275b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 0.6
  * @since   0.5
  */
-public strictfp class CoordinateDomainTest extends TestCase {
+public class CoordinateDomainTest extends TestCase {
     /**
      * The tolerance threshold used in this test suite.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
index 42fad73f2b..87e21ad92a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.*;
     SphericalToCartesianTest.class,
     CartesianToSphericalTest.class
 })
-public final strictfp class CoordinateSystemTransformTest extends TransformTestCase {
+public final class CoordinateSystemTransformTest extends TransformTestCase {
     /**
      * A right-handed spherical coordinate system.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
index 3f01e871d7..41ddefb000 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
     CoordinateDomainTest.class,
     ProjectiveTransformTest.class
 })
-public final strictfp class CopyTransformTest extends MathTransformTestCase {
+public final class CopyTransformTest extends MathTransformTestCase {
     /**
      * Generates random coordinates with approximately 5% of NaN values in the array.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
index e838a1b1bc..a9c0b9731f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
@@ -64,7 +64,7 @@ import static org.opengis.test.Assert.*;
     org.apache.sis.internal.referencing.provider.ProvidersTest.class,
     OperationMethodSetTest.class
 })
-public final strictfp class DefaultMathTransformFactoryTest extends TestCase {
+public final class DefaultMathTransformFactoryTest extends TestCase {
     /**
      * Returns the factory to use for the tests.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DomainDefinitionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DomainDefinitionTest.java
index b0c480a40d..e33e81abcb 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DomainDefinitionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DomainDefinitionTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.ReferencingAssert.*;
  * @version 1.3
  * @since   1.3
  */
-public final strictfp class DomainDefinitionTest extends TestCase {
+public final class DomainDefinitionTest extends TestCase {
     /**
      * Tests domain transformation when the domain is provided by a step in a chain of transforms.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
index ad44788f39..321c14abed 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
@@ -53,7 +53,7 @@ import static org.apache.sis.test.Assert.*;
     CoordinateDomainTest.class,
     ContextualParametersTest.class
 })
-public final strictfp class EllipsoidToCentricTransformTest extends MathTransformTestCase {
+public final class EllipsoidToCentricTransformTest extends MathTransformTestCase {
     /**
      * Convenience method for creating an instance from an ellipsoid.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
index d032a1e52a..1690c2aa9f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
@@ -45,7 +45,7 @@ import org.opengis.test.ToleranceModifiers;
     CoordinateDomainTest.class,
     LinearTransformTest.class
 })
-public final strictfp class ExponentialTransform1DTest extends MathTransformTestCase {
+public final class ExponentialTransform1DTest extends MathTransformTestCase {
     /**
      * Arbitrary parameter of the exponential transform to be tested.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
index e496a60e2a..db4911eeff 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
@@ -47,7 +47,7 @@ import org.junit.Test;
     GeocentricTranslationTest.class,
     FranceGeocentricInterpolationTest.class
 })
-public strictfp class InterpolatedGeocentricTransformTest extends MathTransformTestCase {
+public class InterpolatedGeocentricTransformTest extends MathTransformTestCase {
     /**
      * Creates the <cite>"France geocentric interpolation"</cite> transform,
      * including the normalization and denormalization parts.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
index b6d0e5d772..43d3ce74e1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
@@ -46,7 +46,7 @@ import org.junit.Test;
     GeocentricTranslationTest.class,
     InterpolatedGeocentricTransformTest.class
 })
-public final strictfp class InterpolatedMolodenskyTransformTest extends InterpolatedGeocentricTransformTest {
+public final class InterpolatedMolodenskyTransformTest extends InterpolatedGeocentricTransformTest {
     /**
      * Creates an approximation of the <cite>"France geocentric interpolation"</cite> transform
      * using the Molodensky transform. This method relax slightly the tolerance threshold since
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
index 74cb6f5a9d..2de4d4bb1f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
@@ -54,7 +54,7 @@ import org.junit.Test;
     NTv2Test.class,
     NADCONTest.class
 })
-public final strictfp class InterpolatedTransformTest extends MathTransformTestCase {
+public final class InterpolatedTransformTest extends MathTransformTestCase {
     /**
      * Creates an {@link InterpolatedTransform} derived from a sinusoidal formula.
      * We do not really need {@code InterpolatedTransform} for sinusoidal formulas,
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
index ef8ad9fe3c..3b5979c03f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class IterationStrategyTest extends TestCase {
+public final class IterationStrategyTest extends TestCase {
     /**
      * Maximum number of dimension tested. The referencing module should be able to handle high
      * numbers, but we stick to low one in order to avoid making the test to long to execute.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
index 3c13d6014b..ac0eb03ad6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
@@ -35,7 +35,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.0
  * @since   0.7
  */
-public final strictfp class LinearInterpolator1DTest extends TransformTestCase {
+public final class LinearInterpolator1DTest extends TransformTestCase {
     /**
      * The values of the <i>y=f(x)</i> function to test.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
index c04edcea1f..d468e1f5f8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
@@ -39,7 +39,7 @@ import static org.opengis.test.Assert.*;
  */
 @RunWith(TestRunner.class)
 @DependsOn(ProjectiveTransformTest.class)
-public final strictfp class LinearTransformTest extends ProjectiveTransformTest {
+public final class LinearTransformTest extends ProjectiveTransformTest {
     /**
      * Creates a new test suite.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
index 6dc30bd545..faa25aeafa 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
@@ -39,7 +39,7 @@ import org.opengis.test.ToleranceModifier;
  * @since   0.5
  */
 @DependsOn(ExponentialTransform1DTest.class)
-public final strictfp class LogarithmicTransform1DTest extends MathTransformTestCase {
+public final class LogarithmicTransform1DTest extends MathTransformTestCase {
     /**
      * Arbitrary parameter of the logarithmic transform to be tested.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
index 3c41692476..a4d8dd20e2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
@@ -41,7 +41,7 @@ import org.apache.sis.metadata.iso.citation.HardCodedCitations;
  * @version 0.5
  * @since   0.5
  */
-strictfp class MathTransformFactoryBase implements MathTransformFactory {
+class MathTransformFactoryBase implements MathTransformFactory {
     /**
      * The message for all exception.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
index 328e78d99d..dc92324fcd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
@@ -39,7 +39,7 @@ import org.apache.sis.referencing.operation.DefaultOperationMethod;
  * @version 0.6
  * @since   0.6
  */
-public final strictfp class MathTransformFactoryMock implements MathTransformFactory {
+public final class MathTransformFactoryMock implements MathTransformFactory {
     /**
      * The operation method.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
index b788b4e750..c9715f8ad7 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
@@ -74,7 +74,7 @@ import org.opengis.test.CalculationType;
  * @version 0.6
  * @since   0.5
  */
-public abstract strictfp class MathTransformTestCase extends TransformTestCase {
+public abstract class MathTransformTestCase extends TransformTestCase {
     /**
      * The number of coordinates to use for stressing the math transform. We use a number that
      * encompass at least 2 time the default buffer size in order to test the code that use
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
index c4cbde6a49..dd9a3d3517 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
@@ -45,7 +45,7 @@ import org.apache.sis.io.wkt.UnformattableObjectException;
  * @version 1.1
  * @since   0.8
  */
-public strictfp class MathTransformWrapper extends FormattableObject implements MathTransform, Serializable {
+public class MathTransformWrapper extends FormattableObject implements MathTransform, Serializable {
     /**
      * Serial number for inter-operability with different versions.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
index 1fd4459c2e..d8c0274821 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
@@ -44,7 +44,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.5
  */
 @DependsOn(org.apache.sis.referencing.operation.matrix.MatricesTest.class)
-public final strictfp class MathTransformsTest extends TestCase {
+public final class MathTransformsTest extends TestCase {
     /**
      * Creates a dummy transform for testing purpose.
      * The transform has the following properties:
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index b7d5970148..a16ae09fa7 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@ -70,7 +70,7 @@ import static org.apache.sis.test.Assert.*;
     ContextualParametersTest.class,
     EllipsoidToCentricTransformTest.class   // Used as a reference implementation
 })
-public final strictfp class MolodenskyTransformTest extends MathTransformTestCase {
+public final class MolodenskyTransformTest extends MathTransformTestCase {
     /**
      * Creates a new test case.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
index 9dadd9db7f..242bdb4556 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.*;
 @DependsOn({
     org.apache.sis.referencing.operation.DefaultOperationMethodTest.class,
 })
-public final strictfp class OperationMethodSetTest extends TestCase {
+public final class OperationMethodSetTest extends TestCase {
     /**
      * Creates a new two-dimensional operation method for an operation of the given name.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
index c2c99af681..f5d46d38cd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
@@ -51,7 +51,7 @@ import org.opengis.test.ToleranceModifier;
     LinearTransformTest.class,
     ExponentialTransform1DTest.class
 })
-public final strictfp class PassThroughTransformTest extends MathTransformTestCase {
+public final class PassThroughTransformTest extends MathTransformTestCase {
     /**
      * The random number generator to be used in this test.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
index 953661563b..9753abfac8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PolarToCartesianTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
  * @version 0.7
  * @since   0.7
  */
-public final strictfp class PolarToCartesianTest extends TransformTestCase {
+public final class PolarToCartesianTest extends TransformTestCase {
     /**
      * Returns coordinate tuples in polar or cylindrical coordinates and their equivalent in Cartesian coordinates.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PoleRotationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PoleRotationTest.java
index c0325cf9ab..f1ae229a59 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PoleRotationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PoleRotationTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.test.DependsOnMethod;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class PoleRotationTest extends MathTransformTestCase {
+public final class PoleRotationTest extends MathTransformTestCase {
     /**
      * Returns the transform factory to use for testing purpose.
      * This mock supports only the "affine" and "concatenate" operations.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
index 98bc8c1168..8e6fc836d3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
@@ -55,7 +55,7 @@ import org.opengis.test.referencing.AffineTransformTest;
  */
 @RunWith(TestRunner.class)
 @DependsOn({AbstractMathTransformTest.class, ScaleTransformTest.class})
-public strictfp class ProjectiveTransformTest extends AffineTransformTest {
+public class ProjectiveTransformTest extends AffineTransformTest {
     /**
      * Tolerance factor for strict comparisons.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
index efcb4e3c30..6db187ec08 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
@@ -47,7 +47,7 @@ import static java.lang.StrictMath.*;
  * @version 1.3
  * @since   0.5
  */
-strictfp class PseudoTransform extends AbstractMathTransform {
+class PseudoTransform extends AbstractMathTransform {
     /**
      * The source and target dimensions.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/RandomFailureTransform.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/RandomFailureTransform.java
index 8585bbc1c8..7ac0026a8d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/RandomFailureTransform.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/RandomFailureTransform.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 0.5
  * @since   0.5
  */
-final strictfp class RandomFailureTransform extends PseudoTransform {
+final class RandomFailureTransform extends PseudoTransform {
     /**
      * The random number generator for determining if a transform should fail.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
index df948d76e5..2f7a61eb51 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
@@ -39,7 +39,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.7
  */
 @DependsOn(AbstractMathTransformTest.class)
-public final strictfp class ScaleTransformTest extends MathTransformTestCase {
+public final class ScaleTransformTest extends MathTransformTestCase {
     /**
      * Sets the {@link #transform} field to the {@link ScaleTransform} instance to test.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SinusoidalShiftGrid.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SinusoidalShiftGrid.java
index 7cd4af4ce8..8b96a0777d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SinusoidalShiftGrid.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SinusoidalShiftGrid.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @since   1.0
  */
 @SuppressWarnings("serial")                             // Not intended to be serialized.
-final strictfp class SinusoidalShiftGrid extends DatumShiftGrid<Dimensionless,Dimensionless> {
+final class SinusoidalShiftGrid extends DatumShiftGrid<Dimensionless,Dimensionless> {
     /**
      * Number of source and target dimensions of the grid.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java
index b69bff00b0..eb00a16d34 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class SpecializableTransformTest extends MathTransformTestCase {
+public final class SpecializableTransformTest extends MathTransformTestCase {
     /**
      * Creates a transform scaling the coordinate values by 10, then applying the given translation.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
index 328d810f93..020cd85412 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SphericalToCartesianTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
  * @version 0.7
  * @since   0.7
  */
-public final strictfp class SphericalToCartesianTest extends TransformTestCase {
+public final class SphericalToCartesianTest extends TransformTestCase {
     /**
      * Returns coordinate tuples in spherical coordinates and their equivalent in Cartesian coordinates.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
index 12f86bbd8e..e25c506bab 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
@@ -39,7 +39,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.5
  */
 @DependsOn(ExponentialTransform1DTest.class)
-public final strictfp class TransferFunctionTest extends TestCase {
+public final class TransferFunctionTest extends TestCase {
     /**
      * Tests the creation of a linear transfer function.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
index b39d241a36..03824c865a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
@@ -34,7 +34,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.1
  * @since   0.7
  */
-final strictfp class TransformResultComparator implements MathTransform {
+final class TransformResultComparator implements MathTransform {
     /**
      * The transform to be used as the reference.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
index 30063094c4..0fd25c1d37 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
@@ -52,7 +52,7 @@ import static org.opengis.test.Assert.*;
     PassThroughTransformTest.class,
     ConcatenatedTransformTest.class
 })
-public final strictfp class TransformSeparatorTest extends TestCase {
+public final class TransformSeparatorTest extends TestCase {
     /**
      * Verifies the argument checks performed by the {@code add} methods.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
index 5694383e91..a6a947307a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
@@ -39,7 +39,7 @@ import static org.opengis.test.Assert.*;
  * @since   1.0
  */
 @DependsOn(AbstractMathTransformTest.class)
-public final strictfp class TranslationTransformTest extends MathTransformTestCase {
+public final class TranslationTransformTest extends MathTransformTestCase {
     /**
      * Sets the {@link #transform} field to the {@link TranslationTransform} instance to test.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
index b345deabdf..8c2991602b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
@@ -40,7 +40,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class WraparoundTransformTest extends TestCase {
+public final class WraparoundTransformTest extends TestCase {
     /**
      * Tests {@link WraparoundTransform#inverse()}.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
index 80e6d06c3c..3e084b4921 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
@@ -71,7 +71,7 @@ import org.opengis.metadata.Identifier;
  * @version 1.3
  * @since   0.6
  */
-public strictfp class CoordinateOperationMethods extends HTMLGenerator {
+public class CoordinateOperationMethods extends HTMLGenerator {
     /**
      * Generates the HTML report.
      *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
index e37373e595..be0db340d0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
@@ -78,7 +78,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.7
  */
-public final strictfp class CoordinateReferenceSystems extends AuthorityCodesReport {
+public final class CoordinateReferenceSystems extends AuthorityCodesReport {
     /**
      * The titles of some sections where to group CRS. By default CRS are grouped by datum names.
      * But if a name is listed in this map, then that alternative name will be used for grouping purpose.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java
index b2300d0e45..cdbe82e9e5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java
@@ -42,7 +42,7 @@ import org.apache.sis.util.Deprecable;
  * @version 0.7
  * @since   0.6
  */
-abstract strictfp class HTMLGenerator implements Closeable {
+abstract class HTMLGenerator implements Closeable {
     /**
      * The encoding of the files to generate.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java b/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
index 728fd5ea09..f6c3ff1c7a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
@@ -57,7 +57,7 @@ import static java.lang.StrictMath.*;
  * @version 1.0
  * @since   0.3
  */
-public strictfp class ReferencingAssert extends MetadataAssert {
+public class ReferencingAssert extends MetadataAssert {
     /**
      * The formatter to be used by {@link #assertWktEquals(String, Object)}.
      * This formatter uses the {@code “…”} quotation marks instead of {@code "…"}
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java
index bc506f7811..b35fa3c7af 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ConsistencyTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assume.assumeTrue;
     org.apache.sis.referencing.CRSTest.class,
     org.apache.sis.io.wkt.WKTFormatTest.class
 })
-public final strictfp class ConsistencyTest extends TestCase {
+public final class ConsistencyTest extends TestCase {
     /**
      * Codes to exclude for now.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
index 3ecb08c1e1..d9c2a3fd8c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
@@ -61,7 +61,7 @@ import static org.apache.sis.test.Assert.*;
     org.apache.sis.referencing.operation.DefaultCoordinateOperationFactoryTest.class,
     org.apache.sis.referencing.operation.transform.EllipsoidToCentricTransformTest.class
 })
-public final strictfp class CoordinateOperationTest extends MathTransformTestCase {
+public final class CoordinateOperationTest extends MathTransformTestCase {
     /**
      * The transformation factory to use for testing.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
index f78dd7f34f..2ce00f3bb0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assume.assumeNotNull;
     org.apache.sis.referencing.factory.sql.EPSGFactoryTest.class,
     org.apache.sis.referencing.factory.MultiAuthoritiesFactoryTest.class
 })
-public final strictfp class CoordinateReferenceSystemTest extends TestCase {
+public final class CoordinateReferenceSystemTest extends TestCase {
     /**
      * Tests creation from codes in the
      * {@code "urn:ogc:def:type, type₁:authority₁:version₁:code₁, type₂:authority₂:version₂:code₂"} form.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
index 8e5c60f0d5..304ff3dcdb 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DatumShiftTest.java
@@ -45,7 +45,7 @@ import static org.apache.sis.test.Assume.*;
     NADCONTest.class,
     FranceGeocentricInterpolationTest.class
 })
-public final strictfp class DatumShiftTest extends TestCase {
+public final class DatumShiftTest extends TestCase {
     /**
      * Tests loading an official {@code "ntf_r93.gsb"} datum shift grid file
      * and interpolating the sample point tested by {@link FranceGeocentricInterpolationTest}.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
index 7bcc92b5a9..f320d125ca 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
@@ -94,7 +94,7 @@ import static org.apache.sis.test.Assert.*;
 @DependsOn({
     MetadataVerticalTest.class
 })
-public final strictfp class MetadataTest extends TestCase {
+public final class MetadataTest extends TestCase {
     /**
      * The resource file which contains an XML representation of a {@link Metadata} object.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
index ccdd41b5e6..ecf5f55c4d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
@@ -69,7 +69,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
 @DependsOn({
     org.apache.sis.referencing.datum.DefaultVerticalDatumTest.class
 })
-public strictfp class MetadataVerticalTest extends TestCase {
+public class MetadataVerticalTest extends TestCase {
     /**
      * The resource file which contains an XML representation
      * of a {@link Metadata} object with a {@link VerticalCRS}.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
index 77f037203b..cc9fa9ab8f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
@@ -286,7 +286,7 @@ import org.junit.BeforeClass;
     org.apache.sis.test.integration.MetadataTest.class,
     org.apache.sis.test.integration.ConsistencyTest.class
 })
-public final strictfp class ReferencingTestSuite extends TestSuite {
+public final class ReferencingTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/widget/ShapeViewer.java b/core/sis-referencing/src/test/java/org/apache/sis/test/widget/ShapeViewer.java
index 6b1a0a65b6..e1e95eeef2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/widget/ShapeViewer.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/widget/ShapeViewer.java
@@ -34,7 +34,7 @@ import javax.swing.JPanel;
  * @since   1.0
  */
 @SuppressWarnings("serial")
-final strictfp class ShapeViewer extends JPanel {
+final class ShapeViewer extends JPanel {
     /**
      * Margin to keep on each side of the window.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/widget/SwingAssertions.java b/core/sis-referencing/src/test/java/org/apache/sis/test/widget/SwingAssertions.java
index 8bcd89ab62..6c1c7ecbd5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/widget/SwingAssertions.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/widget/SwingAssertions.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class SwingAssertions {
+public final class SwingAssertions {
     /**
      * Do not allow instantiation of this class.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/widget/VisualCheck.java b/core/sis-referencing/src/test/java/org/apache/sis/test/widget/VisualCheck.java
index 539c85584c..eab7d08165 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/widget/VisualCheck.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/widget/VisualCheck.java
@@ -32,7 +32,7 @@ import org.apache.sis.test.TestConfiguration;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class VisualCheck {
+public final class VisualCheck {
     /**
      * Whether to show widgets.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
index 77a013ba7a..2cf6132c15 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.2
  * @since   0.3
  */
-public final strictfp class AngleConverterTest extends TestCase {
+public final class AngleConverterTest extends TestCase {
     /**
      * Tests conversions to {@link Double}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java
index c243d5741b..1d7800962e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.test.DependsOnMethod;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class ArrayConverterTest extends TestCase {
+public final class ArrayConverterTest extends TestCase {
     /**
      * Creates an array converter from {@link Integer} to {@link Double}.
      * The types need to be specified because we want to test wrapper and primitive types.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
index 2fb308918f..b599392b70 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
@@ -48,7 +48,7 @@ import static org.apache.sis.test.Assert.*;
     StringConverterTest.class, FallbackConverterTest.class,
     org.apache.sis.util.collection.TreeTableFormatTest.class
 })
-public final strictfp class ConverterRegistryTest extends TestCase {
+public final class ConverterRegistryTest extends TestCase {
     /**
      * The registry being tested.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
index 9d0b77f1e4..f25091048c 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.test.Assert.*;
  */
 @DependsOn({StringConverterTest.class,
     org.apache.sis.util.collection.TreeTableFormatTest.class})
-public final strictfp class FallbackConverterTest extends TestCase {
+public final class FallbackConverterTest extends TestCase {
     /**
      * Conversions that are expected to be supported.
      * Greater values imply all conversions identified by lower values.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
index 123b55fc4a..8f74f66af7 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.test.Assert.*;
  */
 @DependsOn(SystemRegistryTest.class)
 @SuppressWarnings("UnnecessaryBoxing")
-public final strictfp class NumberConverterTest extends TestCase {
+public final class NumberConverterTest extends TestCase {
     /**
      * Creates a {@link NumberConverter} for the given source and target classes.
      * We have to use the {@link ConverterRegistry} instead of instantiating the
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
index 07005f5108..523b9a6701 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.3
  */
 @DependsOn(StringConverterTest.class)
-public final strictfp class PathConverterTest extends TestCase {
+public final class PathConverterTest extends TestCase {
     /**
      * Assumes that the platform file system has a Unix-style root.
      * Windows platform has driver letters instead, like "C:\\",
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
index 6e69754c3c..b99fdd118e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
@@ -54,7 +54,7 @@ import static org.apache.sis.test.Assert.*;
  */
 @SuppressWarnings("UnnecessaryBoxing")
 @DependsOn(org.apache.sis.measure.AngleTest.class)
-public final strictfp class StringConverterTest extends TestCase {
+public final class StringConverterTest extends TestCase {
     /**
      * Asserts that conversion of the given {@code source} value produces
      * the given {@code target} value, and tests the inverse conversion.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
index 7fa128a1c9..698f0e33e5 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
@@ -43,7 +43,7 @@ import static org.apache.sis.internal.converter.SystemRegistry.INSTANCE;
  * @since   0.3
  */
 @DependsOn(ConverterRegistryTest.class)
-public final strictfp class SystemRegistryTest extends TestCase {
+public final class SystemRegistryTest extends TestCase {
     /**
      * Tests the creation of {@link StringConverter}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/system/LoggersTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/system/LoggersTest.java
index 3f3774da01..9360b5c3a6 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/system/LoggersTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/system/LoggersTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 0.6
  * @since   0.6
  */
-public final strictfp class LoggersTest extends TestCase {
+public final class LoggersTest extends TestCase {
     /**
      * Verifies some logger names.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java
index b57d025658..e9bdec67fd 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class ReferenceQueueConsumerTest extends TestCase {
+public final class ReferenceQueueConsumerTest extends TestCase {
     /**
      * Verifies that invoking {@link Thread#interrupt()} will cause {@link InterruptedException}
      * to be thrown even if invoked <em>before</em> {@link ReferenceQueue#remove()} put the
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
index 60dd68c99f..2bef46ff1a 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
@@ -29,7 +29,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.6
  * @since   0.3
  */
-public final strictfp class AssertTest extends TestCase {
+public final class AssertTest extends TestCase {
     /**
      * Tests the {@link org.apache.sis.test.Assert#assertMultilinesEquals(CharSequence, CharSequence)} method.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java
index 62fe7d5c49..3d826cc179 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class TestUtilitiesTest extends TestCase {
+public final class TestUtilitiesTest extends TestCase {
     /**
      * Tests {@link org.apache.sis.test.TestUtilities#toTreeStructure(CharSequence)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java
index 647bc2b014..4fdf04bb7c 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class AbstractMapTest extends TestCase {
+public final class AbstractMapTest extends TestCase {
     /**
      * A dummy implementation of {@link AbstractMap} which will contain the English words
      * for numbers 1 to 4 inclusive. This implementation does not check argument validity
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/BagTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/BagTest.java
index 8803fc7f7a..bd00ed0eca 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/BagTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/BagTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class BagTest extends TestCase {
+public final class BagTest extends TestCase {
     /**
      * Creates an instance initialized to the given values.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
index 831ee88b0d..0cda1b81fe 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.5
  * @since   0.4
  */
-public final strictfp class CheckedArrayListTest extends TestCase {
+public final class CheckedArrayListTest extends TestCase {
     /**
      * Tests {@link CheckedArrayList#add(Object)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
index af683f77b3..6111d32cc0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
@@ -43,7 +43,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.4
  * @since   0.3
  */
-public final strictfp class CollectionsExtTest extends TestCase {
+public final class CollectionsExtTest extends TestCase {
     /**
      * Tests {@link CollectionsExt#nonNullArraySet(String, Object, Object[])}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
index dd5f76c842..3afb341aec 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   0.4
  */
-public final strictfp class DefinitionURITest extends TestCase {
+public final class DefinitionURITest extends TestCase {
     /**
      * Tests {@link DefinitionURI#parse(String)} on strings that should not be recognized as URN.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
index 7308e16638..9b15b57586 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
@@ -41,7 +41,7 @@ import static java.lang.StrictMath.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.math.DecimalFunctionsTest.class)
-public final strictfp class DoubleDoubleTest extends TestCase {
+public final class DoubleDoubleTest extends TestCase {
     /**
      * Number of time to repeat arithmetic tests.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java
index 49a787ea0d..0e6a863b97 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/ListOfUnknownSizeTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class ListOfUnknownSizeTest extends TestCase {
+public final class ListOfUnknownSizeTest extends TestCase {
     /**
      * Tests {@link ListOfUnknownSize#listIterator()}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java
index fcdd186368..c0633a8e1d 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class LocalizedParseExceptionTest extends TestCase {
+public final class LocalizedParseExceptionTest extends TestCase {
     /**
      * Tests the {@link LocalizedParseException} constructor using the default string.
      * This method also tests {@link Exceptions#getLocalizedMessage(Throwable, Locale)}
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/NumericsTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/NumericsTest.java
index b3865518d9..622b2eb02c 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/NumericsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/NumericsTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @SuppressWarnings("UnnecessaryBoxing")
-public final strictfp class NumericsTest extends TestCase {
+public final class NumericsTest extends TestCase {
     /**
      * Verifies the value of {@link Numerics#LONG_SHIFT} and {@link Numerics#INT_SHIFT}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
index 073f0ace80..938d1d5f7f 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.6
  */
-public final strictfp class StandardDateFormatTest extends TestCase {
+public final class StandardDateFormatTest extends TestCase {
     /**
      * Verifies the {@link StandardDateFormat#MILLISECONDS_PER_DAY}, {@link StandardDateFormat#NANOS_PER_MILLISECOND}
      * and {@link StandardDateFormat#NANOS_PER_SECOND} constant values.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StringsTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StringsTest.java
index 00672e2329..2eb7b04564 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StringsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StringsTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.3
  */
-public final strictfp class StringsTest extends TestCase {
+public final class StringsTest extends TestCase {
     /**
      * Tests the {@link Strings#toString(Class, Object[])} method.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java
index edc0ce0134..9664b8d5c3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java
@@ -33,7 +33,7 @@ import static org.apache.sis.internal.util.X364.*;
  * @since   0.3
  */
 @DependsOn(org.apache.sis.util.CharSequencesTest.class)
-public final strictfp class X364Test extends TestCase {
+public final class X364Test extends TestCase {
     /**
      * Tests {@link X364#forColorName(String)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java
index b2d1383155..8306476e07 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @since 0.3
  */
 @DependsOn(LineAppenderTest.class)
-public final strictfp class LeftMarginTest extends LineAppenderTest {
+public final class LeftMarginTest extends LineAppenderTest {
     /**
      * Creates and configure the {@link LineAppender} to test.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java
index 67094797b3..a60550ba19 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
   org.apache.sis.util.CharSequencesTest.class,
   org.apache.sis.internal.util.X364Test.class
 })
-public strictfp class LineAppenderTest extends AppenderTestCase {
+public class LineAppenderTest extends AppenderTestCase {
     /**
      * Creates a new test. Subclasses shall override the {@link #createLineAppender()} method
      * in order to create the instance to test.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java
index 2b78e7240b..e6f49bfe07 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
   org.apache.sis.util.CharSequencesTest.class,
   org.apache.sis.internal.util.X364Test.class,
   LineAppenderTest.class})
-public final strictfp class TableAppenderTest extends AppenderTestCase {
+public final class TableAppenderTest extends AppenderTestCase {
     /**
      * The table appender to test. May not be same instance than {@link #appender},
      * because the super-class will wraps it in a {@link SingleCharAppendable} in
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java
index 18ee8eac61..27c2c05ae3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @since 0.3
  */
 @DependsOn(LineAppenderTest.class)
-public final strictfp class TabulationExpansionTest extends LineAppenderTest {
+public final class TabulationExpansionTest extends LineAppenderTest {
     /**
      * Creates and configure the {@link LineAppender} to test.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java
index 5c3e7e4b11..96a2c0ebba 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.util.Characters.SOFT_HYPHEN;
  * @since 0.3
  */
 @DependsOn(LineAppenderTest.class)
-public strictfp class WordWrapTest extends LineAppenderTest {
+public class WordWrapTest extends LineAppenderTest {
     /**
      * Creates and configure the {@link LineAppender} to test.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java b/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java
index f43f55d182..63e05b327c 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapWithLineSeparatorTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.test.DependsOn;
  * @since   0.3
  */
 @DependsOn(WordWrapTest.class)
-public final strictfp class WordWrapWithLineSeparatorTest extends WordWrapTest {
+public final class WordWrapWithLineSeparatorTest extends WordWrapTest {
     /**
      * Creates and configure the {@link LineAppender} to test.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java
index f1bd1087f2..eaf937f2d8 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.math.DecimalFunctions.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.internal.util.NumericsTest.class)
-public final strictfp class DecimalFunctionsTest extends TestCase {
+public final class DecimalFunctionsTest extends TestCase {
     /**
      * Verifies the values of {@link DecimalFunctions#EXPONENT_FOR_ZERO}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
index 4fef778f6d..dff0354609 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
@@ -29,7 +29,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.8
  */
-public final strictfp class FractionTest extends TestCase {
+public final class FractionTest extends TestCase {
     /**
      * Tests the {@link Fraction#floor()} method.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java
index fd8959b0ba..4fe4bcbb8a 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java
@@ -32,7 +32,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.5
  */
 @DependsOn(org.apache.sis.internal.util.DoubleDoubleTest.class)
-public final strictfp class LineTest extends TestCase {
+public final class LineTest extends TestCase {
     /**
      * Tolerance factor for comparisons for floating point values.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java
index 4d9b99f917..2555f5857e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/LinearlyDerivedVectorTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class LinearlyDerivedVectorTest extends TestCase {
+public final class LinearlyDerivedVectorTest extends TestCase {
     /**
      * Tests creation of a vector and a few methods that haven been overridden.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/MathFunctionsTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/MathFunctionsTest.java
index 82be5b2691..9dbef45fd7 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/MathFunctionsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/MathFunctionsTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.internal.util.Numerics.SIGNIFICAND_SIZE;
     org.apache.sis.util.ArraysExtTest.class,
     org.apache.sis.internal.util.NumericsTest.class
 })
-public final strictfp class MathFunctionsTest extends TestCase {
+public final class MathFunctionsTest extends TestCase {
     /**
      * Small number for floating point comparisons.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
index 62c87638c8..146cd9e741 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.5
  */
 @DependsOn(org.apache.sis.internal.util.DoubleDoubleTest.class)
-public final strictfp class PlaneTest extends TestCase {
+public final class PlaneTest extends TestCase {
     /**
      * The Pearson coefficient computed by the last call to
      * {@link #assertFitEquals(double, double[], double[], double[])}.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/RepeatedVectorTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/RepeatedVectorTest.java
index e3c34d0c2a..5ccc11db32 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/RepeatedVectorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/RepeatedVectorTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class RepeatedVectorTest extends TestCase {
+public final class RepeatedVectorTest extends TestCase {
     /**
      * Tests the case where values in a grid are repeated horizontally.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
index e6654cd894..563e637cd0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class StatisticsFormatTest extends TestCase {
+public final class StatisticsFormatTest extends TestCase {
     /**
      * Tests the formatting of {@code Statistics} without column headers.
      * We instantiate the {@link StatisticsFormat} directly in order to fix the locale
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
index 6d0a93cb79..ec4f997641 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
@@ -44,7 +44,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.2
  * @since   0.3
  */
-public final strictfp class StatisticsTest extends TestCase {
+public final class StatisticsTest extends TestCase {
     /**
      * For floating point comparisons.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
index b43f84eda5..af7ba317df 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
@@ -31,7 +31,7 @@ import static org.opengis.test.Assert.*;
  * @version 1.2
  * @since   0.8
  */
-public final strictfp class VectorTest extends TestCase {
+public final class VectorTest extends TestCase {
     /**
      * The tested vector.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java
index 5f004bb152..f355c0f801 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.test.TestUtilities.*;
   FormattedCharacterIteratorTest.class,
   org.apache.sis.math.MathFunctionsTest.class
 })
-public final strictfp class AngleFormatTest extends TestCase {
+public final class AngleFormatTest extends TestCase {
     /**
      * Tests a pattern with illegal usage of D, M and S symbols.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java
index dce9b01f3e..0c4343afde 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @DependsOn(AngleFormatTest.class)
-public final strictfp class AngleTest extends TestCase {
+public final class AngleTest extends TestCase {
     /**
      * Tests the {@link Angle#toString()} method.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
index ecbc03a687..0c04750a68 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.8
  */
 @DependsOn({SystemUnitTest.class, LinearConverterTest.class, PrefixesTest.class})
-public final strictfp class ConventionalUnitTest extends TestCase {
+public final class ConventionalUnitTest extends TestCase {
     /**
      * Verifies the properties in the given unit.
      *
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/DateRangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/DateRangeTest.java
index 409373e7a0..c69fbae956 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/DateRangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/DateRangeTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.test.TestUtilities.date;
  * @since   0.3
  */
 @DependsOn(RangeTest.class)
-public final strictfp class DateRangeTest extends TestCase {
+public final class DateRangeTest extends TestCase {
     /**
      * Tests {@link Range#union(Range)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
index c91d7d30f9..266ad16ef0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class FormattedCharacterIteratorTest extends TestCase {
+public final class FormattedCharacterIteratorTest extends TestCase {
     /**
      * The string used for testing purpose in this class.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
index f8b9310b13..b0277ac213 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.8
  */
-public final strictfp class LinearConverterTest extends TestCase {
+public final class LinearConverterTest extends TestCase {
     /**
      * Asserts that the given converter is a linear converter with the given scale factor and no offset.
      * The scale factor is given by the ratio of the given numerator and denominator.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
index e7d5e903d3..7ab1f9458d 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
@@ -32,7 +32,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.3
  */
 @DependsOn(NumberRangeTest.class)
-public final strictfp class MeasurementRangeTest extends TestCase {
+public final class MeasurementRangeTest extends TestCase {
     /**
      * Tests unit conversions by the {@link MeasurementRange#convertTo(Unit)} method.
      *
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/NumberRangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/NumberRangeTest.java
index e59efe7577..e0ee6a3a5e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/NumberRangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/NumberRangeTest.java
@@ -39,7 +39,7 @@ import org.opengis.referencing.operation.TransformException;
     RangeTest.class,
     org.apache.sis.util.NumbersTest.class
 })
-public final strictfp class NumberRangeTest extends TestCase {
+public final class NumberRangeTest extends TestCase {
     /**
      * Tests {@link NumberRange#isCacheable(Number)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/PrefixesTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/PrefixesTest.java
index 8fc5392d15..e672a813d0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/PrefixesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/PrefixesTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @since   1.0
  */
 @DependsOn(LinearConverterTest.class)
-public final strictfp class PrefixesTest extends TestCase {
+public final class PrefixesTest extends TestCase {
     /**
      * Ensures that the characters in the {@link Prefixes#PREFIXES} array are in strictly increasing order,
      * and that {@link Prefixes#POWERS} has the same length.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java
index dc259ad87c..08865a62a2 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java
@@ -35,7 +35,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.8
  */
 @DependsOn(ScalarTest.class)
-public final strictfp class QuantitiesTest extends TestCase {
+public final class QuantitiesTest extends TestCase {
     /**
      * Tests {@link Quantities#create(double, String)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java
index e24809057a..8d176f62e3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java
@@ -46,7 +46,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.UTC;
  * @since   0.3
  */
 @DependsOn(MeasurementRangeTest.class)
-public final strictfp class RangeFormatTest extends TestCase {
+public final class RangeFormatTest extends TestCase {
     /**
      * The format being tested.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
index 59ae50009e..f2b2750853 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.1
  * @since   0.3
  */
-public final strictfp class RangeTest extends TestCase {
+public final class RangeTest extends TestCase {
     /**
      * Tests the creation of {@link Range} objects under normal conditions.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java
index ff5021de3c..4863d99b2b 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java
@@ -38,7 +38,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.8
  */
 @DependsOn(UnitsTest.class)
-public final strictfp class ScalarTest extends TestCase {
+public final class ScalarTest extends TestCase {
     /**
      * Tests {@link Scalar#add(Quantity)} and {@link Scalar#subtract(Quantity)}.
      * Those tests depend on proper working of {@link Scalar#create(double, Unit)}.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java
index 20c5ba2c7e..c8735c1bfb 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   0.3
  */
-public final strictfp class SexagesimalConverterTest extends TestCase {
+public final class SexagesimalConverterTest extends TestCase {
     /**
      * Tolerance value for the comparisons of floating point numbers.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
index 643da30cbd..028caebccf 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
@@ -43,7 +43,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.8
  */
 @DependsOn(UnitDimensionTest.class)
-public final strictfp class SystemUnitTest extends TestCase {
+public final class SystemUnitTest extends TestCase {
     /**
      * Verifies the {@link SystemUnit#related} array content of all system units declared in {@link Units}.
      * This tests verify that the array has been fully populated and that the converter of all units are
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
index fc43946a4b..a1ac5da7c6 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
@@ -36,7 +36,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class UnitDimensionTest extends TestCase {
+public final class UnitDimensionTest extends TestCase {
     /**
      * The dimension declared by the base {@link Units} constant.
      * We should not create our own instance for avoiding to pollute the {@link UnitDimension} cache.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
index ead330b76a..82b8d984c3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.*;
  * @since   0.8
  */
 @DependsOn({SystemUnitTest.class, ConventionalUnitTest.class})
-public final strictfp class UnitFormatTest extends TestCase {
+public final class UnitFormatTest extends TestCase {
     /**
      * Verifies all constants defined in {@link Units} class. This method verifies:
      *
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
index fe415e45bb..8a18e90d57 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.8
  */
 @DependsOn(UnitsTest.class)
-public final strictfp class UnitServicesTest extends TestCase {
+public final class UnitServicesTest extends TestCase {
     /**
      * Tests the default system of units.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
index 559d8c6abb..0cfe6162fd 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
@@ -43,7 +43,7 @@ import static org.apache.sis.test.Assert.*;
     SexagesimalConverterTest.class,
     org.apache.sis.internal.util.DefinitionURITest.class
 })
-public final strictfp class UnitsTest extends TestCase {
+public final class UnitsTest extends TestCase {
     /**
      * Verifies that the {@link Units#initialized} flag has been set.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java b/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java
index be63e41ab0..e5ba44b2a7 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class OptionKeyTest extends TestCase {
+public final class OptionKeyTest extends TestCase {
     /**
      * A custom subclass of {@link OptionKey} for testing the ability to create custom option.
      * This subclass implements {@link CheckedContainer} for ensuring that the {@code OptionKey}
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java b/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
index f71857dc95..ea3e8ed759 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
@@ -47,7 +47,7 @@ import org.apache.sis.util.Classes;
  * @version 1.0
  * @since   0.3
  */
-public strictfp class Assert extends org.opengis.test.Assert {
+public class Assert extends org.opengis.test.Assert {
     /**
      * For subclass constructor only.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java b/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java
index 71eaa4165f..6b3db4f30c 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java
@@ -28,7 +28,7 @@ import org.apache.sis.internal.system.DataDirectory;
  * @version 0.7
  * @since   0.7
  */
-public final strictfp class Assume extends org.junit.Assume {
+public final class Assume extends org.junit.Assume {
     /**
      * Do not allow instantiation.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java b/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java
index 9d6166de86..4280ba1434 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java
@@ -60,7 +60,7 @@ import static org.junit.Assert.*;
  * @version 0.7
  * @since   0.6
  */
-public final strictfp class LoggingWatcher extends TestWatcher implements Filter {
+public final class LoggingWatcher extends TestWatcher implements Filter {
     /**
      * The logged messages.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java b/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
index 1f07d901b2..cb9ac87e98 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
@@ -53,7 +53,7 @@ import org.junit.runner.RunWith;
  * @since   0.3
  */
 @RunWith(TestRunner.class)
-public abstract strictfp class TestCase {
+public abstract class TestCase {
     /**
      * A flag for code that are pending future SIS development before to be enabled.
      * This flag is always set to {@code false}. It shall be used as below:
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java b/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java
index 476f599c9f..ce050985f1 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestConfiguration.java
@@ -26,7 +26,7 @@ import org.apache.sis.util.Static;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class TestConfiguration extends Static {
+public final class TestConfiguration extends Static {
     /**
      * The {@systemProperty org.apache.sis.test.extensive} system property for enabling more extensive tests.
      * If this {@linkplain System#getProperties() system property} is set to {@code true},
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java b/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
index 952fdc1019..2800efb371 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @RunWith(Suite.class)
-public abstract strictfp class TestSuite {
+public abstract class TestSuite {
     /**
      * The default set of base classes that all test cases are expected to extends.
      * This is the default argument value for {@link #verifyTestList(Class)} method.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java b/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
index a46723dd6f..c9a3c12133 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
@@ -56,7 +56,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.UTC;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class TestUtilities extends Static {
+public final class TestUtilities extends Static {
     /**
      * Width of the separator to print to {@link TestCase#out}, in number of characters.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java b/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java
index 28f4138828..099fa5466d 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java
@@ -33,7 +33,7 @@ import org.apache.sis.util.collection.TableColumn;
  * @since 0.3
  */
 @SuppressWarnings("serial")
-public final strictfp class SerializableTableColumn<V> extends TableColumn<V> implements Serializable {
+public final class SerializableTableColumn<V> extends TableColumn<V> implements Serializable {
     /**
      * A constant for column of latitudes as floating point value.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java b/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
index ac73486e20..3ed5f4d083 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
@@ -131,7 +131,7 @@ import org.junit.BeforeClass;
     org.apache.sis.internal.converter.SystemRegistryTest.class,
     org.apache.sis.internal.converter.NumberConverterTest.class         // Shall be after SystemRegistryTest.
 })
-public final strictfp class UtilityTestSuite extends TestSuite {
+public final class UtilityTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java
index 3de6d936f4..0b972a0543 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.util.resources.IndexedResourceBundleTest.class)
-public final strictfp class ArgumentChecksTest extends TestCase {
+public final class ArgumentChecksTest extends TestCase {
     /**
      * Tests {@link ArgumentChecks#ensureNonNullElement(String, int, Object)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java
index e543b33a64..420326aa06 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class ArraysExtTest extends TestCase {
+public final class ArraysExtTest extends TestCase {
     /**
      * Tests {@link ArraysExt#removeDuplicated(Object[])}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java
index 236cbd1d8b..e014e28f19 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.util.CharSequences.*;
     ArraysExtTest.class,
     CharactersTest.class
 })
-public final strictfp class CharSequencesTest extends TestCase {
+public final class CharSequencesTest extends TestCase {
     /**
      * Tests {@link CharSequences#spaces(int)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
index acee3df980..b84f77a38a 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.util.Characters.*;
  * @version 1.1
  * @since   0.3
  */
-public final strictfp class CharactersTest extends TestCase {
+public final class CharactersTest extends TestCase {
     /**
      * Tests the value of {@link Characters#LINE_SEPARATOR}
      * and {@link Characters#PARAGRAPH_SEPARATOR} constant value.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java
index c1944a1566..2d8f5dd341 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java
@@ -70,7 +70,7 @@ import org.opengis.referencing.operation.CoordinateOperation;
  * @version 1.3
  * @since   0.3
  */
-public final strictfp class ClassesTest extends TestCase {
+public final class ClassesTest extends TestCase {
     /**
      * Tests {@link Classes#changeArrayDimension(Class, int)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/DefaultInternationalStringTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/DefaultInternationalStringTest.java
index a8ca770308..8fbda3567e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/DefaultInternationalStringTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/DefaultInternationalStringTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class DefaultInternationalStringTest extends TestCase {
+public final class DefaultInternationalStringTest extends TestCase {
     /** {@value} */ static final String MESSAGE       = "This is an unlocalized message.";
     /** {@value} */ static final String MESSAGE_en    = "This is a localized message.";
     /** {@value} */ static final String MESSAGE_fr    = "Voici un message.";
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java
index fe7ad9bdd4..032366efcd 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/ExceptionsTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 0.7
  * @since   0.4
  */
-public final strictfp class ExceptionsTest extends TestCase {
+public final class ExceptionsTest extends TestCase {
     /**
      * Tests {@link Exceptions#formatChainedMessages(Locale, String, Throwable)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java
index 1fe1042726..72d16f7547 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @DependsOn(ArraysExtTest.class)
-public final strictfp class LocalesTest extends TestCase {
+public final class LocalesTest extends TestCase {
     /**
      * Tests the {@link Locales#getAvailableLanguages()} method.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
index 490d0396be..5bbacae2ca 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.util.Numbers.*;
  * @version 1.2
  * @since   0.3
  */
-public final strictfp class NumbersTest extends TestCase {
+public final class NumbersTest extends TestCase {
     /**
      * Tests {@link Numbers#isInteger(Class)}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/SimpleInternationalStringTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/SimpleInternationalStringTest.java
index c28de656e1..1e5c6556e4 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/SimpleInternationalStringTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/SimpleInternationalStringTest.java
@@ -32,7 +32,7 @@ import static org.apache.sis.util.DefaultInternationalStringTest.MESSAGE;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class SimpleInternationalStringTest extends TestCase {
+public final class SimpleInternationalStringTest extends TestCase {
     /**
      * Tests the {@link SimpleInternationalString} implementation.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/StringBuildersTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/StringBuildersTest.java
index b48b723895..9adfe71849 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/StringBuildersTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/StringBuildersTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.util.StringBuilders.*;
  * @version 0.8
  * @since   0.3
  */
-public final strictfp class StringBuildersTest extends TestCase {
+public final class StringBuildersTest extends TestCase {
     /**
      * Tests the {@link StringBuilders#replace(StringBuilder, String, String)} method.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/UtilitiesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/UtilitiesTest.java
index 4b998bf6ce..51d052bba9 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/UtilitiesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/UtilitiesTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class UtilitiesTest extends TestCase {
+public final class UtilitiesTest extends TestCase {
     /**
      * Tests {@link Utilities#deepEquals(Object, Object, ComparisonMode)}.
      */
@@ -86,7 +86,7 @@ public final strictfp class UtilitiesTest extends TestCase {
     /**
      * For {@link #testDeepEquals()} purpose only.
      */
-    private static final strictfp class DummyLenient implements LenientComparable {
+    private static final class DummyLenient implements LenientComparable {
         /** Label to be used in comparison. */
         private final String label;
 
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
index 6ff6b17a73..0994526abd 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
@@ -30,7 +30,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.6
  * @since   0.3
  */
-public final strictfp class VersionTest extends TestCase {
+public final class VersionTest extends TestCase {
     /**
      * Tests a numeric-only version.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
index 314b882672..efd33b9062 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
@@ -48,7 +48,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.3
  */
 @DependsOn(WeakValueHashMapTest.class)
-public final strictfp class CacheTest extends TestCase {
+public final class CacheTest extends TestCase {
     /**
      * Tests {@link Cache} as a {@link java.util.Map} using strong references.
      * The tested {@code Cache} shall behave like a standard {@link HashMap},
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java
index 20e3fedb38..690925b12e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java
@@ -39,7 +39,7 @@ import static org.opengis.referencing.cs.AxisDirection.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class CodeListSetTest extends TestCase {
+public final class CodeListSetTest extends TestCase {
     /**
      * Creates a new set filled with up to 4 axis directions.
      * The directions are (NORTH, EAST, UP, FUTURE) in that order.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java
index 709bdd0bb4..09520ebef2 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.util.collection.TableColumn.*;
  * @since   0.3
  */
 @DependsOn(TableColumnTest.class)
-public final strictfp class DefaultTreeTableTest extends TestCase {
+public final class DefaultTreeTableTest extends TestCase {
     /**
      * Tests the creation of an {@link DefaultTreeTable} with initially no root node.
      * The columns are {@code NAME} and {@code TYPE}.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
index c4758b6826..9c6734ee7a 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @DependsOn(DerivedSetTest.class)
-public final strictfp class DerivedMapTest extends TestCase implements ObjectConverter<Integer,Integer> {
+public final class DerivedMapTest extends TestCase implements ObjectConverter<Integer,Integer> {
     /**
      * The value to replace by {@code null}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
index b2a7c1d468..64bfd4b65b 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class DerivedSetTest extends TestCase implements ObjectConverter<Integer,Integer> {
+public final class DerivedSetTest extends TestCase implements ObjectConverter<Integer,Integer> {
     /**
      * The value to replace by {@code null}.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java
index 6ed839073d..0f5b2c657a 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class FrequencySortedSetTest extends TestCase {
+public final class FrequencySortedSetTest extends TestCase {
     /**
      * A simple case with only two elements, the first one being omitted.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
index 46d88b767e..9b3d919ade 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
@@ -42,7 +42,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.7
  */
-public final strictfp class IntegerListTest extends TestCase {
+public final class IntegerListTest extends TestCase {
     /**
      * The list of integers being tested.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/LargeCodeList.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/LargeCodeList.java
index da91bb433e..f22c911864 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/LargeCodeList.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/LargeCodeList.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @SuppressWarnings("serial")
-public final strictfp class LargeCodeList  extends CodeList<LargeCodeList> {
+public final class LargeCodeList  extends CodeList<LargeCodeList> {
     /**
      * List of all enumerations of this type.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java
index 8d11bcc9b9..8643d991cc 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java
@@ -47,7 +47,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_SECOND;
  * @since   0.3
  */
 @DependsOn(org.apache.sis.measure.RangeTest.class)
-public final strictfp class RangeSetTest extends TestCase {
+public final class RangeSetTest extends TestCase {
     /**
      * Tolerance factor for comparison of floating point numbers.
      * Actually we expect exact matches, because {@link RangeSet} does not perform any calculation
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java
index 5f9c4da228..bd018439b0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java
@@ -33,7 +33,7 @@ import static org.apache.sis.util.collection.TableColumn.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class TableColumnTest extends TestCase {
+public final class TableColumnTest extends TestCase {
     /**
      * Test the header of some constants.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java
index a46f36d2c4..ad64acf4aa 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.util.collection.TableColumn.*;
     DefaultTreeTableTest.class,
     org.apache.sis.io.TableAppenderTest.class
 })
-public final strictfp class TreeTableFormatTest extends TestCase {
+public final class TreeTableFormatTest extends TestCase {
     /**
      * Tests the formatting as a tree, with control on the indentation.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
index 81a8454d5f..a8f5045f4b 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.util.collection.TableColumn.*;
 @DependsOn({
     DefaultTreeTableTest.class
 })
-public final strictfp class TreeTablesTest extends TestCase {
+public final class TreeTablesTest extends TestCase {
     /**
      * The {@code concatenateSingletons(…)} example documented in the {@link TreeTables} class javadoc.
      * This simple code assumes that the children collection in the given node is a {@link List}.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
index 415a230e13..b1706822a2 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.test.TestUtilities.waitForGarbageCollection;
  * @since   0.3
  */
 @DependsOn(org.apache.sis.util.ArraysExtTest.class)
-public final strictfp class WeakHashSetTest extends TestCase {
+public final class WeakHashSetTest extends TestCase {
     /**
      * The size of the test sets to be created.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
index 4501a66615..9e922860a3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
@@ -39,7 +39,7 @@ import static org.apache.sis.test.TestUtilities.waitForGarbageCollection;
  * @since   0.3
  */
 @DependsOn(org.apache.sis.util.ArraysExtTest.class)
-public final strictfp class WeakValueHashMapTest extends TestCase {
+public final class WeakValueHashMapTest extends TestCase {
     /**
      * The size of the test sets to be created.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
index a681cf3240..de22e52b94 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
@@ -34,7 +34,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.3
  */
-public final strictfp class MonolineFormatterTest extends TestCase {
+public final class MonolineFormatterTest extends TestCase {
     /**
      * The formatter to be tested.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/logging/PerformanceLevelTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/logging/PerformanceLevelTest.java
index b178a65310..8e86a4e3e6 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/logging/PerformanceLevelTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/logging/PerformanceLevelTest.java
@@ -32,7 +32,7 @@ import static org.apache.sis.util.logging.PerformanceLevel.*;
  * @version 1.3
  * @since   0.3
  */
-public final strictfp class PerformanceLevelTest extends TestCase {
+public final class PerformanceLevelTest extends TestCase {
     /**
      * Ensures that the duration are conform to the documentation.
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
index 4928479977..9b35dfc517 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
@@ -49,7 +49,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   0.3
  */
 @DependsOn(LoaderTest.class)
-public final strictfp class IndexedResourceBundleTest extends TestCase {
+public final class IndexedResourceBundleTest extends TestCase {
     /**
      * The resource bundle in process of being tested. Shall be reset to {@code null} after every
      * test. If non-null, then {@link #dumpResourcesOnError()} will consider that the test failed
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java
index cadde092c9..3847d3a97d 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 0.3
  * @since   0.3
  */
-public final strictfp class LoaderTest extends TestCase {
+public final class LoaderTest extends TestCase {
     /**
      * Tests the {@link Loader#getCandidateLocales(String, Locale)} method
      * for {@link Locale#US}.
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
index 3b658474bd..e6cbe47d21 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
@@ -31,7 +31,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @version 1.0
  * @since   0.4
  */
-public final strictfp class DataIdentificationTest extends TestCase {
+public final class DataIdentificationTest extends TestCase {
     /**
      * Tests marshalling and unmarshalling of a XML fragment.
      *
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
index 039f8b21e2..3e8f3366b4 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.0
  * @since   0.5
  */
-public final strictfp class DirectReferenceSystemTest extends TestCase {
+public final class DirectReferenceSystemTest extends TestCase {
     /**
      * An XML file in this package containing a reference system definition.
      */
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
index 13fa853ade..c73f717d94 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @version 0.4
  * @since   0.4
  */
-public final strictfp class FrenchProfileTest extends TestCase {
+public final class FrenchProfileTest extends TestCase {
     /**
      * Tests {@link FrenchProfile#toAFNOR(Object)} with {@link Constraints},
      * {@link LegalConstraints} and  {@link SecurityConstraints} objects.
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
index 0bbee8e38d..75ef9f5513 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
@@ -33,7 +33,7 @@ import org.junit.BeforeClass;
     org.apache.sis.internal.profile.fra.DataIdentificationTest.class,
     org.apache.sis.profile.france.FrenchProfileTest.class
 })
-public final strictfp class FrenchProfileTestSuite extends TestSuite {
+public final class FrenchProfileTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/profiles/sis-japan-profile/src/test/java/org/apache/sis/profile/japan/JapanProfileTest.java b/profiles/sis-japan-profile/src/test/java/org/apache/sis/profile/japan/JapanProfileTest.java
index 0aaf1b9721..80ea473e88 100644
--- a/profiles/sis-japan-profile/src/test/java/org/apache/sis/profile/japan/JapanProfileTest.java
+++ b/profiles/sis-japan-profile/src/test/java/org/apache/sis/profile/japan/JapanProfileTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
  * @version 1.0
  * @since   1.0
  */
-public final strictfp class JapanProfileTest extends TestCase {
+public final class JapanProfileTest extends TestCase {
     /**
      * Verifies that GCOM-C and GCOM-W conventions are registered.
      */
diff --git a/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java b/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java
index 66d2fdd334..39966f24b2 100644
--- a/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java
+++ b/profiles/sis-japan-profile/src/test/java/org/apache/sis/test/suite/JapanProfileTestSuite.java
@@ -31,7 +31,7 @@ import org.junit.BeforeClass;
 @Suite.SuiteClasses({
     org.apache.sis.profile.japan.JapanProfileTest.class
 })
-public final strictfp class JapanProfileTestSuite extends TestSuite {
+public final class JapanProfileTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/landsat/LandsatStoreProviderTest.java b/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/landsat/LandsatStoreProviderTest.java
index 4adcfa4a34..290f4033d9 100644
--- a/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/landsat/LandsatStoreProviderTest.java
+++ b/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/landsat/LandsatStoreProviderTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class LandsatStoreProviderTest extends TestCase {
+public final class LandsatStoreProviderTest extends TestCase {
     /**
      * Tests {@link LandsatStoreProvider#probeContent(StorageConnector)} method.
      *
diff --git a/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java b/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java
index 362ca82aae..26db45c327 100644
--- a/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java
+++ b/storage/sis-earth-observation/src/test/java/org/apache/sis/test/suite/EarthObservationTestSuite.java
@@ -33,7 +33,7 @@ import org.junit.BeforeClass;
     org.apache.sis.storage.landsat.MetadataReaderTest.class,
     org.apache.sis.storage.landsat.LandsatStoreProviderTest.class
 })
-public final strictfp class EarthObservationTestSuite extends TestSuite {
+public final class EarthObservationTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/internal/geotiff/CompressionTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/internal/geotiff/CompressionTest.java
index 8588817e76..eeee7bb21c 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/internal/geotiff/CompressionTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/internal/geotiff/CompressionTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.8
  */
-public final strictfp class CompressionTest extends TestCase {
+public final class CompressionTest extends TestCase {
     /**
      * Tests {@link Compression#valueOf(long)}.
      */
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/internal/storage/inflater/CCITTRLETest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/internal/storage/inflater/CCITTRLETest.java
index b1e5035932..cd18ff00d8 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/internal/storage/inflater/CCITTRLETest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/internal/storage/inflater/CCITTRLETest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class CCITTRLETest extends TestCase {
+public final class CCITTRLETest extends TestCase {
     /**
      * Step between 2 "Make-up codes" values.
      */
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/internal/storage/inflater/InflaterTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/internal/storage/inflater/InflaterTest.java
index 5b58ebd2f8..e94500d3cd 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/internal/storage/inflater/InflaterTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/internal/storage/inflater/InflaterTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class InflaterTest extends TestCase {
+public final class InflaterTest extends TestCase {
     /**
      * Verifies that the inflater constructor makes sure to have a chunk size
      * not greater than maximal buffer capacity.
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java
index ba05dae9e2..e697cfd134 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class CRSBuilderTest extends TestCase {
+public final class CRSBuilderTest extends TestCase {
     /**
      * Tests {@link CRSBuilder#splitName(String)}. The string used for this test is:
      *
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java
index a4764c8f18..cdac326ffd 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/GeoKeysTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class GeoKeysTest extends TestCase {
+public final class GeoKeysTest extends TestCase {
     /**
      * Tests {@link GeoKeys#name(short)}.
      */
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/SelfConsistencyTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/SelfConsistencyTest.java
index 6520394d50..426ad766f6 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/SelfConsistencyTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/SelfConsistencyTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assume.assumeNotNull;
  * @version 1.3
  * @since   1.1
  */
-public final strictfp class SelfConsistencyTest extends CoverageReadConsistency {
+public final class SelfConsistencyTest extends CoverageReadConsistency {
     /**
      * The file used for the test, opened only once.
      */
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TagsTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TagsTest.java
index 0b9848ca27..0263c3bbeb 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TagsTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TagsTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
  * @version 1.4
  * @since   1.4
  */
-public final strictfp class TagsTest extends TestCase {
+public final class TagsTest extends TestCase {
     /**
      * Tests {@link Tags#name(short)}.
      */
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TypeTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TypeTest.java
index 64fc442b83..b2729f4aa0 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TypeTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/TypeTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.0
  * @since   0.8
  */
-public final strictfp class TypeTest extends TestCase {
+public final class TypeTest extends TestCase {
     /**
      * Verifies that all enumeration values override either {@link Type#readLong(ChannelDataInput, long)}
      * or {@link Type#readDouble(ChannelDataInput, long)}.Failing to do so may cause stack overflow.
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java
index be51af2190..cbed0dfe69 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java
@@ -35,7 +35,7 @@ import static org.apache.sis.test.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class XMLMetadataTest extends TestCase {
+public final class XMLMetadataTest extends TestCase {
     /**
      * A GDAL metadata. The format is specific to the GDAL project.
      */
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java b/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java
index 8fb873b131..3432eaa123 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/test/suite/GeoTiffTestSuite.java
@@ -39,7 +39,7 @@ import org.junit.BeforeClass;
     org.apache.sis.storage.geotiff.XMLMetadataTest.class,
     org.apache.sis.storage.geotiff.SelfConsistencyTest.class
 })
-public final strictfp class GeoTiffTestSuite extends TestSuite {
+public final class GeoTiffTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/AxisTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/AxisTest.java
index b1a5129458..d67deb258b 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/AxisTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/AxisTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 0.7
  * @since   0.3
  */
-public final strictfp class AxisTest extends TestCase {
+public final class AxisTest extends TestCase {
     /**
      * Tests {@link Axis#direction(String)}.
      */
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
index d0f8f7a689..cac73c475a 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   0.8
  */
-public final strictfp class DataTypeTest extends TestCase {
+public final class DataTypeTest extends TestCase {
     /**
      * Verifies the relationship between the enumeration ordinal value and the netCDF numerical code.
      */
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
index 24890dd4b8..f11a276a39 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.storage.netcdf.AttributeNames.*;
  * @version 1.0
  * @since   0.3
  */
-public strictfp class DecoderTest extends TestCase {
+public class DecoderTest extends TestCase {
     /**
      * Tests {@link Decoder#stringValue(String)} with global attributes.
      *
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java
index 3c67e2db4d..30ef93b14c 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java
@@ -54,7 +54,7 @@ import org.opengis.test.dataset.TestData;
  * @since   1.1
  */
 @DependsOn(VariableTest.class)
-public strictfp class FeatureSetTest extends TestCase {
+public class FeatureSetTest extends TestCase {
     /**
      * Type of the features read from the netCDF file.
      */
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
index d70f879a8d..9d39b4bcb7 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.3
  */
 @DependsOn(VariableTest.class)
-public strictfp class GridTest extends TestCase {
+public class GridTest extends TestCase {
     /**
      * Whether the {@code "runtime"} variable in {@link TestData#NETCDF_4D_PROJECTED} is used as a target dimension
      * for the {@code gridToCRS} transform. The UCAR library and Apache SIS implementation have different behavior
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
index 56e126beab..65308fb37b 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   0.3
  */
-public abstract strictfp class TestCase extends org.apache.sis.test.TestCase {
+public abstract class TestCase extends org.apache.sis.test.TestCase {
     /**
      * The {@code searchPath} argument value to be given to the {@link Decoder#setSearchPath(String[])}
      * method when the decoder shall search only in global attributes.
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
index 6eb6feec3d..3241c658b8 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
@@ -43,7 +43,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.3
  */
 @DependsOn(DecoderTest.class)
-public strictfp class VariableTest extends TestCase {
+public class VariableTest extends TestCase {
     /**
      * Expected number of columns per variables for the {@code expected} argument
      * given to the {@link #assertBasicPropertiesEqual(Object[], Variable[])} method.
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java
index 9841c1d470..db0a81ca77 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java
@@ -38,7 +38,7 @@ import org.opengis.test.dataset.TestData;
  * @since   0.3
  */
 @DependsOn(DecoderTest.class)
-public final strictfp class ChannelDecoderTest extends DecoderTest {
+public final class ChannelDecoderTest extends DecoderTest {
     /**
      * Creates a new decoder for the specified dataset.
      *
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/FeatureSetTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/FeatureSetTest.java
index f3e2ef0650..8464422abf 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/FeatureSetTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/FeatureSetTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.storage.DataStoreException;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class FeatureSetTest extends org.apache.sis.internal.netcdf.FeatureSetTest {
+public final class FeatureSetTest extends org.apache.sis.internal.netcdf.FeatureSetTest {
     /**
      * Creates a new decoder for the specified dataset.
      *
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java
index d423fbe598..527cef217a 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java
@@ -38,7 +38,7 @@ import org.opengis.test.dataset.TestData;
  * @since   0.3
  */
 @DependsOn({VariableInfoTest.class, GridTest.class})
-public final strictfp class GridInfoTest extends GridTest {
+public final class GridInfoTest extends GridTest {
     /**
      * Creates a new test.
      */
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
index c5555c3fe1..1b50606c6c 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
@@ -34,7 +34,7 @@ import org.opengis.test.dataset.TestData;
  * @since   0.3
  */
 @DependsOn({ChannelDecoderTest.class, VariableTest.class})
-public final strictfp class VariableInfoTest extends VariableTest {
+public final class VariableInfoTest extends VariableTest {
     /**
      * Creates a new test.
      */
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
index 4c300b1bb2..c6c740199d 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
@@ -52,7 +52,7 @@ import static org.apache.sis.test.TestUtilities.date;
     ChannelDecoderTest.class,
     org.apache.sis.internal.netcdf.impl.VariableInfoTest.class
 })
-public final strictfp class MetadataReaderTest extends TestCase {
+public final class MetadataReaderTest extends TestCase {
     /**
      * Tests {@link MetadataReader#split(String)}.
      */
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
index c5a0eb4e6e..e7f8c75eb5 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
@@ -44,7 +44,7 @@ import static org.opengis.test.Assert.*;
 @DependsOn({
     ChannelDecoderTest.class
 })
-public final strictfp class NetcdfStoreProviderTest extends TestCase {
+public final class NetcdfStoreProviderTest extends TestCase {
     /**
      * Tests {@link NetcdfStoreProvider#probeContent(StorageConnector)} for an input stream which shall
      * be recognized as a classic netCDF file.
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
index e229aa4f99..7028f239bc 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
@@ -39,7 +39,7 @@ import static org.opengis.test.Assert.*;
     MetadataReaderTest.class,
     NetcdfStoreProviderTest.class
 })
-public final strictfp class NetcdfStoreTest extends TestCase {
+public final class NetcdfStoreTest extends TestCase {
     /**
      * Returns a new netCDF store to test.
      *
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/SelfConsistencyTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/SelfConsistencyTest.java
index ad451c922f..fa26c202e5 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/SelfConsistencyTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/SelfConsistencyTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assume.assumeNotNull;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class SelfConsistencyTest extends CoverageReadConsistency {
+public final class SelfConsistencyTest extends CoverageReadConsistency {
     /**
      * The file used for the test, opened only once.
      */
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java b/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
index f3f5218ebf..de5813768b 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
@@ -44,7 +44,7 @@ import org.junit.BeforeClass;
     org.apache.sis.storage.netcdf.NetcdfStoreTest.class,
     org.apache.sis.storage.netcdf.SelfConsistencyTest.class
 })
-public final strictfp class NetcdfTestSuite extends TestSuite {
+public final class NetcdfTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java b/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
index d16d68195b..f8223105ea 100644
--- a/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
+++ b/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
@@ -38,7 +38,7 @@ import org.opengis.feature.Feature;
  * @version 0.5
  * @since   0.5
  */
-public final strictfp class ShapeFileTest extends TestCase {
+public final class ShapeFileTest extends TestCase {
     /**
      * Returns URI path to a resource.
      * @param name Resource name.
diff --git a/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java b/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
index f7de34db8b..5295d89d02 100644
--- a/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
+++ b/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
@@ -31,7 +31,7 @@ import org.junit.BeforeClass;
     org.apache.sis.internal.shapefile.jdbc.DBFResultSetTest.class,
     org.apache.sis.internal.shapefile.jdbc.sql.WhereClauseTest.class
 })
-public final strictfp class ShapefileTestSuite extends TestSuite {
+public final class ShapefileTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/GeometryGetterTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/GeometryGetterTest.java
index cb47f5b4e3..b737bf9936 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/GeometryGetterTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/GeometryGetterTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   1.1
  */
-public strictfp final class GeometryGetterTest extends TestCase {
+public final class GeometryGetterTest extends TestCase {
     /**
      * The factory to use for creating geometric objects.
      */
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/SelectionClauseWriterTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/SelectionClauseWriterTest.java
index d42d7a98b7..c3e7a23553 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/SelectionClauseWriterTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/SelectionClauseWriterTest.java
@@ -47,7 +47,7 @@ import org.opengis.filter.SpatialOperator;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class SelectionClauseWriterTest extends TestCase implements SchemaModifier {
+public final class SelectionClauseWriterTest extends TestCase implements SchemaModifier {
     /**
      * The factory to use for creating the filter objects.
      */
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/BandTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/BandTest.java
index a7498f785f..1723f7147f 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/BandTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/BandTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class BandTest extends TestCase {
+public final class BandTest extends TestCase {
     /**
      * Verifies the values returned by {@link Band#bufferToPixelType(int)}
      * by comparing them to the values returned by {@link Band#getDataBufferType()}.
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java
index 1d4370645e..b49a9e0b07 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java
@@ -68,7 +68,7 @@ import static org.opengis.test.Assert.*;
  * @since   1.1
  */
 @DependsOn({RasterReaderTest.class, RasterWriterTest.class})
-public final strictfp class PostgresTest extends TestCase {
+public final class PostgresTest extends TestCase {
     /**
      * Tests {@link Postgres#parseVersion(String)}.
      */
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/RasterReaderTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/RasterReaderTest.java
index 684cdf355e..7838cb468c 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/RasterReaderTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/RasterReaderTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class RasterReaderTest extends TestCase {
+public final class RasterReaderTest extends TestCase {
     /**
      * Tests reading a raster in unsigned short format.
      * This method reads the {@code "raster-ushort.wkb"} file
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/RasterWriterTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/RasterWriterTest.java
index b78f0e0b16..b502adf6da 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/RasterWriterTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/RasterWriterTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class RasterWriterTest extends TestCase {
+public final class RasterWriterTest extends TestCase {
     /**
      * Tests writing a raster in unsigned short format.
      * This method writes the raster in an array and compares the result with
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
index f6ac7df534..e23cdb0fa0 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
@@ -56,7 +56,7 @@ import org.opengis.filter.SortOrder;
  * @version 1.2
  * @since   1.1
  */
-public final strictfp class SQLStoreTest extends TestCase {
+public final class SQLStoreTest extends TestCase {
     /**
      * The schema where will be stored the features to test.
      */
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java
index 566261d653..8084b01b02 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/test/suite/SQLTestSuite.java
@@ -33,7 +33,7 @@ import org.junit.BeforeClass;
     org.apache.sis.internal.sql.postgis.PostgresTest.class,
     org.apache.sis.storage.sql.SQLStoreTest.class
 })
-public final strictfp class SQLTestSuite extends TestSuite {
+public final class SQLTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java
index b570baabbd..d263250e8a 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/CodeTypeTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class CodeTypeTest  extends TestCase {
+public final class CodeTypeTest  extends TestCase {
     /**
      * The expected value.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MemoryGridResourceTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MemoryGridResourceTest.java
index 56f3a936ae..28683e4ae1 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MemoryGridResourceTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MemoryGridResourceTest.java
@@ -40,7 +40,7 @@ import static org.apache.sis.test.Assert.*;
  * @since   1.1
  */
 @DependsOn(RangeArgumentTest.class)
-public final strictfp class MemoryGridResourceTest extends TestCase {
+public final class MemoryGridResourceTest extends TestCase {
     /**
      * Arbitrary size for the grid to test.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
index 83c95b39f4..08ceaadaf1 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
@@ -45,7 +45,7 @@ import org.opengis.feature.FeatureType;
  * @version 1.2
  * @since   0.8
  */
-public final strictfp class MetadataBuilderTest extends TestCase {
+public final class MetadataBuilderTest extends TestCase {
     /**
      * Tests {@link MetadataBuilder#parseLegalNotice(String)}.
      * The expected result of this parsing is:
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/RangeArgumentTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/RangeArgumentTest.java
index f3cb67a44c..c10d74351d 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/RangeArgumentTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/RangeArgumentTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.0
  */
-public final strictfp class RangeArgumentTest extends TestCase implements Localized {
+public final class RangeArgumentTest extends TestCase implements Localized {
     /**
      * A resource performing no operation.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/StoreUtilitiesTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/StoreUtilitiesTest.java
index 040b781f4c..2f39a4624a 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/StoreUtilitiesTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/StoreUtilitiesTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class StoreUtilitiesTest extends TestCase {
+public final class StoreUtilitiesTest extends TestCase {
     /**
      * Tests {@link StoreUtilities#basedOnASCII(Charset)}.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java
index 4c0a7e50ca..d68a750eba 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   0.8
  */
-public final strictfp class StoreProviderTest extends TestCase {
+public final class StoreProviderTest extends TestCase {
     /**
      * Tests {@link StoreProvider#probeContent(StorageConnector)} method.
      *
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
index 0ed10d82fb..93aad10ff3 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
@@ -52,7 +52,7 @@ import org.opengis.feature.AttributeType;
  * @version 1.0
  * @since   0.7
  */
-public final strictfp class StoreTest extends TestCase {
+public final class StoreTest extends TestCase {
     /**
      * {@code true} if testing a moving feature, or {@code false} (the default) if testing a static feature.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/AsciiGridStoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/AsciiGridStoreTest.java
index 37472e4155..83af95ceb3 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/AsciiGridStoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/AsciiGridStoreTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class AsciiGridStoreTest extends TestCase {
+public final class AsciiGridStoreTest extends TestCase {
     /**
      * Returns a storage connector with the URL to the test data.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BILConsistencyTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BILConsistencyTest.java
index c7da12509d..b891d7acf2 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BILConsistencyTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BILConsistencyTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class BILConsistencyTest extends CoverageReadConsistency {
+public final class BILConsistencyTest extends CoverageReadConsistency {
     /**
      * The store used for the test, opened only once.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BIPConsistencyTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BIPConsistencyTest.java
index 2df168405b..2ff15d436b 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BIPConsistencyTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BIPConsistencyTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class BIPConsistencyTest extends CoverageReadConsistency {
+public final class BIPConsistencyTest extends CoverageReadConsistency {
     /**
      * The store used for the test, opened only once.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BSQConsistencyTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BSQConsistencyTest.java
index c26ff5ac61..e81535e6e8 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BSQConsistencyTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/BSQConsistencyTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class BSQConsistencyTest extends CoverageReadConsistency {
+public final class BSQConsistencyTest extends CoverageReadConsistency {
     /**
      * The store used for the test, opened only once.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/WritableStoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/WritableStoreTest.java
index 820b8df1ab..e040c02db1 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/WritableStoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/esri/WritableStoreTest.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class WritableStoreTest extends TestCase {
+public final class WritableStoreTest extends TestCase {
     /**
      * Creates a test grid coverage filled with arbitrary data.
      *
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java
index c0b9803fe2..a7b5e1320e 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assume.assumeTrue;
  * @version 1.1
  * @since   0.8
  */
-public final strictfp class StoreTest extends TestCase {
+public final class StoreTest extends TestCase {
     /**
      * Gets the path to the test directory. If the directory is not accessible through the file system
      * (for example if the test data are read from a JAR file), then skip the tests. This happen if the
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/image/SelfConsistencyTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/image/SelfConsistencyTest.java
index aa98de579e..281f709d94 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/image/SelfConsistencyTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/image/SelfConsistencyTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
  * @version 1.2
  * @since   1.2
  */
-public final strictfp class SelfConsistencyTest extends CoverageReadConsistency {
+public final class SelfConsistencyTest extends CoverageReadConsistency {
     /**
      * The store used for the test, opened only once.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/image/WorldFileStoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/image/WorldFileStoreTest.java
index f89299ac3b..84bbbd52ff 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/image/WorldFileStoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/image/WorldFileStoreTest.java
@@ -46,7 +46,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @version 1.3
  * @since   1.2
  */
-public final strictfp class WorldFileStoreTest extends TestCase {
+public final class WorldFileStoreTest extends TestCase {
     /**
      * Returns a storage connector with the URL to the test data.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java
index 688b8deb3f..9504e34d1f 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java
@@ -36,7 +36,7 @@ import org.apache.sis.util.ArgumentChecks;
  *
  * @since 0.5
  */
-final strictfp class ByteArrayChannel implements SeekableByteChannel {
+final class ByteArrayChannel implements SeekableByteChannel {
     /**
      * Bytes array where to write the data.
      * The length of this array is the capacity.
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java
index 542c18007c..1cdc7fdcff 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
  * @version 1.2
  * @since   0.3
  */
-public final strictfp class ChannelDataInputTest extends ChannelDataTestCase {
+public final class ChannelDataInputTest extends ChannelDataTestCase {
     /**
      * The implementation to test.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataOutputTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataOutputTest.java
index 890e017891..0e01322306 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataOutputTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataOutputTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
  * @version 1.3
  * @since   0.5
  */
-public strictfp class ChannelDataOutputTest extends ChannelDataTestCase {
+public class ChannelDataOutputTest extends ChannelDataTestCase {
     /**
      * The {@link DataOutput} implementation to test. This implementation will write data to
      * {@link #testedStreamBackingArray}. The content of that array will be compared to
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java
index 1144aaffde..ba5166f62a 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.Debug;
  * @version 1.2
  * @since   0.5
  */
-abstract strictfp class ChannelDataTestCase extends TestCase {
+abstract class ChannelDataTestCase extends TestCase {
     /**
      * The maximal length of the arrays to be read or written from/to the channel, in bytes.
      * This size may be smaller or greater than the buffer capacity, but a greater size is
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageInputStreamTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageInputStreamTest.java
index f738915ad5..d28a6939be 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageInputStreamTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageInputStreamTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
  * @since   0.3
  */
 @DependsOn(ChannelDataInputTest.class)
-public final strictfp class ChannelImageInputStreamTest extends ChannelDataTestCase {
+public final class ChannelImageInputStreamTest extends ChannelDataTestCase {
     /**
      * The implementation to test.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java
index 1a4e45a29d..0d519e18a3 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
  * @since   0.5
  */
 @DependsOn(ChannelDataOutputTest.class)
-public final strictfp class ChannelImageOutputStreamTest extends ChannelDataOutputTest {
+public final class ChannelImageOutputStreamTest extends ChannelDataOutputTest {
     /**
      * Initializes all non-final fields before to execute a test.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ComputedInputStream.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ComputedInputStream.java
index b8531f42ef..47106d17cd 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ComputedInputStream.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ComputedInputStream.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
  * @version 1.4
  * @since   1.4
  */
-final strictfp class ComputedInputStream extends InputStream {
+final class ComputedInputStream extends InputStream {
     /**
      * Number of bytes in this stream.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/DripByteChannel.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/DripByteChannel.java
index 8682bd44bb..13dc825b3a 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/DripByteChannel.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/DripByteChannel.java
@@ -34,7 +34,7 @@ import static java.lang.StrictMath.min;
  * @version 0.4
  * @since   0.4
  */
-public final strictfp class DripByteChannel implements ReadableByteChannel {
+public final class DripByteChannel implements ReadableByteChannel {
     /**
      * The data to provide.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/FileCacheByteChannelTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/FileCacheByteChannelTest.java
index 8c1cf4bd60..043d6c7990 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/FileCacheByteChannelTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/FileCacheByteChannelTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @version 1.4
  * @since   1.4
  */
-public final strictfp class FileCacheByteChannelTest extends TestCase {
+public final class FileCacheByteChannelTest extends TestCase {
     /**
      * The implementation used for testing purpose.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java
index 667995c837..370d5e2d85 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.*;
  * @since   0.7
  */
 @DependsOn(ChannelDataInputTest.class)
-public final strictfp class HyperRectangleReaderTest extends TestCase {
+public final class HyperRectangleReaderTest extends TestCase {
     /**
      * The hyper-cube dimensions.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java
index 2dd4931c80..57650ad0c8 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/IOUtilitiesTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
  * @version 1.4
  * @since   0.3
  */
-public final strictfp class IOUtilitiesTest extends TestCase {
+public final class IOUtilitiesTest extends TestCase {
     /**
      * Tests {@link IOUtilities#filename(Object)}.
      *
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/MemoryCacheImageOutputStream.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/MemoryCacheImageOutputStream.java
index 18f6ebca6d..97b3ca1127 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/MemoryCacheImageOutputStream.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/MemoryCacheImageOutputStream.java
@@ -31,7 +31,7 @@ import org.apache.sis.util.Workaround;
  * @since   0.5
  */
 @Workaround(library = "JDK", version = "1.8")
-final strictfp class MemoryCacheImageOutputStream extends javax.imageio.stream.MemoryCacheImageOutputStream {
+final class MemoryCacheImageOutputStream extends javax.imageio.stream.MemoryCacheImageOutputStream {
     /**
      * Creates a new instance which will write the data in the given stream.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/RewindableLineReaderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/RewindableLineReaderTest.java
index de0dfc61f5..f31bb24739 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/RewindableLineReaderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/RewindableLineReaderTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  * @version 0.8
  * @since   0.8
  */
-public final strictfp class RewindableLineReaderTest extends TestCase {
+public final class RewindableLineReaderTest extends TestCase {
     /**
      * Number of bytes to transfer from the {@code ImageInputStream} to {@code BufferedReader}.
      * We use a small size in order to invalidate the {@code BufferedReader} mark without having
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
index f029d037d9..57fad69376 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
  * @since   0.7
  */
 @DependsOn(org.apache.sis.storage.StorageConnectorTest.class)
-public final strictfp class StoreProviderTest extends TestCase {
+public final class StoreProviderTest extends TestCase {
     /**
      * Verifies validity of {@code StoreProvider.MIN_LENGTH} and {@code StoreProvider.MAX_LENGTH} constants
      * by comparing them with the content of {@code StoreProvider.KEYWORDS} map.
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
index 021feae267..a452dcbebf 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
@@ -40,7 +40,7 @@ import static org.opengis.test.Assert.*;
  * @since   0.7
  */
 @DependsOn(StoreProviderTest.class)
-public final strictfp class StoreTest extends TestCase {
+public final class StoreTest extends TestCase {
     /**
      * The WKT to parse. This WKT uses US-ASCII characters only.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
index 54df900066..b3c7bd127a 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
@@ -37,7 +37,7 @@ import static org.apache.sis.metadata.iso.extent.DefaultExtentTest.FILENAME;
  * @version 1.0
  * @since   0.4
  */
-public final strictfp class MimeTypeDetectorTest extends TestUsingFile {
+public final class MimeTypeDetectorTest extends TestUsingFile {
     /**
      * Tests a pseudo-XML file in the default namespace, read from a hard-coded string.
      *
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreProviderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreProviderTest.java
index e640c2b367..88f18a9c6a 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreProviderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreProviderTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.storage.StorageConnectorTest.class)
-public final strictfp class StoreProviderTest extends TestCase {
+public final class StoreProviderTest extends TestCase {
     /**
      * Tests {@link StoreProvider#probeContent(StorageConnector)} method from a {@link java.io.Reader} object.
      *
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
index 05e5b8afe0..332632af1c 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
@@ -41,7 +41,7 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
  * @since   0.4
  */
 @DependsOn(org.apache.sis.storage.StorageConnectorTest.class)
-public final strictfp class StoreTest extends TestCase {
+public final class StoreTest extends TestCase {
     /**
      * The metadata to unmarshal.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/CoverageQueryTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/CoverageQueryTest.java
index 305908c2a8..f8b9b4e4e0 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/CoverageQueryTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/CoverageQueryTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @version 1.1
  * @since   1.1
  */
-public final strictfp class CoverageQueryTest extends TestCase {
+public final class CoverageQueryTest extends TestCase {
     /**
      * The coordinate reference system used by the tests.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoreMock.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoreMock.java
index 976f7ccf12..6a78051c0a 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoreMock.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoreMock.java
@@ -29,7 +29,7 @@ import org.apache.sis.storage.event.StoreListeners;
  * @version 1.3
  * @since   0.8
  */
-public final strictfp class DataStoreMock extends DataStore {
+public final class DataStoreMock extends DataStore {
     /**
      * The display name.
      */
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoreProviderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoreProviderTest.java
index 874297c87d..1842644902 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoreProviderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoreProviderTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
  * @since   1.2
  */
 @DependsOn(StorageConnectorTest.class)
-public final strictfp class DataStoreProviderTest extends TestCase {
+public final class DataStoreProviderTest extends TestCase {
     /**
      * A dummy provider instance to test. Only the
      * {@link DataStoreProvider#probeContent(StorageConnector, Class, Prober)} method is useful on this instance.
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java
index 36fdb7dfb0..80b44e2aa2 100644
... 232 lines suppressed ...


[sis] 03/06: Second round of remplacement of `@preformat` tag by `@snippet`. Replace raw text by `
` blocks.

Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit a4b64aae058ee8da627435e71de398fb2d001312
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Dec 28 16:21:16 2022 +0100

    Second round of remplacement of `@preformat` tag by `@snippet`.
    Replace raw text by `<pre>` blocks.
---
 .../org/apache/sis/internal/gui/GUIUtilities.java  |  8 ++--
 .../org/apache/sis/internal/setup/FXFinder.java    |  5 +--
 .../org/apache/sis/cloud/aws/s3/FileService.java   |  4 +-
 .../org/apache/sis/coverage/SampleRangeFormat.java |  5 +--
 .../apache/sis/coverage/grid/GridOrientation.java  | 15 +++----
 .../org/apache/sis/feature/AbstractAttribute.java  | 14 +++----
 .../org/apache/sis/feature/AbstractFeature.java    |  9 ++--
 .../java/org/apache/sis/feature/FeatureFormat.java | 10 ++---
 .../java/org/apache/sis/feature/FieldType.java     |  8 +---
 .../sis/feature/builder/FeatureTypeBuilder.java    |  9 ++--
 .../apache/sis/feature/builder/package-info.java   |  5 +--
 .../java/org/apache/sis/image/Interpolation.java   |  5 +--
 .../sis/internal/coverage/j2d/TilePlaceholder.java |  8 ++--
 .../sis/internal/processing/isoline/Joiner.java    |  5 +--
 .../sis/internal/processing/isoline/Tracer.java    | 25 +++++------
 .../apache/sis/coverage/SampleDimensionTest.java   | 15 +++----
 .../coverage/grid/BufferedGridCoverageTest.java    |  5 +--
 .../sis/coverage/grid/GridCoverage2DTest.java      | 10 ++---
 .../sis/coverage/grid/GridDerivationTest.java      | 10 ++---
 .../org/apache/sis/image/InterpolationTest.java    |  5 +--
 .../apache/sis/internal/jaxb/TypeRegistration.java |  4 +-
 .../apache/sis/internal/jaxb/gco/package-info.java |  6 +--
 .../org/apache/sis/internal/jaxb/gml/Measure.java  | 11 ++---
 .../sis/internal/jaxb/lan/LocaleAndCharset.java    |  5 +--
 .../jaxb/lan/LocalisedCharacterString.java         |  4 +-
 .../apache/sis/internal/jaxb/lan/TextGroup.java    |  5 +--
 .../internal/jaxb/metadata/RS_ReferenceSystem.java |  5 +--
 .../metadata/replace/ReferenceSystemMetadata.java  |  5 +--
 .../sis/internal/metadata/sql/Initializer.java     |  4 +-
 .../sis/internal/metadata/sql/package-info.java    |  4 +-
 .../org/apache/sis/metadata/PropertyAccessor.java  |  4 +-
 .../org/apache/sis/metadata/TitleProperty.java     | 14 +++----
 .../java/org/apache/sis/metadata/TreeNode.java     | 10 ++---
 .../org/apache/sis/metadata/TreeNodeChildren.java  | 10 ++---
 .../apache/sis/metadata/ValueExistencePolicy.java  | 22 +++++-----
 .../main/java/org/apache/sis/xml/Transformer.java  |  5 +--
 .../src/main/java/org/apache/sis/xml/XLink.java    |  4 +-
 .../apache/sis/metadata/AbstractMetadataTest.java  |  5 +--
 .../apache/sis/metadata/PropertyAccessorTest.java  | 40 ++++++++----------
 .../apache/sis/metadata/TreeNodeChildrenTest.java  | 25 +++++------
 .../java/org/apache/sis/metadata/TreeNodeTest.java |  5 +--
 .../java/org/apache/sis/metadata/ValueMapTest.java | 30 +++++++-------
 .../metadata/iso/citation/HardCodedCitations.java  |  7 ++--
 .../iso/quality/DefaultQuantitativeResultTest.java |  5 +--
 .../sis/metadata/sql/MetadataWriterTest.java       | 12 +++---
 .../java/org/apache/sis/test/MetadataAssert.java   |  4 +-
 .../java/org/apache/sis/test/sql/TestDatabase.java | 10 ++---
 .../apache/sis/test/xml/DocumentComparator.java    |  5 +--
 .../org/apache/sis/xml/RenameListGenerator.java    |  5 +--
 .../gazetteer/AbstractLocationType.java            |  5 +--
 .../sis/referencing/gazetteer/LocationFormat.java  | 10 ++---
 .../gazetteer/MilitaryGridReferenceSystem.java     | 10 ++---
 .../gazetteer/ModifiableLocationType.java          |  7 ++--
 .../org/apache/sis/geometry/GeneralEnvelope.java   | 10 ++---
 .../apache/sis/geometry/WraparoundInEnvelope.java  |  5 +--
 .../internal/referencing/CoordinateOperations.java |  5 +--
 .../sis/internal/referencing/DatabaseListener.java |  4 +-
 .../main/java/org/apache/sis/io/wkt/Element.java   |  4 +-
 .../org/apache/sis/io/wkt/FormattableObject.java   |  5 +--
 .../main/java/org/apache/sis/io/wkt/Formatter.java |  4 +-
 .../org/apache/sis/io/wkt/MathTransformParser.java | 16 ++++----
 .../org/apache/sis/parameter/ParameterFormat.java  | 40 ++++++++----------
 .../org/apache/sis/parameter/TensorParameters.java | 12 +++---
 .../sis/referencing/AbstractIdentifiedObject.java  |  5 +--
 .../main/java/org/apache/sis/referencing/CRS.java  |  4 +-
 .../sis/referencing/GeodesicsOnEllipsoid.java      |  6 +--
 .../apache/sis/referencing/GeodeticCalculator.java |  5 +--
 .../sis/referencing/cs/CoordinateSystems.java      |  8 ++--
 .../sis/referencing/datum/DatumShiftGrid.java      | 15 +++----
 .../factory/GeodeticAuthorityFactory.java          | 12 +++---
 .../referencing/factory/sql/EPSGDataAccess.java    |  5 +--
 .../factory/sql/InstallationScriptProvider.java    |  4 +-
 .../referencing/operation/SubOperationInfo.java    |  8 ++--
 .../operation/builder/LocalizationGridBuilder.java |  5 +--
 .../sis/referencing/operation/matrix/Matrices.java | 48 +++++++++-------------
 .../referencing/operation/matrix/MatrixSIS.java    |  5 +--
 .../operation/matrix/NonSquareMatrix.java          |  5 +--
 .../projection/LambertConicConformal.java          |  8 ++--
 .../operation/projection/Polyconic.java            | 10 ++---
 .../operation/transform/ConcatenatedTransform.java |  5 +--
 .../transform/DefaultMathTransformFactory.java     |  4 +-
 .../apache/sis/geometry/AbstractEnvelopeTest.java  | 15 +++----
 .../sis/geometry/WraparoundAdjustmentTest.java     |  5 +--
 .../apache/sis/referencing/ClenshawSummation.java  | 40 ++++++++----------
 .../operation/builder/ResidualGridTest.java        |  5 +--
 .../projection/ConformalProjectionTest.java        | 10 ++---
 .../operation/projection/MeridianArcTest.java      |  5 +--
 .../operation/transform/PseudoTransform.java       | 11 +++--
 .../report/CoordinateReferenceSystems.java         |  5 +--
 .../sis/internal/converter/ConverterRegistry.java  |  5 +--
 .../sis/internal/converter/package-info.java       |  4 +-
 .../main/java/org/apache/sis/io/TableAppender.java |  5 +--
 .../java/org/apache/sis/math/MathFunctions.java    |  5 +--
 .../java/org/apache/sis/math/RepeatedVector.java   | 10 ++---
 .../main/java/org/apache/sis/math/Statistics.java  |  5 +--
 .../java/org/apache/sis/math/StatisticsFormat.java |  8 ++--
 .../src/main/java/org/apache/sis/math/Vector.java  | 24 +++++------
 .../org/apache/sis/measure/LinearConverter.java    | 20 ++++-----
 .../apache/sis/setup/InstallationResources.java    |  4 +-
 .../main/java/org/apache/sis/util/Characters.java  | 16 ++++----
 .../org/apache/sis/util/collection/TreeTable.java  |  9 ++--
 .../sis/util/collection/TreeTableFormat.java       | 15 +++----
 .../org/apache/sis/util/collection/TreeTables.java | 15 +++----
 .../apache/sis/util/logging/MonolineFormatter.java | 14 +++----
 .../java/org/apache/sis/test/TestUtilities.java    | 10 ++---
 .../apache/sis/internal/earth/netcdf/GCOM_C.java   | 10 ++---
 .../apache/sis/internal/earth/netcdf/GCOM_W.java   |  5 +--
 .../apache/sis/storage/landsat/LandsatStore.java   |  5 +--
 .../apache/sis/storage/landsat/MetadataReader.java | 10 ++---
 .../org/apache/sis/storage/geotiff/CRSBuilder.java | 10 ++---
 .../apache/sis/storage/geotiff/GeoKeysLoader.java  |  9 ++--
 .../sis/storage/geotiff/GridGeometryBuilder.java   | 10 ++---
 .../apache/sis/storage/geotiff/CRSBuilderTest.java |  5 +--
 .../org/apache/sis/internal/netcdf/Convention.java |  5 +--
 .../org/apache/sis/internal/netcdf/FeatureSet.java |  5 +--
 .../apache/sis/internal/netcdf/GridAdjustment.java | 10 ++---
 .../java/org/apache/sis/internal/netcdf/HYCOM.java |  5 +--
 .../org/apache/sis/internal/netcdf/Variable.java   |  5 +--
 .../sis/internal/storage/MetadataBuilder.java      |  5 +--
 .../sis/internal/storage/csv/FeatureIterator.java  |  9 ++--
 .../storage/csv/MovingFeatureIterator.java         |  4 +-
 .../org/apache/sis/internal/storage/csv/Store.java | 18 ++++----
 .../sis/internal/storage/csv/package-info.java     |  8 ++--
 .../org/apache/sis/storage/DataStoreProvider.java  |  4 +-
 .../sis/storage/aggregate/CoverageAggregator.java  |  5 +--
 .../sis/internal/storage/MetadataBuilderTest.java  |  5 +--
 .../apache/sis/internal/storage/csv/StoreTest.java |  4 +-
 127 files changed, 485 insertions(+), 690 deletions(-)

diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/GUIUtilities.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/GUIUtilities.java
index 4d4ece3e7f..08ff28b4bb 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/GUIUtilities.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/GUIUtilities.java
@@ -298,16 +298,14 @@ walk:   for (final T search : path) {
      * This is known as <cite>longest common subsequence</cite> (LCS) problem.
      * The LCS elements are not required to occupy consecutive positions within the original sequences.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * for the two following lists <var>x</var> and <var>y</var>,
      * the longest common subsequence if given by <var>lcs</var> below:
      *
-     * {@preformat text
+     * <pre class="text">
      *   x   :  1 2   4 6 7   9
      *   y   :  1 2 3     7 8
-     *   lcs :  1 2       7
-     * }
-     * </div>
+     *   lcs :  1 2       7</pre>
      *
      * This algorithm is useful for computing the differences between two sequences.
      *
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java
index 0303ecc755..4dc28c8429 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java
@@ -318,12 +318,11 @@ public final class FXFinder {
      * Returns the destination directory where to decompress ZIP files.
      * This method assumes the following directory structure:
      *
-     * {@preformat text
+     * <pre class="text">
      *     apache-sis       (can be any name)
      *     ├─ conf
      *     │  └─ setenv.sh
-     *     └─ opt
-     * }
+     *     └─ opt</pre>
      */
     final File getDestinationDirectory() throws IOException {
         File basedir = setenv.toAbsolutePath().toFile().getParentFile();
diff --git a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java
index 15cbb192a6..062edbe5a0 100644
--- a/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java
+++ b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java
@@ -173,9 +173,7 @@ public class FileService extends FileSystemProvider {
      * Initializes and returns a new file system identified by a URI.
      * The given URI shall have the following pattern:
      *
-     * {@preformat text
-     *     S3://accessKey@bucket/key
-     * }
+     * <pre class="text">S3://accessKey@bucket/key</pre>
      *
      * In current version all path components after {@code accessKey} are ignored.
      * A future version may allow finer grain control.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
index 2fe2fb2ca9..d60e8dcbb8 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/SampleRangeFormat.java
@@ -188,7 +188,7 @@ final class SampleRangeFormat extends RangeFormat {
      * Formats a string representation of the given list of categories.
      * This method formats a table like below:
      *
-     * {@preformat text
+     * <pre class="text">
      *   ┌────────────┬────────────────┬─────────────┐
      *   │   Values   │    Measures    │    Name     │
      *   ╞════════════╧════════════════╧═════════════╡
@@ -198,8 +198,7 @@ final class SampleRangeFormat extends RangeFormat {
      *   │         1  │ NaN #1         │ Clouds      │
      *   │         5  │ NaN #5         │ Lands       │
      *   │ [10 … 200) │ [6.0 … 25.0)°C │ Temperature │
-     *   └────────────┴────────────────┴─────────────┘
-     * }
+     *   └────────────┴────────────────┴─────────────┘</pre>
      *
      * @param dimensions  the list of sample dimensions to format.
      */
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridOrientation.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridOrientation.java
index 4ac0554189..22d6f8542a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridOrientation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridOrientation.java
@@ -54,14 +54,13 @@ public final class GridOrientation implements Serializable {
      * In matrix terms all non-zero coefficients are on the diagonal or in the translation column.
      * For example, in the three-dimensional case:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌                ┐
      *   │ Sx  0   0   Tx │
      *   │ 0   Sy  0   Ty │
      *   │ 0   0   Sz  Tz │
      *   │ 0   0   0   1  │
-     *   └                ┘
-     * }
+     *   └                ┘</pre>
      *
      * with
      * <var>S<sub>x</sub></var> &gt; 0,
@@ -77,14 +76,13 @@ public final class GridOrientation implements Serializable {
      * the matrix is replaced by −<var>S<sub>y</sub></var> and the <var>T<sub>y</sub></var> term has a different value.
      * For example in the three-dimensional case, the {@code gridToCRS} transform is:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌                 ┐
      *   │ Sx  0   0   Tx  │
      *   │ 0  −Sy  0   Ty′ │
      *   │ 0   0   Sz  Tz  │
      *   │ 0   0   0   1   │
-     *   └                 ┘
-     * }
+     *   └                 ┘</pre>
      *
      * <h4>When to use</h4>
      * {@code REFLECTION_Y} is commonly used when the grid is a {@link java.awt.image.RenderedImage}.
@@ -120,14 +118,13 @@ public final class GridOrientation implements Serializable {
      * is different than the user-specified CRS (if those CRSs are equal, then the transform is rather
      * like the one shown in {@link #REFLECTION_Y}):
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌                  ┐
      *   │  0   Sx  0   Tx  │
      *   │ −Sy  0   0   Ty′ │
      *   │  0   0   Sz  Tz  │
      *   │  0   0   0   1   │
-     *   └                  ┘
-     * }
+     *   └                  ┘</pre>
      *
      * <h4>When to use</h4>
      * This orientation can be used for deriving a coordinate reference system with the
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
index d0c635949b..d21d18d4ed 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
@@ -425,11 +425,12 @@ public abstract class AbstractAttribute<V> extends Field<V> implements Attribute
      * {@linkplain org.apache.sis.metadata.iso.quality.DefaultConformanceResult conformance result} having a
      * {@linkplain org.apache.sis.metadata.iso.quality.DefaultConformanceResult#pass() pass} value of {@code false}.
      *
-     * <div class="note"><b>Example:</b> given an attribute named “population” with [1 … 1] multiplicity,
+     * <h4>Example</h4>
+     * Given an attribute named “population” with [1 … 1] multiplicity,
      * if no value has been assigned to that attribute, then this {@code quality()} method will return
      * the following data quality report:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Data quality
      *     ├─Scope
      *     │   └─Level………………………………………………… Attribute
@@ -439,9 +440,7 @@ public abstract class AbstractAttribute<V> extends Field<V> implements Attribute
      *         ├─Evaluation method type…… Direct internal
      *         └─Result
      *             ├─Explanation……………………… Missing value for “population” property.
-     *             └─Pass………………………………………… false
-     * }
-     * </div>
+     *             └─Pass………………………………………… false</pre>
      *
      * @return reports on all constraint violations found.
      *
@@ -458,10 +457,9 @@ public abstract class AbstractAttribute<V> extends Field<V> implements Attribute
      * The returned string is for debugging purpose and may change in any future SIS version.
      * The current implementation is like below:
      *
-     * {@preformat text
+     * <pre class="text">
      *     Attribute[“temperature” : Float] = {20.3, 17.8, 21.1}
-     *     └─ characteristics: units=°C, accuracy=0.1
-     * }
+     *     └─ characteristics: units=°C, accuracy=0.1</pre>
      *
      * @return a string representation of this attribute for debugging purpose.
      */
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
index d6400cecc2..a6248e4dd6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
@@ -775,11 +775,12 @@ public abstract class AbstractFeature implements Feature, Serializable {
      * {@linkplain org.apache.sis.metadata.iso.quality.DefaultConformanceResult conformance result} having a
      * {@linkplain org.apache.sis.metadata.iso.quality.DefaultConformanceResult#pass() pass} value of {@code false}.
      *
-     * <div class="note"><b>Example:</b> given a feature with an attribute named “population”.
+     * <h4>Example</h4>
+     * Given a feature with an attribute named “population”.
      * If this attribute is mandatory ([1 … 1] multiplicity) but no value has been assigned to it,
      * then this {@code quality()} method will return the following data quality report:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Data quality
      *     ├─Scope
      *     │   └─Level………………………………………………… Feature
@@ -789,9 +790,7 @@ public abstract class AbstractFeature implements Feature, Serializable {
      *         ├─Evaluation method type…… Direct internal
      *         └─Result
      *             ├─Explanation……………………… Missing value for “population” property.
-     *             └─Pass………………………………………… false
-     * }
-     * </div>
+     *             └─Pass………………………………………… false</pre>
      *
      * @return reports on all constraint violations found.
      *
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
index acb97ae2dc..c2d9f8ba90 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
@@ -70,11 +70,12 @@ import org.opengis.feature.Operation;
  * Formats {@linkplain AbstractFeature features} or {@linkplain DefaultFeatureType feature types} in a tabular format.
  * This format assumes a monospaced font and an encoding supporting drawing box characters (e.g. UTF-8).
  *
- * <div class="note"><b>Example:</b> a feature named “City” and containing 3 properties (“name”, “population” and
- * “twin town”) may be formatted like below. The two first properties are {@linkplain AbstractAttribute attributes}
+ * <h2>Example</h2>
+ * A feature named “City” and containing 3 properties (“name”, “population” and “twin town”)
+ * may be formatted like below. The two first properties are {@linkplain AbstractAttribute attributes}
  * while the last property is an {@linkplain AbstractAssociation association} to another feature.
  *
- * {@preformat text
+ * <pre class="text">
  *   City
  *   ┌────────────┬─────────┬──────────────┬───────────┐
  *   │ Name       │ Type    │ Multiplicity │ Value     │
@@ -82,8 +83,7 @@ import org.opengis.feature.Operation;
  *   │ name       │ String  │ [1 … 1]      │ Paderborn │
  *   │ population │ Integer │ [1 … 1]      │ 143,174   │
  *   │ twin town  │ City    │ [0 … ∞]      │ Le Mans   │
- *   └────────────┴─────────┴──────────────┴───────────┘
- * }</div>
+ *   └────────────┴─────────┴──────────────┴───────────┘</pre>
  *
  * <h2>Limitations</h2>
  * <ul>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/FieldType.java b/core/sis-feature/src/main/java/org/apache/sis/feature/FieldType.java
index 34cf052bc0..122a5bc522 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FieldType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FieldType.java
@@ -126,9 +126,7 @@ abstract class FieldType extends AbstractIdentifiedType implements PropertyType
      * Helper method for implementation of {@code PropertyType.toString()} methods.
      * Example:
      *
-     * {@preformat text
-     *     PropertyType[“name” : ValueClass]
-     * }
+     * <pre class="text">PropertyType[“name” : ValueClass]</pre>
      *
      * @param deprecated  whether the type to format is deprecated.
      * @param className   the interface name of the object on which {@code toString()} is invoked.
@@ -155,9 +153,7 @@ abstract class FieldType extends AbstractIdentifiedType implements PropertyType
      * Helper method for implementation of {@code Property.toString()} methods.
      * Example:
      *
-     * {@preformat text
-     *     Property[“name” : ValueClass] = {value1, value2, ...}
-     * }
+     * <pre class="text">Property[“name” : ValueClass] = {value1, value2, ...}</pre>
      *
      * @param deprecated  whether the type to format is deprecated.
      * @param className   the interface name of the object on which {@code toString()} is invoked.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
index c00ff567c9..27e05ec6d1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
@@ -86,18 +86,17 @@ import org.opengis.feature.Operation;
  *
  * A call to {@code System.out.println(city)} prints the following table:
  *
- * {@preformat text
+ * <pre class="text">
  *   City
  *   ┌────────────┬─────────┬──────────────┬───────────────┐
  *   │ Name       │ Type    │ Multiplicity │ Default value │
  *   ├────────────┼─────────┼──────────────┼───────────────┤
  *   │ name       │ String  │   [1 … 1]    │ Utopia        │
  *   │ population │ Integer │   [1 … 1]    │               │
- *   └────────────┴─────────┴──────────────┴───────────────┘
- * }
+ *   └────────────┴─────────┴──────────────┴───────────────┘</pre>
  *
- * <p>{@code FeatureTypeBuilder} instances should be short lived.
- * After the {@code FeatureType} has been created, the builder should be discarded.</p>
+ * {@code FeatureTypeBuilder} instances should be short lived.
+ * After the {@code FeatureType} has been created, the builder should be discarded.
  *
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java
index 4762fc9e49..efb9b14a2e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/package-info.java
@@ -41,7 +41,7 @@
  *
  * A call to {@code System.out.println(capital)} prints the following table:
  *
- * {@preformat text
+ * <pre class="text">
  *   Capital ⇾ City
  *   ┌────────────┬─────────┬──────────────┬───────────────┐
  *   │ Name       │ Type    │ Multiplicity │ Default value │
@@ -49,8 +49,7 @@
  *   │ name       │ String  │   [1 … 1]    │ Utopia        │
  *   │ population │ Integer │   [1 … 1]    │               │
  *   │ parliament │ String  │   [1 … 1]    │               │
- *   └────────────┴─────────┴──────────────┴───────────────┘
- * }
+ *   └────────────┴─────────┴──────────────┴───────────────┘</pre>
  *
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/Interpolation.java b/core/sis-feature/src/main/java/org/apache/sis/image/Interpolation.java
index f7d25c4601..8e13f9276f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/Interpolation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/Interpolation.java
@@ -81,7 +81,7 @@ public abstract class Interpolation {
      * the horizontal and vertical lines drawn below. This figure is for an image with only one band, otherwise all
      * indices between brackets would need to be multiplied by {@code numBands}.</p>
      *
-     * {@preformat text
+     * <pre class="text">
      *   s[0]   s[1]   s[2]   s[3]
      *
      *   s[4]   s[5]───s[6]   s[7]  ← yfrac = 0
@@ -90,8 +90,7 @@ public abstract class Interpolation {
      *
      *   s[12]  s[13]  s[14]  s[15]
      *               ↑
-     *             xfrac
-     * }
+     *             xfrac</pre>
      *
      * On output, this method shall write the interpolation results as {@code numBands} consecutive
      * values in the supplied {@code writeTo} array, starting at {@code writeToOffset} index.
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TilePlaceholder.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TilePlaceholder.java
index b482e84cc1..d9ba96a15f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TilePlaceholder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TilePlaceholder.java
@@ -55,15 +55,13 @@ public class TilePlaceholder {
      * <p><a href="https://bugs.openjdk.java.net/browse/JDK-8275345">JDK-8275345</a>:
      * call to {@code Graphics2D.drawRenderedImage(…)} fails if the image contains more than one tile
      * (or a single tile not located at 0,0) and the tiles are not instances of {@link WritableRaster}
-     * (i.e. are instances of the read-only {@link Raster} parent class). The exception thrown is:
+     * (i.e. are instances of the read-only {@link Raster} parent class). The exception thrown is:</p>
      *
-     * {@preformat text
+     * <pre class="text">
      *   Exception in thread "main" java.awt.image.RasterFormatException: (parentX + width) is outside raster
      *       at java.desktop/java.awt.image.WritableRaster.createWritableChild(WritableRaster.java:228)
      *       at java.desktop/sun.java2d.SunGraphics2D.drawTranslatedRenderedImage(SunGraphics2D.java:2852)
-     *       at java.desktop/sun.java2d.SunGraphics2D.drawRenderedImage(SunGraphics2D.java:2711)
-     * }
-     * </p>
+     *       at java.desktop/sun.java2d.SunGraphics2D.drawRenderedImage(SunGraphics2D.java:2711)</pre>
      */
     @Workaround(library="JDK", version="17")
     public static final boolean PENDING_JDK_FIX = true;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Joiner.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Joiner.java
index 08d897fd6d..24b38d8aaa 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Joiner.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Joiner.java
@@ -31,15 +31,14 @@ import org.opengis.referencing.operation.TransformException;
  * truncates the polylines for removing that spike. This situation happens when some pixel values are exactly
  * equal to isoline value, as in the picture below:
  *
- * {@preformat text
+ * <pre class="text">
  *     ●╌╌╌╲╌╌○╌╌╌╌╌╌○╌╌╌╌╌╌○╌╌╌╌╌╌○
  *     ╎    ╲ ╎      ╎      ╎      ╎
  *     ╎     ╲╎      ╎   →  ╎      ╎
  *     ●╌╌╌╌╌╌●──────●──────●⤸╌╌╌╌╌○
  *     ╎     ╱╎      ╎   ←  ╎      ╎
  *     ╎    ╱ ╎      ╎      ╎      ╎
- *     ●╌╌╌╱╌╌○╌╌╌╌╌╌○╌╌╌╌╌╌○╌╌╌╌╌╌○
- * }
+ *     ●╌╌╌╱╌╌○╌╌╌╌╌╌○╌╌╌╌╌╌○╌╌╌╌╌╌○</pre>
  *
  * The spike may appear or not depending on the convention adopted for strictly equal values.
  * In above picture, the spike appears because the convention used in this implementation is:
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Tracer.java b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Tracer.java
index 1a3c189616..b84025223a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Tracer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Tracer.java
@@ -132,11 +132,10 @@ final class Tracer {
          * Note that this bit order is different than the order used in Wikipedia "Marching squares" article.
          * The order used in this class allows more direct bitwise operations as described in next section.
          *
-         * {@preformat text
+         * <pre class="text">
          *     (0)╌╌╌(1)
          *      ╎     ╎
-         *     (2)╌╌╌(3)
-         * }
+         *     (2)╌╌╌(3)</pre>
          *
          * Bits are set to 1 where the data value is above the isoline {@linkplain #value}, and 0 where the data value
          * is below the isoline value. Data values exactly equal to the isoline value are handled as if they were greater.
@@ -160,22 +159,20 @@ final class Tracer {
          * from left to right before top to bottom. This instance is non-empty if the cell in previous iteration
          * was like below (all those examples have a line crossing the right border):
          *
-         * {@preformat text
+         * <pre class="text">
          *     ●╌╌╌╌╌╌●              ○╌╱╌╌╌╌●╱             ○╌╌╌╌╲╌●
          *     ╎      ╎              ╎╱     ╱              ╎     ╲╎
          *    ─┼──────┼─             ╱     ╱╎              ╎      ╲
-         *     ○╌╌╌╌╌╌○             ╱●╌╌╌╌╱╌○              ○╌╌╌╌╌╌○╲
-         * }
+         *     ○╌╌╌╌╌╌○             ╱●╌╌╌╌╱╌○              ○╌╌╌╌╌╌○╲</pre>
          *
          * This field {@link PolylineBuffer#isEmpty() is empty} if the cell in previous iteration was like below
          * (no line cross the right border):
          *
-         * {@preformat text
+         * <pre class="text">
          *     ○╌╲╌╌╌╌●              ○╌╌╌┼╌╌●
          *     ╎  ╲   ╎              ╎   │  ╎
          *     ╎   ╲  ╎              ╎   │  ╎
-         *     ○╌╌╌╌╲╌●              ○╌╌╌┼╌╌●
-         * }
+         *     ○╌╌╌╌╲╌●              ○╌╌╌┼╌╌●</pre>
          */
         private final PolylineBuffer polylineOnLeft;
 
@@ -185,7 +182,7 @@ final class Tracer {
          * For non-empty element at index <var>x</var>, values on the left border are given by pixels at coordinate
          * {@code x} and values on the right border are given by pixels at coordinate {@code x+1}. Example:
          *
-         * {@preformat text
+         * <pre class="text">
          *            ○╌╌╌╌╌╌●╱
          *            ╎ Top  ╱
          *            ╎ [x] ╱╎
@@ -194,8 +191,7 @@ final class Tracer {
          *    ─┼──────┼██████╎
          *     ○╌╌╌╌╌╌○╌╌╌╌╌╌○
          *            ↑
-         *     x coordinate of first pixel (upper-left corner)
-         * }
+         *     x coordinate of first pixel (upper-left corner)</pre>
          */
         private final PolylineBuffer[] polylinesOnTop;
 
@@ -510,12 +506,11 @@ final class Tracer {
          * or otherwise are saved in {@link #partialPaths} for later processing.
          * This method is invoked for cells like below:
          *
-         * {@preformat text
+         * <pre class="text">
          *     ●╌╱╌╌╌╌○        ○╌╱╌╌╌╌●        ○╌╱╌╌╌╌●╱
          *     ╎╱     ╎        ╎╱     ╎        ╎╱     ╱
          *     ╱      ╎        ╱      ╎        ╱     ╱╎
-         *    ╱○╌╌╌╌╌╌○       ╱●╌╌╌╌╌╌●       ╱●╌╌╌╌╱╌○
-         * }
+         *    ╱○╌╌╌╌╌╌○       ╱●╌╌╌╌╌╌●       ╱●╌╌╌╌╱╌○</pre>
          *
          * This method does itself the interpolations on left side and top side. The two polylines
          * {@link #polylineOnLeft} and {@code polylineOnTop} will become empty after this method call.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
index 3898aedb29..0d19aed0ea 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
@@ -44,7 +44,7 @@ public final strictfp class SampleDimensionTest extends TestCase {
      * Tests a sample dimension having only qualitative categories.
      * Expected value:
      *
-     * {@preformat text
+     * <pre class="text">
      * ┌────────┬─────────┐
      * │ Values │  Name   │
      * ╞════════╧═════════╡
@@ -53,8 +53,7 @@ public final strictfp class SampleDimensionTest extends TestCase {
      * │     1  │ Clouds  │
      * │     2  │ Lands   │
      * │   255  │ Missing │
-     * └────────┴─────────┘
-     * }
+     * └────────┴─────────┘</pre>
      */
     @Test
     public void testQualitative() {
@@ -78,7 +77,7 @@ public final strictfp class SampleDimensionTest extends TestCase {
      * Expected result (note that the "Values" column differs from NaN numbers, which is
      * the purpose of this test).
      *
-     * {@preformat text
+     * <pre class="text">
      * ┌───────────┬───────────────┬─────────────┐
      * │  Values   │   Measures    │    Name     │
      * ╞═══════════╧═══════════════╧═════════════╡
@@ -88,8 +87,7 @@ public final strictfp class SampleDimensionTest extends TestCase {
      * │        3  │ NaN #2        │ No data     │
      * │ [5 … 254] │ [-2.0 … 35.0] │ Temperature │
      * │      255  │ NaN #4        │ Lands       │
-     * └───────────┴───────────────┴─────────────┘
-     * }
+     * └───────────┴───────────────┴─────────────┘</pre>
      */
     @Test
     public void testMapQualitative() {
@@ -113,7 +111,7 @@ public final strictfp class SampleDimensionTest extends TestCase {
      * Tests a sample dimension having one quantitative category and a few "no data" values.
      * Expected value:
      *
-     * {@preformat text
+     * <pre class="text">
      * ┌────────────┬──────────────────┬─────────────┐
      * │   Values   │     Measures     │    Name     │
      * ╞════════════╧══════════════════╧═════════════╡
@@ -123,8 +121,7 @@ public final strictfp class SampleDimensionTest extends TestCase {
      * │         1  │ NaN #1           │ Clouds      │
      * │ [10 … 200) │ [6.00 … 25.00)°C │ Temperature │
      * │       255  │ NaN #255         │ Lands       │
-     * └────────────┴──────────────────┴─────────────┘
-     * }
+     * └────────────┴──────────────────┴─────────────┘</pre>
      */
     @Test
     public void testQuantitativeWithMissingValues() {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
index f9025dd300..391e4a5b52 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
@@ -48,10 +48,9 @@ public final strictfp class BufferedGridCoverageTest extends GridCoverage2DTest
      * Creates a {@link GridCoverage} instance to test with fixed sample values.
      * The coverage returned by this method shall contain the following values:
      *
-     * {@preformat text
+     * <pre class="text">
      *    2    5
-     *   -5  -10
-     * }
+     *   -5  -10</pre>
      *
      * @param  grid  the grid geometry of the coverage to create.
      * @param  sd    the sample dimensions of the coverage to create.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index f766dd9a65..c61ba8efff 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@ -67,10 +67,9 @@ public strictfp class GridCoverage2DTest extends TestCase {
      * The image size is 2×2 pixels, the "grid to CRS" transform is identity,
      * the range of sample values is [-97.5 … 105] metres and the packed values are:
      *
-     * {@preformat text
+     * <pre class="text">
      *    2    5
-     *   -5  -10
-     * }
+     *   -5  -10</pre>
      */
     private GridCoverage createTestCoverage() {
         return createTestCoverage(MathTransforms.identity(2));
@@ -95,10 +94,9 @@ public strictfp class GridCoverage2DTest extends TestCase {
      * Creates a {@link GridCoverage} instance to test with fixed sample values.
      * The coverage returned by this method shall contain the following values:
      *
-     * {@preformat text
+     * <pre class="text">
      *    2    5
-     *   -5  -10
-     * }
+     *   -5  -10</pre>
      *
      * @param  grid  the grid geometry of the coverage to create.
      * @param  sd    the sample dimensions of the coverage to create.
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
index 2444bef57d..4773cc20dd 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
@@ -724,7 +724,7 @@ public final strictfp class GridDerivationTest extends TestCase {
      * Tests deriving a grid geometry when all involved grid geometries cross the anti-meridian.
      * Illustration:
      *
-     * {@preformat text
+     * <pre class="text">
      *   ──────────────┐                    ┌──────────────────
      *        Grid     │                    │       Grid
      *   ──────────────┘                    └──────────────────
@@ -733,8 +733,7 @@ public final strictfp class GridDerivationTest extends TestCase {
      *          AOI       │       │      Area Of Interest
      *   ─────────────────┘       └────────────────────────────
      *                102°W       22°W
-     *   ↖…………………………………………………………………………………………………360° period…………↗︎
-     * }
+     *   ↖…………………………………………………………………………………………………360° period…………↗︎</pre>
      */
     @Test
     public void testAntiMeridianCrossingInBothGrids() {
@@ -814,15 +813,14 @@ public final strictfp class GridDerivationTest extends TestCase {
      * Tests deriving a grid geometry from an area of interest overlapping the grid in such a way
      * that we have to overlap the AOI to the full grid extent. Illustration:
      *
-     * {@preformat text
+     * <pre class="text">
      *                  ┌────────────────────────────────────────────┐
      *                  │             Domain of validity             │
      *                  └────────────────────────────────────────────┘
      *   ┌────────────────────┐                                ┌─────
      *   │  Area of interest  │                                │  AOI
      *   └────────────────────┘                                └─────
-     *    ↖………………………………………………………360° period……………………………………………………↗︎
-     * }
+     *    ↖………………………………………………………360° period……………………………………………………↗︎</pre>
      */
     @Test
     public void testAreaOfInterestExpansion() {
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/InterpolationTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/InterpolationTest.java
index f0e736d984..a129219687 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/InterpolationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/InterpolationTest.java
@@ -68,11 +68,10 @@ public final strictfp class InterpolationTest extends TestCase {
     /**
      * Creates an iterator over a simple 3×3 image. Image values are:
      *
-     * {@preformat text
+     * <pre class="text">
      *   0 1 2
      *   3 4 5
-     *   6 7 8
-     * }
+     *   6 7 8</pre>
      *
      * @param  support  number of pixels needed for interpolations:
      *         1 for nearest, 2 for bilinear, 4 for bicubic.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
index e67e9234c3..4206b65103 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
@@ -42,9 +42,7 @@ import org.apache.sis.internal.system.DelayedRunnable;
  * To allow such automatic configuration, modules must declare instances of this interface in the
  * following file:
  *
- * {@preformat text
- *     META-INF/services/org.org.apache.sis.internal.jaxb.TypeRegistration
- * }
+ * <pre class="text">META-INF/services/org.org.apache.sis.internal.jaxb.TypeRegistration</pre>
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
index eb4abe596f..f826130e54 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
@@ -19,9 +19,9 @@
  * Miscellaneous objects and adapters defined in the {@code "gco"} namespace.
  * For example, a {@link java.lang.String} value has to be marshalled this way:
  *
- * {@preformat text
- *     <gco:CharacterString>my text</gco:CharacterString>
- * }
+ * {@snippet lang="xml" :
+ *   <gco:CharacterString>my text</gco:CharacterString>
+ *   }
  *
  * In the above example, {@code gco} is the prefix for the {@code http://www.isotc211.org/2005/gco}
  * namespace URL.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
index ec1c332203..a9ee46781b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
@@ -126,16 +126,13 @@ public final class Measure {
      * This method is invoked during XML marshalling. For example if the units are "metre",
      * then this method returns one of the following strings, in preference order:
      *
-     * {@preformat text
-     *     urn:ogc:def:uom:EPSG::9001
-     * }
+     * <pre class="text">urn:ogc:def:uom:EPSG::9001</pre>
      *
      * or one of the following:
      *
-     * {@preformat text
-     *     http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])
-     *     http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])
-     * }
+     * <pre class="text">
+     * http://www.isotc211.org/2005/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])
+     * http://schemas.opengis.net/iso/19139/20070417/resources/uom/gmxUom.xml#xpointer(//*[@gml:id='m'])</pre>
      *
      * @return the string representation of the unit of measure.
      *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAndCharset.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAndCharset.java
index b4f409c2ac..0365d5034e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAndCharset.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAndCharset.java
@@ -48,14 +48,13 @@ import org.apache.sis.util.collection.TreeTable.Node;
  *
  * Example:
  *
- * {@preformat text
+ * <pre class="text">
  *     Identification info
  *      ├─Abstract………………………………………………………………………………… Some data.
  *      ├─Locale (1 of 2)……………………………………………………………… en_US
  *      │   └─Character set………………………………………………………… US-ASCII
  *      └─Locale (2 of 2)……………………………………………………………… fr
- *          └─Character set………………………………………………………… ISO-8859-1
- * }
+ *          └─Character set………………………………………………………… ISO-8859-1</pre>
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocalisedCharacterString.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocalisedCharacterString.java
index 92798af828..c7e1be08b9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocalisedCharacterString.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocalisedCharacterString.java
@@ -134,9 +134,7 @@ final class LocalisedCharacterString {
      * Returns a string representation of this object for debugging purpose.
      * Example:
      *
-     * {@preformat text
-     *   LocalisedCharacterString[#locale-fra, “Un texte”]
-     * }
+     * <pre class="text">LocalisedCharacterString[#locale-fra, “Un texte”]</pre>
      *
      * @see TextGroup#toString()
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/TextGroup.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/TextGroup.java
index d1c218f6d9..f5afeaccc5 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/TextGroup.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/TextGroup.java
@@ -113,11 +113,10 @@ final class TextGroup {
      * Returns a string representation of this text group for debugging purpose.
      * Example:
      *
-     * {@preformat text
+     * <pre class="text">
      *   TextGroup
      *   ├─ LocalisedCharacterString[#locale-eng, “A text”]
-     *   └─ LocalisedCharacterString[#locale-fra, “Un texte”]
-     * }
+     *   └─ LocalisedCharacterString[#locale-fra, “Un texte”]</pre>
      *
      * @see LocalisedCharacterString#toString()
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
index 0d1cf89dad..2a5ce34d21 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
@@ -30,11 +30,10 @@ import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata;
  * optionally accompanied by a code telling whether the CRS type is geographic, projected, temporal,
  * a compound of the above, <i>etc.</i> Those two information are combined in a {@code MD_ReferenceSystem} class
  *
- * {@preformat text
+ * <pre class="text">
  *   mrs:MD_ReferenceSystem
  *   ├─mrs:referenceSystemIdentifier  :  mcc:MD_Identifier
- *   └─mrs:referenceSystemType        :  mrs:MD_ReferenceSystemTypeCode
- * }
+ *   └─mrs:referenceSystemType        :  mrs:MD_ReferenceSystemTypeCode</pre>
  *
  * In order to have a more uniform way to handle reference systems, we replace {@code MD_ReferenceSystem} tuples
  * by associations to the actual Reference System objects. GeoAPI does that by using the {@link ReferenceSystem}
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java
index 5e27cb98c0..20b267a723 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java
@@ -35,11 +35,10 @@ import org.apache.sis.xml.Namespaces;
  * referencing module, since the latter marshals the CRS as specified in GML (close
  * to ISO 19111 model). This class contains only CRS identification as below:
  *
- * {@preformat text
+ * <pre class="text">
  *   mrs:MD_ReferenceSystem
  *   ├─mrs:referenceSystemIdentifier  :  mcc:MD_Identifier
- *   └─mrs:referenceSystemType        :  mrs:MD_ReferenceSystemTypeCode
- * }
+ *   └─mrs:referenceSystemType        :  mrs:MD_ReferenceSystemTypeCode</pre>
  *
  * The {@code referenceSystemType} attribute is currently missing.
  * See <a href="https://issues.apache.org/jira/browse/SIS-470">SIS-470</a>.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
index 5d0c300aa2..f31a5ee746 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
@@ -54,9 +54,7 @@ import static org.apache.sis.internal.util.MetadataServices.EMBEDDED;
  * This includes initialization of a new database if none existed. The schemas will be created by subclasses of
  * this {@code Initializer} class, which must be registered in the following file:
  *
- * {@preformat text
- *   META-INF/services/org.apache.sis.internal.metadata.sql.Initializer
- * }
+ * <pre class="text">META-INF/services/org.apache.sis.internal.metadata.sql.Initializer</pre>
  *
  * {@code Initializer} implementations should define the following methods:
  *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java
index 3dd241fe85..b5fafafc5f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java
@@ -36,9 +36,9 @@
  *
  *   <li><p>If using Derby, copy {@code derby.war} into the {@code $CATALINA_HOME/webapps} directory
  *     and specify the directory where the Derby databases are located:</p>
- *     {@preformat text
+ *     {@snippet lang="shell" :
  *       export JAVA_OPTS=-Dderby.system.home=$SIS_DATA/Databases
- *     }
+ *       }
  *   </li>
  *
  *   <li><p>Declare the JNDI name in application {@code WEB-INF/web.xml} file:</p>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
index 69e9871bb3..498c3535ba 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
@@ -1300,9 +1300,7 @@ class PropertyAccessor {
      * Returns a string representation of this accessor for debugging purpose.
      * Output example:
      *
-     * {@preformat text
-     *     PropertyAccessor[13 getters & 13 setters in DefaultCitation:Citation]
-     * }
+     * <pre class="text">PropertyAccessor[13 getters &amp; 13 setters in DefaultCitation:Citation]</pre>
      */
     @Override
     public String toString() {
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TitleProperty.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TitleProperty.java
index 8a5ceee5d1..04a5d928e3 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TitleProperty.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TitleProperty.java
@@ -31,30 +31,28 @@ import java.lang.annotation.Documented;
  * This annotation is used in {@linkplain MetadataStandard#asTreeTable metadata tree views} for producing briefer trees,
  * especially when there is redundant node names.
  *
- * <div class="note"><b>Example:</b>
+ * <h2>Example</h2>
  * the {@code Citation} type contains a {@linkplain org.apache.sis.metadata.iso.citation.DefaultCitation#getDates() date}
  * property which itself contains another {@linkplain org.apache.sis.metadata.iso.citation.DefaultCitationDate#getDate()
  * date} property. They form a tree like below:
  *
- * {@preformat text
+ * <pre class="text">
  *   Citation
  *    ├─Title……………………… My document
  *    └─Date
  *       ├─Date………………… 2012/01/01
- *       └─Date type…… Creation
- * }
+ *       └─Date type…… Creation</pre>
  *
  * With <code>&#64;TitleProperty(name="title")</code> on {@code DefaultCitation} implementation class and
  * <code>&#64;TitleProperty(name="date")</code> on {@code DefaultCitationDate} class,
  * Apache SIS can produce a more compact tree table view should be as below:
  *
- * {@preformat text
+ * <pre class="text">
  *   Citation……………………… My document
  *    └─Date………………………… 2012/01/01
- *       └─Date type…… Creation
- * }
- * </div>
+ *       └─Date type…… Creation</pre>
  *
+ * <h2>Condition</h2>
  * The property referenced by this annotation should be the main property if possible, but not necessarily
  * since it may be only a label. However, the property shall be a singleton ([0…1] or [1…1] multiplicity)
  * and cannot be another metadata object.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
index cf5b798869..6d086ee31b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
@@ -385,21 +385,19 @@ class TreeNode implements Node {
          * returns the subtype name (<a href="https://issues.apache.org/jira/browse/SIS-298">SIS-298</a>).
          * For example, instead of:</p>
          *
-         * {@preformat text
+         * <pre class="text">
          *   Citation
          *    └─Cited responsible party
          *       └─Party
-         *          └─Name ……………………………… Jon Smith
-         * }
+         *          └─Name ……………………………… Jon Smith</pre>
          *
          * we format:
          *
-         * {@preformat
+         * <pre class="text">
          *   Citation
          *    └─Cited responsible party
          *       └─Individual
-         *          └─Name ……………………………… Jon Smith
-         * }
+         *          └─Name ……………………………… Jon Smith</pre>
          */
         @Override
         CharSequence getName() {
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
index f2d20173c1..2a6b02675f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
@@ -102,20 +102,18 @@ final class TreeNodeChildren extends AbstractCollection<TreeTable.Node> {
      * If a property has the same name than the parent property that contains it,
      * we write its value in that parent property. For example, instead of:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Citation
      *    └─Date
      *       ├─Date………………… 2012/01/01
-     *       └─Date type…… Creation
-     * }
+     *       └─Date type…… Creation</pre>
      *
      * We simplify as:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Citation
      *    └─Date………………………… 2012/01/01
-     *       └─Date type…… Creation
-     * }
+     *       └─Date type…… Creation</pre>
      *
      * @see <a href="https://issues.apache.org/jira/browse/SIS-298">SIS-298</a>
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
index d6ce8f6526..61b40f6cf2 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
@@ -148,19 +148,17 @@ public enum ValueExistencePolicy {
      *     <th>{@code NON_EMPTY}</th>
      *     <th class="sep">{@code COMPACT}</th>
      *   </tr><tr><td>
-     *     {@preformat text
-     *       Citation
-     *        ├─Title……………………… My document
-     *        └─Date
-     *           ├─Date………………… 2012/01/01
-     *           └─Date type…… Creation
-     *     }
+     *     <pre class="text">
+     * Citation
+     *  ├─Title……………………… My document
+     *  └─Date
+     *     ├─Date………………… 2012/01/01
+     *     └─Date type…… Creation</pre>
      *   </td><td class="sep">
-     *     {@preformat text
-     *       Citation……………………… My document
-     *        └─Date………………………… 2012/01/01
-     *           └─Date type…… Creation
-     *     }
+     *     <pre class="text">
+     * Citation……………………… My document
+     *  └─Date………………………… 2012/01/01
+     *     └─Date type…… Creation</pre>
      *   </td></tr>
      * </table>
      *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java
index 84a61c775b..774ca6eff5 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java
@@ -117,12 +117,11 @@ abstract class Transformer {
      * A flag after type name in files loaded by {@link #load(boolean, String, Set, int)}, meaning that the type itself
      * is in a different namespace than the properties listed below the type. For example in the following:
      *
-     * {@preformat text
+     * <pre class="text">
      *  http://standards.iso.org/iso/19115/-3/mri/1.0
      *   SV_ServiceIdentification !other namespace
      *    citation
-     *    abstract
-     * }
+     *    abstract</pre>
      *
      * {@code SV_ServiceIdentification} type is defined in the {@code "http://standards.iso.org/iso/19115/-3/srv/2.0"}
      * namespace, but the {@code citation} and {@code abstract} properties inherited from {@code Identification} are
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/XLink.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/XLink.java
index 4db5273aae..fbfb9f8709 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/XLink.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/XLink.java
@@ -831,9 +831,7 @@ public class XLink implements Serializable {
      * Returns a string representation of this object. The default implementation returns the
      * simple class name followed by non-null attributes, as in the example below:
      *
-     * {@preformat text
-     *     XLink[type="locator", href="urn:ogc:def:method:EPSG::4326"]
-     * }
+     * <pre class="text">XLink[type="locator", href="urn:ogc:def:method:EPSG::4326"]</pre>
      */
     @Override
     public String toString() {
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java
index e6f63c0c0b..65b59ab809 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/AbstractMetadataTest.java
@@ -53,7 +53,7 @@ public final strictfp class AbstractMetadataTest extends TestCase {
      * {@link StackOverflowError} or an {@link OutOfMemoryError} (after quite a long time).
      *
      * <p>The tree formatted by this test is:</p>
-     * {@preformat text
+     * <pre class="text">
      *     Acquisition information
      *       └─Platform
      *           ├─Description………………………………… A platform.
@@ -62,8 +62,7 @@ public final strictfp class AbstractMetadataTest extends TestCase {
      *               └─Mounted on
      *                   ├─Description…………… A platform.
      *                   └─Instrument
-     *                         (omitted cycle)
-     * }
+     *                         (omitted cycle)</pre>
      *
      * Note that the cycle detection apparently happens too late since "A platform" has been repeated.
      * This is because that same Platform instance appears in two different metadata property.  We do
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
index e3b89e5ec8..3169ee4b2e 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
@@ -263,15 +263,14 @@ public final strictfp class PropertyAccessorTest extends TestCase {
      * Tests the {@link PropertyAccessor#get(int, Object)} method on the {@link HardCodedCitations#ISO_19111} constant.
      * The metadata object read by this test is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     ├─Title…………………………………… International Organization for Standardization
      *     ├─Alternate title………… ISO 19111
      *     ├─Identifier
      *     │   ├─Code…………………………… 19111
      *     │   └─Code space…………… ISO
-     *     └─Presentation form…… Document digital
-     * }
+     *     └─Presentation form…… Document digital</pre>
      */
     @Test
     @DependsOnMethod("testConstructor")
@@ -299,15 +298,14 @@ public final strictfp class PropertyAccessorTest extends TestCase {
      * with a value to be stored <cite>as-is</cite> (without conversion).
      * The metadata object created by this test is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     ├─Title………………………… Some title
      *     ├─Identifier
      *     │   ├─Code………………… Some ISBN code
      *     │   └─Authority
      *     │       └─Title…… ISBN
-     *     └─ISBN…………………………… Some ISBN code
-     * }
+     *     └─ISBN…………………………… Some ISBN code</pre>
      */
     @Test
     @DependsOnMethod("testGet")
@@ -335,10 +333,9 @@ public final strictfp class PropertyAccessorTest extends TestCase {
      * Setting a property to {@code null} is equivalent to removing that property value.
      * The metadata object used by this test (before removal) is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
-     *     └─Title………………………… Some title
-     * }
+     *     └─Title………………………… Some title</pre>
      */
     @Test
     @DependsOnMethod("testSet")
@@ -396,10 +393,9 @@ public final strictfp class PropertyAccessorTest extends TestCase {
      * with a value that will need to be converted. The conversion will be from
      * {@link String} to {@link InternationalString}. The created metadata object is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
-     *     └─Title……………… Some title
-     * }
+     *     └─Title……………… Some title</pre>
      */
     @Test
     @DependsOnMethod("testSet")
@@ -422,12 +418,11 @@ public final strictfp class PropertyAccessorTest extends TestCase {
      * is a collection. The new collection shall replace the previous one (no merge expected).
      * The metadata object created by this test after the replacement is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     ├─Title……………………………………………………… Ignored title
      *     ├─Alternate title (1 of 2)…… New title 1
-     *     └─Alternate title (2 of 2)…… New title 2
-     * }
+     *     └─Alternate title (2 of 2)…… New title 2</pre>
      *
      * @see #testSetInAppendMode()
      */
@@ -461,12 +456,11 @@ public final strictfp class PropertyAccessorTest extends TestCase {
      * when adding elements in a collection, without conversion of type.
      * The metadata object created by this test is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     ├─Title……………………………………………………… Ignored title
      *     ├─Alternate title (1 of 2)…… Another title
-     *     └─Alternate title (2 of 2)…… Yet another title
-     * }
+     *     └─Alternate title (2 of 2)…… Yet another title</pre>
      */
     @Test
     @DependsOnMethod("testSet")
@@ -479,12 +473,11 @@ public final strictfp class PropertyAccessorTest extends TestCase {
      * when adding elements in a collection, with conversion of type.
      * The metadata object created by this test is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     ├─Title……………………………………………………… Ignored title
      *     ├─Alternate title (1 of 2)…… Another title
-     *     └─Alternate title (2 of 2)…… Yet another title
-     * }
+     *     └─Alternate title (2 of 2)…… Yet another title</pre>
      */
     @Test
     @DependsOnMethod("testSetIntoCollection")
@@ -531,14 +524,13 @@ public final strictfp class PropertyAccessorTest extends TestCase {
      * are added into existing collections instead of replacing them.
      * The metadata object created by this test after the merge is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     ├─Title……………………………………………………… Added title
      *     ├─Alternate title (1 of 4)…… Old title 1
      *     ├─Alternate title (2 of 4)…… Old title 2
      *     ├─Alternate title (3 of 4)…… New title 1
-     *     └─Alternate title (4 of 4)…… New title 2
-     * }
+     *     └─Alternate title (4 of 4)…… New title 2</pre>
      *
      * @see #testSetCollection()
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
index ea9499f86d..611f7c037a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
@@ -60,12 +60,11 @@ public final strictfp class TreeNodeChildrenTest extends TestCase {
     /**
      * Creates a shallow metadata object without collections.
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     ├─Title………………………………………………… Some title
      *     ├─Edition…………………………………………… Some edition
-     *     └─Other citation details…… Some other details
-     * }
+     *     └─Other citation details…… Some other details</pre>
      */
     static DefaultCitation metadataWithoutCollections() {
         final DefaultCitation citation = new DefaultCitation("Some title");
@@ -78,14 +77,13 @@ public final strictfp class TreeNodeChildrenTest extends TestCase {
      * Creates a shallow metadata object with singleton value in collections.
      * This method creates the following metadata:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     ├─Title………………………………………………… Some title
      *     ├─Alternate title……………………… First alternate title
      *     ├─Edition…………………………………………… Some edition
      *     ├─Presentation form………………… Map digital
-     *     └─Other citation details…… Some other details
-     * }
+     *     └─Other citation details…… Some other details</pre>
      */
     static DefaultCitation metadataWithSingletonInCollections() {
         final DefaultCitation citation = metadataWithoutCollections();
@@ -98,7 +96,7 @@ public final strictfp class TreeNodeChildrenTest extends TestCase {
      * Creates a shallow metadata object with multi-occurrences (i.e. more than one value in collections).
      * This method creates the following metadata:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     ├─Title………………………………………………………… Some title
      *     ├─Alternate title (1 of 2)……… First alternate title
@@ -106,8 +104,7 @@ public final strictfp class TreeNodeChildrenTest extends TestCase {
      *     ├─Edition…………………………………………………… Some edition
      *     ├─Presentation form (1 of 2)… Map digital
      *     ├─Presentation form (2 of 2)… map hardcopy
-     *     └─Other citation details…………… Some other details
-     * }
+     *     └─Other citation details…………… Some other details</pre>
      */
     static DefaultCitation metadataWithMultiOccurrences() {
         final DefaultCitation citation = metadataWithSingletonInCollections();
@@ -120,20 +117,18 @@ public final strictfp class TreeNodeChildrenTest extends TestCase {
      * Creates a metadata object with a property that can be simplified.
      * Strictly speaking, the metadata is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     └─Date
      *        ├─Date………………… 2012-01-01
-     *        └─Date type…… Creation
-     * }
+     *        └─Date type…… Creation</pre>
      *
      * However, the tree view should simplify as:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DefaultCitation
      *     └─Date………………………… 2012-01-01
-     *        └─Date type…… Creation
-     * }
+     *        └─Date type…… Creation</pre>
      *
      * @see <a href="https://issues.apache.org/jira/browse/SIS-298">SIS-298</a>
      */
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
index 5778228bd3..6bb72bf95b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
@@ -59,7 +59,7 @@ public final strictfp class TreeNodeTest extends TestCase {
      * Creates a metadata hierarchy to be used for the tests.
      * This method creates the following metadata:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Citation
      *     ├─Title…………………………………………………………………………………………… Some title
      *     ├─Alternate title (1 of 2)………………………………………… First alternate title
@@ -78,8 +78,7 @@ public final strictfp class TreeNodeTest extends TestCase {
      *     │      └─Role…………………………………………………………………………… Point of contact
      *     ├─Presentation form (1 of 2)…………………………………… Map digital
      *     ├─Presentation form (2 of 2)…………………………………… map hardcopy
-     *     └─Other citation details……………………………………………… Some other details
-     * }
+     *     └─Other citation details……………………………………………… Some other details</pre>
      */
     static DefaultCitation metadataWithHierarchy() {
         final DefaultCitation citation = TreeNodeChildrenTest.metadataWithMultiOccurrences();
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
index 965966d77f..0e2c728b4a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
@@ -73,14 +73,13 @@ public final strictfp class ValueMapTest extends TestCase {
      * This method creates the following metadata
      * (ignoring identifiers, which will be inferred from the ISBN value):
      *
-     * {@preformat text
-     *     Citation
-     *       ├─Title…………………………………………………… Undercurrent
-     *       ├─Edition……………………………………………… <nil:unknown>
-     *       ├─Cited Responsible Parties
-     *       │   └─Individual Name……………… Testsuya Toyoda
-     *       └─ISBN……………………………………………………… 9782505004509
-     * }
+     * <pre class="text">
+     *   Citation
+     *     ├─Title…………………………………………………… Undercurrent
+     *     ├─Edition……………………………………………… &lt;nil:unknown&gt;
+     *     ├─Cited Responsible Parties
+     *     │   └─Individual Name……………… Testsuya Toyoda
+     *     └─ISBN……………………………………………………… 9782505004509</pre>
      *
      * The citation instance is stored in the {@link #citation} field.
      * The title and author instances are stored in the {@link #title} and {@link #author} fields.
@@ -122,14 +121,13 @@ public final strictfp class ValueMapTest extends TestCase {
      * Tests the {@link ValueMap#entrySet()} method.
      * The expected metadata is:
      *
-     * {@preformat text
-     *     Citation
-     *       ├─Title…………………………………………………… Undercurrent
-     *       ├─Identifiers…………………………………… 9782505004509
-     *       ├─Cited Responsible Parties
-     *       │   └─Individual Name……………… Testsuya Toyoda
-     *       └─ISBN……………………………………………………… 9782505004509
-     * }
+     * <pre class="text">
+     *   Citation
+     *     ├─Title…………………………………………………… Undercurrent
+     *     ├─Identifiers…………………………………… 9782505004509
+     *     ├─Cited Responsible Parties
+     *     │   └─Individual Name……………… Testsuya Toyoda
+     *     └─ISBN……………………………………………………… 9782505004509</pre>
      *
      * Note that this test is intentionally sensitive to iteration order.
      * That order shall be fixed by the {@code XmlType} annotation.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
index 07fc075cd6..ff5b42967a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
@@ -71,21 +71,20 @@ public final strictfp class HardCodedCitations extends Static {
      *
      * <p>String representation:</p>
      *
-     * {@preformat text
+     * <pre class="text">
      *   Citation
      *     ├─Title………………………………………………………… EPSG Geodetic Parameter Dataset
      *     ├─Identifier
      *     │   └─Code………………………………………………… EPSG
      *     ├─Cited responsible party
      *     │   ├─Party
-     *     │   │   ├─Name……………………………………… International Association of Oil & Gas Producers
+     *     │   │   ├─Name……………………………………… International Association of Oil &amp; Gas Producers
      *     │   │   └─Contact info
      *     │   │       └─Online resource
      *     │   │           ├─Linkage………… https://epsg.org/
      *     │   │           └─Function……… Information
      *     │   └─Role………………………………………………… Principal investigator
-     *     └─Presentation form………………………… Table digital
-     * }
+     *     └─Presentation form………………………… Table digital</pre>
      */
     public static final DefaultCitation EPSG;
     static {
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java
index dbe19dc7e4..c13b6f5ffa 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResultTest.java
@@ -68,14 +68,13 @@ public final strictfp class DefaultQuantitativeResultTest extends TestCase {
      * Creates a {@code DefaultQuantitativeResult} instance wrapped in an element.
      * The returned element is as below:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Quantitative attribute accuracy
      *     ├─Measure
      *     │   └─Name of measure…………………… Some quality flag
      *     └─Quantitative result
      *         ├─Value……………………………………………… The quality is okay
-     *         └─Value record type……………… CharacterSequence
-     * }
+     *         └─Value record type……………… CharacterSequence</pre>
      */
     @SuppressWarnings("deprecation")
     private static Element createResultInsideElement() {
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
index 69fc072aff..a73919aff7 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@ -130,21 +130,20 @@ public final strictfp class MetadataWriterTest extends TestCase {
      * Reads known entries in the database.
      * Expected entry is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Citation
      *     ├─Title………………………………………………………… EPSG Geodetic Parameter Dataset
      *     ├─Identifier
      *     │   └─Code………………………………………………… EPSG
      *     ├─Cited responsible party
      *     │   ├─Party
-     *     │   │   ├─Name……………………………………… International Association of Oil & Gas Producers
+     *     │   │   ├─Name……………………………………… International Association of Oil &amp; Gas Producers
      *     │   │   └─Contact info
      *     │   │       └─Online resource
      *     │   │           ├─Linkage………… https://epsg.org/
      *     │   │           └─Function……… Information
      *     │   └─Role………………………………………………… Principal investigator
-     *     └─Presentation form………………………… Table digital
-     * }
+     *     └─Presentation form………………………… Table digital</pre>
      *
      * @throws MetadataStoreException if an error occurred while reading the database.
      */
@@ -195,11 +194,10 @@ public final strictfp class MetadataWriterTest extends TestCase {
      * Read and write a metadata object containing deprecated properties.
      * The metadata tested by this method is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Telephone
      *     ├─Number………………… 01.02.03.04
-     *     └─Number type…… Voice
-     * }
+     *     └─Number type…… Voice</pre>
      *
      * The metadata should be stored in columns named {@code "number"} and {@code "numberType"} even if we
      * constructed the metadata using the deprecated {@code "voice"} property. Conversely, at reading time
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java b/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
index 04269a6334..2fcd681024 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
@@ -164,9 +164,9 @@ public strictfp class MetadataAssert extends Assert {
      * <p>For example, in order to ignore the namespace, type and schema location declaration,
      * the following strings can be given to the {@code ignoredAttributes} argument:</p>
      *
-     * {@preformat text
+     * {@snippet :
      *   "xmlns:*", "xsi:schemaLocation", "xsi:type"
-     * }
+     *   }
      *
      * @param  expected           the expected XML document.
      * @param  actual             the XML document to compare.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/sql/TestDatabase.java b/core/sis-metadata/src/test/java/org/apache/sis/test/sql/TestDatabase.java
index fa8d28f7fb..10f5617211 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/sql/TestDatabase.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/sql/TestDatabase.java
@@ -43,16 +43,14 @@ import static org.junit.Assume.assumeTrue;
  * Make sure that the classpath contains the {@code derbynet.jar} file in addition to {@code derby.jar}.
  * Then, specify the following options to the JVM (replace the 1527 port number by something else if needed):
  *
- * {@preformat text
+ * <pre class="text">
  *   -Dderby.drda.startNetworkServer=true
- *   -Dderby.drda.portNumber=1527
- * }
+ *   -Dderby.drda.portNumber=1527</pre>
  *
  * When the application is running, one can verify that the Derby server is listening:
  *
- * {@preformat text
- *   netstat -an | grep "1527"
- * }
+ * <pre class="text">
+ *   netstat -an | grep "1527"</pre>
  *
  * To connect to the in-memory database, use the {@code "jdbc:derby://localhost:1527/dbname"} URL
  * (replace {@code "dbname"} by the actual database name.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java
index 88c8130dfe..d6db6ea8b4 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java
@@ -150,11 +150,10 @@ public strictfp class DocumentComparator {
      * <p>For example, in order to ignore the namespace, type and schema location declaration,
      * the following strings can be added in this set:</p>
      *
-     * {@preformat text
+     * <pre class="text">
      *   "http://www.w3.org/2000/xmlns:*",
      *   "http://www.w3.org/2001/XMLSchema-instance:schemaLocation",
-     *   "http://www.w3.org/2001/XMLSchema-instance:type"
-     * }
+     *   "http://www.w3.org/2001/XMLSchema-instance:type"</pre>
      *
      * Note that for convenience, the {@link org.apache.sis.test.MetadataAssert#assertXmlEquals(Object, Object, String[])}
      * method automatically replaces some widely used prefixes by their full URL.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java
index 468ab17857..c90fb51de6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java
@@ -39,14 +39,13 @@ import org.apache.sis.internal.xml.LegacyNamespaces;
  * The format is described in the {@code readme.html} page in source code directory.
  * Output format contains namespaces first, then classes, then properties. Example:
  *
- * {@preformat text
+ * <pre class="text">
  * http://standards.iso.org/iso/19115/-3/cit/1.0
  *   CI_Address
  *     administrativeArea
  *     city
  *   CI_Citation
- *     citedResponsibleParty
- * }
+ *     citedResponsibleParty</pre>
  *
  * This class can be used as a starting point for generating a new file from scratch.
  * It should not be used for updating the existing file (unless a lot of things have changed)
diff --git a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
index b889c9d637..69f3a03fc9 100644
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
@@ -198,12 +198,11 @@ abstract class AbstractLocationType implements LocationType, LenientComparable {
      * Current implementation formats a tree with the {@linkplain ModifiableLocationType#getName() name}
      * and {@linkplain ModifiableLocationType#getDefinition() definition} of each type, like below:
      *
-     * {@preformat text
+     * <pre class="text">
      *   administrative area………………… area of responsibility of highest level local authority
      *     ├─town……………………………………………… city or town
      *     │   └─street……………………………… thoroughfare providing access to properties
-     *     └─street………………………………………… thoroughfare providing access to properties
-     * }
+     *     └─street………………………………………… thoroughfare providing access to properties</pre>
      *
      * The string representation is mostly for debugging purpose and may change in any future SIS version.
      *
diff --git a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java
index 9ee1e7cbed..ed8d56e8d1 100644
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java
@@ -70,11 +70,11 @@ import org.opengis.referencing.gazetteer.LocationType;
  * Formats {@link Location} instances in a tabular format.
  * This format assumes a monospaced font and an encoding supporting drawing box characters (e.g. UTF-8).
  *
- * <div class="note"><b>Example:</b>
- * the location identified by "32TNL83" in the {@linkplain MilitaryGridReferenceSystem military grid reference system}
+ * <h2>Example</h2>
+ * The location identified by "32TNL83" in the {@linkplain MilitaryGridReferenceSystem military grid reference system}
  * can be represented by the following string formatted using {@link Locale#ENGLISH}:
  *
- * {@preformat text
+ * <pre class="text">
  *   ┌─────────────────────────────────────────────────────────────┐
  *   │ Location type:               Grid zone designator           │
  *   │ Geographic identifier:       32TNL83                        │
@@ -85,9 +85,7 @@ import org.opengis.referencing.gazetteer.LocationType;
  *   │ Representative value:        4,535,000 m    —    40°57′42″N │
  *   │ North bound:                 4,540,000 m    —    41°00′27″N │
  *   │ Coordinate reference system: WGS 84 / UTM zone 32N          │
- *   └─────────────────────────────────────────────────────────────┘
- * }
- * </div>
+ *   └─────────────────────────────────────────────────────────────┘</pre>
  *
  * <h2>Limitations</h2>
  * <ul>
diff --git a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
index a1f4effa7a..01baec4660 100644
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
@@ -110,8 +110,8 @@ import org.opengis.referencing.gazetteer.LocationType;
  * The encoding and decoding processes take in account Norway and Svalbard special cases (they have wider UTM zones for
  * historical reasons).</p>
  *
- * <div class="note"><b>Example:</b>
- * the following code:
+ * <h2>Example</h2>
+ * The following code:
  *
  * {@snippet lang="java" :
  *     MilitaryGridReferenceSystem system = new MilitaryGridReferenceSystem();
@@ -122,7 +122,7 @@ import org.opengis.referencing.gazetteer.LocationType;
  *
  * should display (locale may vary):
  *
- * {@preformat text
+ * <pre class="text">
  *     ┌─────────────────────────────────────────────────────────────────┐
  *     │ Location type:               Grid coordinate                    │
  *     │ Geographic identifier:       32TNL83                            │
@@ -134,9 +134,7 @@ import org.opengis.referencing.gazetteer.LocationType;
  *     │ North bound:                 4,540,000 m    —    41°00′27″N     │
  *     │ Coordinate reference system: WGS 84 / UTM zone 32N              │
  *     │ Administrator:               North Atlantic Treaty Organization │
- *     └─────────────────────────────────────────────────────────────────┘
- * }
- * </div>
+ *     └─────────────────────────────────────────────────────────────────┘</pre>
  *
  * <h2>Immutability and thread safety</h2>
  * This class is immutable and thus thread-safe.
diff --git a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
index 65653a492f..0f3c47f598 100644
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
@@ -45,7 +45,7 @@ import org.opengis.referencing.gazetteer.ReferenceSystemUsingIdentifiers;
  * The same {@code ModifiableLocationType} instance can be used for many snapshots.
  *
  * <h2>Example</h2>
- * the following code creates 3 levels of location types: <var>administrative areas</var>, which contain
+ * The following code creates 3 levels of location types: <var>administrative areas</var>, which contain
  * <var>towns</var>, which themselves contain <var>streets</var>. Note that the {@code street} location
  * type has two parents, {@code town} and {@code area}, because a street can be outside any town and
  * directly under the authority of an administrative area instead.
@@ -70,12 +70,11 @@ import org.opengis.referencing.gazetteer.ReferenceSystemUsingIdentifiers;
  *
  * A string representation of the {@code area} location type is as below:
  *
- * {@preformat text
+ * <pre class="text">
  *   administrative area………………… area of responsibility of highest level local authority
  *     ├─town……………………………………………… city or town
  *     │   └─street……………………………… thoroughfare providing access to properties
- *     └─street………………………………………… thoroughfare providing access to properties
- * }
+ *     └─street………………………………………… thoroughfare providing access to properties</pre>
  *
  * <h2>Inheritance of property values</h2>
  * According ISO 19112:2003, all properties except the collection of
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
index 428399538f..95be199654 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
@@ -560,10 +560,9 @@ public class GeneralEnvelope extends ArrayEnvelope implements Cloneable, Seriali
      * move both envelope borders in order to encompass the given point, as illustrated below (the
      * new point is represented by the {@code +} symbol):
      *
-     * {@preformat text
+     * <pre class="text">
      *    ─────┐   + ┌─────
-     *    ─────┘     └─────
-     * }
+     *    ─────┘     └─────</pre>
      *
      * The default implementation moves only the border which is closest to the given point.
      *
@@ -603,10 +602,9 @@ public class GeneralEnvelope extends ArrayEnvelope implements Cloneable, Seriali
      * In the example below, the new point is represented by the {@code +}
      * symbol. The point is added only on the closest side.
      *
-     * {@preformat text
+     * <pre class="text">
      *    ─────┐   + ┌─────
-     *    ─────┘     └─────
-     * }
+     *    ─────┘     └─────</pre>
      *
      * @param  i      the dimension of the coordinate
      * @param  value  the coordinate value to add to this envelope.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundInEnvelope.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundInEnvelope.java
index 91ec972464..72ac6d795b 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundInEnvelope.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/WraparoundInEnvelope.java
@@ -40,7 +40,7 @@ import org.apache.sis.util.ArraysExt;
  * than envelopes transformed using {@link WraparoundTransform} but should never be smaller.
  * For example, when transforming the following envelope with wraparound on the dashed line:</p>
  *
- * {@preformat text
+ * <pre class="text">
  *     ┌─┆───────────────┆───┐           ┆              Envelope to transform.
  *     │ ┆               ┆   │           ┆
  *     └─┆───────────────┆───┘           ┆
@@ -49,8 +49,7 @@ import org.apache.sis.util.ArraysExt;
  *       ┆               ┆   └─────────┘ ┆
  *       ┆             ┌─┆───┐         ┌─┆───┐          Better result (union to be done by caller).
  *       ┆             │ ┆   │         │ ┆   │
- *       ┆             └─┆───┘         └─┆───┘
- * }
+ *       ┆             └─┆───┘         └─┆───┘</pre>
  *
  * <h2>Mutability</h2>
  * <b>This class is mutable.</b> This class records the translations that {@link #shift(double)} wanted to apply
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/CoordinateOperations.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/CoordinateOperations.java
index dd30f594fc..c6d505c4e2 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/CoordinateOperations.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/CoordinateOperations.java
@@ -94,11 +94,10 @@ public final class CoordinateOperations extends SystemListener {
      * are longitude at dimension 0 or 1, and some measurement of time (in climatology) at dimension 2 or 3,
      * then the most likely values are (binary digits):
      *
-     * {@preformat text
+     * <pre class="text">
      *     0000    0100    1000
      *     0001    0101    1001
-     *     0010    0110    1010
-     * }
+     *     0010    0110    1010</pre>
      *
      * The last decimal value is 10 (binary {@code 1010}); we don't need to cache more.
      */
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DatabaseListener.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DatabaseListener.java
index e4b3ed3b28..402ad0e7dd 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DatabaseListener.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DatabaseListener.java
@@ -32,9 +32,7 @@ import static java.util.logging.Logger.getLogger;
  * Invoked when a new database is created or when the data source changed.
  * This listener is registered in the following file:
  *
- * {@preformat text
- *   META-INF/services/org.apache.sis.internal.metadata.sql.Initializer
- * }
+ * <pre class="text">META-INF/services/org.apache.sis.internal.metadata.sql.Initializer</pre>
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Element.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Element.java
index 83c70e7097..0cc0b8fff6 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Element.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Element.java
@@ -40,9 +40,9 @@ import static org.apache.sis.util.CharSequences.skipLeadingWhitespaces;
  * An element in a <cite>Well Know Text</cite> (WKT). An {@code Element} is made of {@link String},
  * {@link Number} and other {@link Element}. For example:
  *
- * {@preformat text
+ * {@snippet lang="wkt" :
  *     PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]]]
- * }
+ *     }
  *
  * Each {@code Element} object can contain an arbitrary number of other elements.
  * The result is a tree, which can be seen with {@link #toString()} for debugging purpose.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
index cd0984f915..0bfc69a7f3 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
@@ -228,11 +228,10 @@ public abstract class FormattableObject {
      * For example if this formattable element is for a {@code GeodeticCRS[…]} element,
      * then this method shall write the content starting at the insertion point shown below:</p>
      *
-     * {@preformat text
+     * <pre class="text">
      *   GeodeticCRS[ ]
      *               ↑
-     *       (insertion point)
-     * }
+     *       (insertion point)</pre>
      *
      * <h4>Formatting non-standard WKT</h4>
      * If the implementation cannot represent this object without violating some WKT constraints,
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
index e28df8c1b7..a2ae69a191 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
@@ -778,12 +778,12 @@ public class Formatter implements Localized {
      * If formatted, the {@code ID} element will be by default on the same line than the enclosing
      * element (e.g. {@code SPHEROID["Clarke 1866", …, ID["EPSG", 7008]]}). Other example:</p>
      *
-     * {@preformat text
+     * {@snippet lang="wkt" :
      *   PROJCS["NAD27 / Idaho Central",
      *     GEOGCS[...etc...],
      *     ...etc...
      *     ID["EPSG", 26769]]
-     * }
+     *   }
      *
      * For non-internal conventions, all elements other than {@code ID[…]} are formatted
      * only for {@link CoordinateOperation} and root {@link ReferenceSystem} instances,
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java
index be1eed1c03..8ad0080e57 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java
@@ -404,9 +404,9 @@ class MathTransformParser extends AbstractParser {
     /**
      * Parses a {@code "PARAM_MT"} element. This element has the following pattern:
      *
-     * {@preformat text
+     * {@snippet lang="wkt" :
      *     PARAM_MT["<classification-name>" {,<parameter>}* ]
-     * }
+     *     }
      *
      * @param  parent  the parent element.
      * @return the {@code "PARAM_MT"} element as an {@link MathTransform} object.
@@ -447,9 +447,9 @@ class MathTransformParser extends AbstractParser {
     /**
      * Parses an {@code "INVERSE_MT"} element. This element has the following pattern:
      *
-     * {@preformat text
+     * {@snippet lang="wkt" :
      *     INVERSE_MT[<math transform>]
-     * }
+     *     }
      *
      * @param  parent  the parent element.
      * @return the {@code "INVERSE_MT"} element as an {@link MathTransform} object.
@@ -473,9 +473,9 @@ class MathTransformParser extends AbstractParser {
     /**
      * Parses a {@code "PASSTHROUGH_MT"} element. This element has the following pattern:
      *
-     * {@preformat text
+     * {@snippet lang="wkt" :
      *     PASSTHROUGH_MT[<integer>, <math transform>]
-     * }
+     *     }
      *
      * @param  parent  the parent element.
      * @return the {@code "PASSTHROUGH_MT"} element as an {@link MathTransform} object.
@@ -500,9 +500,9 @@ class MathTransformParser extends AbstractParser {
     /**
      * Parses a {@code "CONCAT_MT"} element. This element has the following pattern:
      *
-     * {@preformat text
+     * {@snippet lang="wkt" :
      *     CONCAT_MT[<math transform> {,<math transform>}*]
-     * }
+     *     }
      *
      * @param  parent  the parent element.
      * @return the {@code "CONCAT_MT"} element as an {@link MathTransform} object.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
index deb1eef873..3543c67158 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
@@ -73,11 +73,11 @@ import static org.apache.sis.util.collection.Containers.hashMapCapacity;
  * multi-line rows), or to pickup one name per parameter for a more compact table. See {@link ContentLevel}
  * javadoc for output examples.</p>
  *
- * <div class="note"><b>Example:</b>
+ * <h2>Example</h2>
  * The <cite>Mercator (variant A)</cite> example given in {@link DefaultParameterDescriptorGroup} javadoc
  * will be formatted by default as below:
  *
- * {@preformat text
+ * <pre class="text">
  *   EPSG: Mercator (variant A)
  *   ┌────────────────────────────────┬────────┬────────────┬───────────────┬───────────────┐
  *   │ Name (EPSG)                    │ Type   │ Obligation │ Value domain  │ Default value │
@@ -87,10 +87,9 @@ import static org.apache.sis.util.collection.Containers.hashMapCapacity;
  *   │ Scale factor at natural origin │ Double │ Mandatory  │    (0 … ∞)    │         1.0   │
  *   │ False easting                  │ Double │ Mandatory  │   (−∞ … ∞) m  │         0.0 m │
  *   │ False northing                 │ Double │ Mandatory  │   (−∞ … ∞) m  │         0.0 m │
- *   └────────────────────────────────┴────────┴────────────┴───────────────┴───────────────┘
- * }
- * </div>
+ *   └────────────────────────────────┴────────┴────────────┴───────────────┴───────────────┘</pre>
  *
+ * <h2>Input types</h2>
  * The kinds of objects accepted by this formatter are:
  * <table class="sis">
  *   <caption>Formattable object types</caption>
@@ -147,11 +146,11 @@ public class ParameterFormat extends TabularFormat<Object> {
          * {@linkplain org.apache.sis.referencing.AbstractIdentifiedObject#getAlias() aliases}.
          * Each parameter may be formatted on many lines if they have aliases.
          *
-         * <div class="note"><b>Example:</b>
+         * <h4>Example</h4>
          * The <cite>Mercator (variant A)</cite> example given in {@link DefaultParameterDescriptorGroup} javadoc,
          * (augmented with parameter aliases) formatted at this level produces a text like below:
          *
-         * {@preformat text
+         * <pre class="text">
          *   EPSG: Mercator (variant A) (9804)
          *   EPSG: Mercator (1SP)
          *   OGC:  Mercator_1SP
@@ -172,9 +171,7 @@ public class ParameterFormat extends TabularFormat<Object> {
          *   ╟──────────────────────────────────────┼────────┼────────────┼───────────────┼───────────────╢
          *   ║ EPSG: False northing                 │ Double │ Mandatory  │   (−∞ … ∞) m  │         0.0 m ║
          *   ║ OGC:  false_northing                 │        │            │               │               ║
-         *   ╚══════════════════════════════════════╧════════╧════════════╧═══════════════╧═══════════════╝
-         * }
-         * </div>
+         *   ╚══════════════════════════════════════╧════════╧════════════╧═══════════════╧═══════════════╝</pre>
          */
         DETAILED,
 
@@ -184,11 +181,11 @@ public class ParameterFormat extends TabularFormat<Object> {
          * {@linkplain org.apache.sis.referencing.AbstractIdentifiedObject#getAlias() aliases} and
          * {@linkplain org.apache.sis.referencing.AbstractIdentifiedObject#getIdentifiers() identifiers} are omitted.
          *
-         * <div class="note"><b>Example:</b>
+         * <h4>Example</h4>
          * The <cite>Mercator (variant A)</cite> example given in {@link DefaultParameterDescriptorGroup} javadoc
          * formatted at this level produces a text like below:
          *
-         * {@preformat text
+         * <pre class="text">
          *   EPSG: Mercator (variant A)
          *   ┌────────────────────────────────┬────────┬────────────┬───────────────┬───────────────┐
          *   │ Name (EPSG)                    │ Type   │ Obligation │ Value domain  │ Default value │
@@ -198,9 +195,7 @@ public class ParameterFormat extends TabularFormat<Object> {
          *   │ Scale factor at natural origin │ Double │ Mandatory  │    (0 … ∞)    │         1.0   │
          *   │ False easting                  │ Double │ Mandatory  │   (−∞ … ∞) m  │         0.0 m │
          *   │ False northing                 │ Double │ Mandatory  │   (−∞ … ∞) m  │         0.0 m │
-         *   └────────────────────────────────┴────────┴────────────┴───────────────┴───────────────┘
-         * }
-         * </div>
+         *   └────────────────────────────────┴────────┴────────────┴───────────────┴───────────────┘</pre>
          */
         BRIEF,
 
@@ -209,11 +204,11 @@ public class ParameterFormat extends TabularFormat<Object> {
          * this level can also format array of operation method, coordinate reference system, <i>etc.</i>
          * The summary contains the identifier names and aliases aligned in a table.
          *
-         * <div class="note"><b>Example:</b>
+         * <h4>Example</h4>
          * The <cite>Mercator (variant A)</cite> example given in {@link ParameterBuilder} javadoc
          * formatted at this level produces a text like below:
          *
-         * {@preformat text
+         * <pre class="text">
          *   EPSG: Mercator (variant A)
          *   ┌────────────────────────────────┬────────────────────┐
          *   │ EPSG                           │ OGC                │
@@ -223,13 +218,12 @@ public class ParameterFormat extends TabularFormat<Object> {
          *   │ Scale factor at natural origin │ scale_factor       │
          *   │ False easting                  │ false_easting      │
          *   │ False northing                 │ false_northing     │
-         *   └────────────────────────────────┴────────────────────┘
-         * }
-         * </div>
+         *   └────────────────────────────────┴────────────────────┘</pre>
          *
-         * <p><b>Tip:</b> the table formatted by default may be quite large. It is recommended to invoke
-         * {@link ParameterFormat#setPreferredCodespaces(String[])} before to format in order to reduce the
-         * amount of columns to display.</p>
+         * <h4>Tip</h4>
+         * The table formatted by default may be quite large.
+         * It is recommended to invoke {@link ParameterFormat#setPreferredCodespaces(String[])}
+         * before to format in order to reduce the amount of columns to display.
          */
         NAME_SUMMARY
     }
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
index 3ddc175ba9..472a3e0648 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
@@ -166,20 +166,20 @@ public class TensorParameters<E> implements Serializable {
      *     <th class="sep">Alias</th>
      *   </tr>
      * <tr><td>
-     * {@preformat text
+     * <pre class="text">
      *   ┌            ┐
      *   │ A0  A1  A2 │
      *   │ B0  B1  B2 │
      *   │ C0  C1  C2 │
-     *   └            ┘
-     * }</td><td class="sep">
-     * {@preformat text
+     *   └            ┘</pre>
+     * </td><td class="sep">
+     * <pre class="text">
      *   ┌                             ┐
      *   │ elt_0_0   elt_0_1   elt_0_2 │
      *   │ elt_1_0   elt_1_1   elt_1_2 │
      *   │ elt_2_0   elt_2_1   elt_2_2 │
-     *   └                             ┘
-     * }</td></tr>
+     *   └                             ┘</pre>
+     * </td></tr>
      * </table>
      *
      * <h4>Relationship with EPSG</h4>
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
index f445e7f302..0df4d42b7c 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@ -848,11 +848,10 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident
      *
      * <div class="horizontal-flow">
      * <div><p><b>WKT example</b></p>
-     * {@preformat text
+     * <pre class="text">
      *   GeodeticCRS["WGS 84", ID["EPSG", 4326]]
      *                       ↑
-     *               (insertion point)
-     * }
+     *               (insertion point)</pre>
      * </div><div>
      * <p><b>Java code example</b></p>
      * {@snippet lang="java" :
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
index 18fd2a110b..7dd59f0d2f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
@@ -1431,9 +1431,7 @@ check:  while (lower != 0 || upper != dimension) {
      * implementation with a public no-argument constructor, and declaring the fully-qualified name of that class
      * in a file at the following location:</p>
      *
-     * {@preformat text
-     *     META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory
-     * }
+     * <pre class="text">META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory</pre>
      *
      * @param  authority  the authority of the desired factory (typically {@code "EPSG"} or {@code "OGC"}),
      *         or {@code null} for the {@link org.apache.sis.referencing.factory.MultiAuthoritiesFactory}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodesicsOnEllipsoid.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodesicsOnEllipsoid.java
index 3c3d799e58..6bdbec2d70 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodesicsOnEllipsoid.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodesicsOnEllipsoid.java
@@ -857,9 +857,9 @@ class GeodesicsOnEllipsoid extends GeodeticCalculator {
      * Formula is given in appendix B of <a href="https://arxiv.org/pdf/1102.1215.pdf">C.F.F Karney (2011)</a>
      * given <var>x</var> and <var>y</var> the coordinates on a plane coordinate system centered on the antipodal point:
      *
-     * {@preformat math
-     *     μ⁴ + 2μ³ + (1−x²-y²)μ² − 2y²μ - y² = 0
-     * }
+     * <blockquote>
+     * μ⁴ + 2μ³ + (1−x²-y²)μ² − 2y²μ - y² = 0
+     * </blockquote>
      *
      * The results should have only one positive root {@literal (μ > 0)}.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticCalculator.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticCalculator.java
index 063dbd1cff..658eab5e7c 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticCalculator.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/GeodeticCalculator.java
@@ -1215,15 +1215,14 @@ public class GeodeticCalculator {
      * The text representation is implementation-specific and may change in any future version.
      * Current implementation is like below:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Coordinate reference system: Unspecified datum based upon the GRS 1980 Authalic Sphere
      *   ┌─────────────┬─────────────────┬──────────────────┬─────────────┐
      *   │             │    Latitude     │    Longitude     │   Azimuth   │
      *   │ Start point │  9°39′06.1120″N │ 132°37′37.1248″W │  -17°10′37″ │
      *   │ End point   │ 70°32′45.0206″N │ 109°50′05.0533″E │ -119°03′12″ │
      *   └─────────────┴─────────────────┴──────────────────┴─────────────┘
-     *   Geodesic distance: 9,967,530.74 m
-     * }
+     *   Geodesic distance: 9,967,530.74 m</pre>
      *
      * @return a string representation of this calculator state.
      */
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
index 857dadb5e4..e9128049e9 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
@@ -341,19 +341,17 @@ next:   for (final CoordinateSystem cs : targets) {
      * For example if {@code sourceCS} is a {@link org.opengis.referencing.cs.CartesianCS},
      * then {@code targetCS} must be a {@code CartesianCS} too.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * If coordinates in {@code sourceCS} are (<var>x</var>,<var>y</var>) tuples in metres
      * and coordinates in {@code targetCS} are (<var>-y</var>,<var>x</var>) tuples in centimetres,
      * then the transformation can be performed as below:
      *
-     * {@preformat math
+     * <pre class="math">
      *     ┌      ┐   ┌                ┐ ┌     ┐
      *     │-y(cm)│   │   0  -100    0 │ │ x(m)│
      *     │ x(cm)│ = │ 100     0    0 │ │ y(m)│
      *     │ 1    │   │   0     0    1 │ │ 1   │
-     *     └      ┘   └                ┘ └     ┘
-     * }
-     * </div>
+     *     └      ┘   └                ┘ └     ┘</pre>
      *
      * @param  sourceCS  the source coordinate system.
      * @param  targetCS  the target coordinate system.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
index 09529a759f..13599ca825 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
@@ -394,13 +394,12 @@ public abstract class DatumShiftGrid<C extends Quantity<C>, T extends Quantity<T
      *
      * The {@code coordinateToGrid} transform for the above formulas can be represented by the following matrix:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌                      ┐
      *   │ 1/Δx      0   -x₀/Δx │
      *   │    0   1/Δy   -y₀/Δy │
      *   │    0      0        1 │
-     *   └                      ┘
-     * }
+     *   └                      ┘</pre>
      *
      * @return conversion from the "real world" coordinates to grid indices including fractional parts.
      */
@@ -494,12 +493,11 @@ public abstract class DatumShiftGrid<C extends Quantity<C>, T extends Quantity<T
      * one computed by {@link #derivativeInCell(double, double)}, opportunistically computed here for performance reasons.
      * The matrix layout is as below, where <var>t₀</var> and <var>t₁</var> are the coordinates after translation.
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌                   ┐         ┌                             ┐
      *   │  ∂t₀/∂x   ∂t₀/∂y  │    =    │  vector[n+0]   vector[n+1]  │
      *   │  ∂t₁/∂x   ∂t₁/∂y  │         │  vector[n+2]   vector[n+3]  │
-     *   └                   ┘         └                             ┘
-     * }
+     *   └                   ┘         └                             ┘</pre>
      *
      * <h4>Default implementation</h4>
      * The default implementation performs the following steps for each dimension <var>dim</var>,
@@ -592,12 +590,11 @@ public abstract class DatumShiftGrid<C extends Quantity<C>, T extends Quantity<T
      * {@code tₐ(x,y)} an abbreviation for {@code interpolateInCell(gridX, gridY, …)[a]} and for <var>x</var>
      * and <var>y</var> integers, the derivative is:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌                   ┐         ┌                                                        ┐
      *   │  ∂t₀/∂x   ∂t₀/∂y  │    =    │  t₀(x+1,y) - t₀(x,y) + 1      t₀(x,y+1) - t₀(x,y)      │
      *   │  ∂t₁/∂x   ∂t₁/∂y  │         │  t₁(x+1,y) - t₁(x,y)          t₁(x,y+1) - t₁(x,y) + 1  │
-     *   └                   ┘         └                                                        ┘
-     * }
+     *   └                   ┘         └                                                        ┘</pre>
      *
      * <h4>Extrapolations</h4>
      * Derivatives must be consistent with {@link #interpolateInCell(double, double, double[])} even when the
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
index 4707dff821..a27b15a0b0 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
@@ -78,11 +78,10 @@ public abstract class GeodeticAuthorityFactory extends AbstractFactory implement
      * This method may return {@code null} if it cannot obtain this information, for example because
      * the connection to a database is not available.
      *
-     * <div class="note"><b>Example:</b>
-     * a factory that create coordinate reference system objects from EPSG codes could return
-     * a citation like below:
+     * <h4>Example</h4>
+     * A factory that create coordinate reference system objects from EPSG codes could return a citation like below:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Citation
      *   ├─ Title ……………………………………………………… EPSG Geodetic Parameter Dataset
      *   ├─ Identifier ………………………………………… EPSG
@@ -92,10 +91,9 @@ public abstract class GeodeticAuthorityFactory extends AbstractFactory implement
      *   └─ Online resource (2 of 2)
      *      ├─ Linkage ………………………………………… jdbc:derby:/my/path/to/SIS_DATA/Databases/SpatialMetadata
      *      ├─ Description ……………………………… EPSG dataset version 9.1 on “Apache Derby Embedded JDBC Driver” version 10.14.
-     *      └─ Function ……………………………………… Connection
-     * }
+     *      └─ Function ……………………………………… Connection</pre>
      *
-     * The online resource description with a “Connection” function is a SIS extension.</div>
+     * The online resource description with a “Connection” function is a SIS extension.
      *
      * @return the organization responsible for definition of the database, or {@code null} if unknown.
      *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index 29de4e764f..c78dd8adc7 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@ -416,7 +416,7 @@ public class EPSGDataAccess extends GeodeticAuthorityFactory implements CRSAutho
      * the {@linkplain Citation#getEditionDate() edition date}.
      * Example (the exact content will vary with Apache SIS versions, JDBC driver and EPSG dataset versions):
      *
-     * {@preformat text
+     * <pre class="text">
      *   Citation
      *   ├─ Title ……………………………………………………… EPSG Geodetic Parameter Dataset
      *   ├─ Identifier ………………………………………… EPSG
@@ -426,8 +426,7 @@ public class EPSGDataAccess extends GeodeticAuthorityFactory implements CRSAutho
      *   └─ Online resource (2 of 2)
      *      ├─ Linkage ………………………………………… jdbc:derby:/my/path/to/SIS_DATA/Databases/SpatialMetadata
      *      ├─ Description ……………………………… EPSG dataset version 9.1 on “Apache Derby Embedded JDBC Driver” version 10.14.
-     *      └─ Function ……………………………………… Connection
-     * }
+     *      └─ Function ……………………………………… Connection</pre>
      */
     @Override
     public synchronized Citation getAuthority() {
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
index ba2c16efc6..3fec08a384 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
@@ -48,9 +48,7 @@ import org.apache.sis.internal.util.Constants;
  * to bundle the EPSG or other datasets in their own product for automatic installation when first needed.
  * Implementations of this class can be declared in the following file for automatic discovery by {@link EPSGFactory}:
  *
- * {@preformat text
- *     META-INF/services/org.apache.sis.setup.InstallationResources
- * }
+ * <pre class="text">META-INF/services/org.apache.sis.setup.InstallationResources</pre>
  *
  * <h2>How this class is used</h2>
  * The first time that an {@link EPSGDataAccess} needs to be instantiated,
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubOperationInfo.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubOperationInfo.java
index 93cc65273e..fcae1d4a37 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubOperationInfo.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubOperationInfo.java
@@ -299,7 +299,7 @@ next:   for (int targetComponentIndex = 0; targetComponentIndex < infos.length;
      * select any source CRS in the list of {@link SingleCRS} given to the {@link #createSteps createSteps(…)} method;
      * the source CRS are not necessarily picked in the same order as they appear in the list.
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * if the source CRS has (<var>x</var>, <var>y</var>, <var>t</var>) coordinates and the target CRS has
      * (<var>t</var>, <var>x</var>, <var>y</var>) coordinates with some operation applied on <var>x</var>
      * and <var>y</var>, then the operations will be applied in that order:
@@ -313,15 +313,13 @@ next:   for (int targetComponentIndex = 0; targetComponentIndex < infos.length;
      * dimension and move them into the "trailing coordinates" dimension, we have to reorder coordinates before
      * to create the pass-through operations. This is done by the following matrix:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌   ┐   ┌         ┐┌   ┐
      *   │ t │   │ 0 0 1 0 ││ x │
      *   │ x │ = │ 1 0 0 0 ││ y │
      *   │ y │   │ 0 1 0 0 ││ t │
      *   │ 1 │   │ 0 0 0 1 ││ 1 │
-     *   └   ┘   └         ┘└   ┘
-     * }
-     * </div>
+     *   └   ┘   └         ┘└   ┘</pre>
      *
      * Furthermore, some dimensions may be dropped,
      * e.g. from (<var>x</var>, <var>y</var>, <var>t</var>) to (<var>x</var>, <var>y</var>).
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
index c063d92abc..9c4231d10b 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
@@ -353,13 +353,12 @@ public class LocalizationGridBuilder extends TransformBuilder {
      *
      * The {@code coordinateToGrid} transform for the above formulas can be represented by the following matrix:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌                      ┐
      *   │ 1/Δx      0   -x₀/Δx │
      *   │    0   1/Δy   -y₀/Δy │
      *   │    0      0        1 │
-     *   └                      ┘
-     * }
+     *   └                      ┘</pre>
      *
      * If this method is never invoked, then the default conversion is identity.
      * If a {@linkplain #setDesiredPrecision(double) desired precision} has been specified before this method call,
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
index 5f0a039c0a..c936c7a788 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
@@ -344,13 +344,12 @@ public final class Matrices extends Static {
      *
      * will return the following square matrix. The transform of the lower corner is given as an example:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌     ┐   ┌              ┐   ┌     ┐
      *   │ -10 │   │ 3.0  0    50 │   │ -20 │       // 3.0 is the scale factor from width of 100 to 300
      *   │ -25 │ = │ 0    2.5  75 │ × │ -40 │       // 2.5 is the scale factor from height of 200 to 500
      *   │   1 │   │ 0    0     1 │   │   1 │
-     *   └     ┘   └              ┘   └     ┘
-     * }
+     *   └     ┘   └              ┘   └     ┘</pre>
      *
      * @param  srcEnvelope  the source envelope.
      * @param  dstEnvelope  the destination envelope.
@@ -421,13 +420,12 @@ public final class Matrices extends Static {
      *
      * will return the following square matrix, which can be used in coordinate conversions as below:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌    ┐   ┌         ┐   ┌    ┐
      *   │ +x │   │ 0 -1  0 │   │  y │
      *   │  y │ = │ 1  0  0 │ × │ -x │
      *   │  1 │   │ 0  0  1 │   │  1 │
-     *   └    ┘   └         ┘   └    ┘
-     * }
+     *   └    ┘   └         ┘   └    ┘</pre>
      *
      * @param  srcAxes  the ordered sequence of axis directions for source coordinate system.
      * @param  dstAxes  the ordered sequence of axis directions for destination coordinate system.
@@ -473,8 +471,8 @@ public final class Matrices extends Static {
      * points on one side of the date line (depending on whether axis direction is reversed), since the wrap around
      * operation cannot be represented by an affine transform.
      *
-     * <div class="note"><b>Example:</b>
-     * combining the examples documented in the above {@code createTransform(…)} methods, the following method call:
+     * <h4>Example</h4>
+     * Combining the examples documented in the above {@code createTransform(…)} methods, the following method call:
      *
      * {@snippet lang="java" :
      *     matrix = Matrices.createTransform(
@@ -487,14 +485,12 @@ public final class Matrices extends Static {
      * and the lower-left corner of the destination envelope is the lower-<em>right</em> corner of the source envelope
      * because of the opposite axis direction.
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌     ┐   ┌               ┐   ┌     ┐
      *   │ -10 │   │ 0   -3.0  350 │   │ -40 │
      *   │ -25 │ = │ 2.5  0     75 │ × │ 120 │       // 120 is the westernmost source coordinate: (x=20) + (width=100)
      *   │   1 │   │ 0    0      1 │   │   1 │
-     *   └     ┘   └               ┘   └     ┘
-     * }
-     * </div>
+     *   └     ┘   └               ┘   └     ┘</pre>
      *
      * @param  srcEnvelope  the source envelope.
      * @param  srcAxes      the ordered sequence of axis directions for source coordinate system.
@@ -531,8 +527,8 @@ public final class Matrices extends Static {
      *   <li>For any row <var>j</var> other than the last row, the column {@code selectedDimensions[j]}.</li>
      * </ul>
      *
-     * <div class="note"><b>Example:</b>
-     * given (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>) coordinate values, if one wants to keep
+     * <h4>Example</h4>
+     * Given (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>) coordinate values, if one wants to keep
      * (<var>y</var>,<var>x</var>,<var>t</var>) coordinates (note the <var>x</var> ↔ <var>y</var> swapping)
      * and discard the <var>z</var> values, then the indices of source coordinates to select are 1 for <var>y</var>,
      * 0 for <var>x</var> and 3 for <var>t</var>. One can use the following method call:
@@ -544,16 +540,14 @@ public final class Matrices extends Static {
      * The above method call will create the following 4×5 matrix,
      * which can be used for converting coordinates as below:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌   ┐   ┌           ┐   ┌   ┐
      *   │ y │   │ 0 1 0 0 0 │   │ x │
      *   │ x │   │ 1 0 0 0 0 │   │ y │
      *   │ t │ = │ 0 0 0 1 0 │ × │ z │
      *   │ 1 │   │ 0 0 0 0 1 │   │ t │
      *   └   ┘   └           ┘   │ 1 │
-     *                           └   ┘
-     * }
-     * </div>
+     *                           └   ┘</pre>
      *
      * The inverse of the matrix created by this method will put {@link Double#NaN} values in the extra dimensions.
      * Other dimensions will work as expected.
@@ -609,30 +603,27 @@ public final class Matrices extends Static {
      *       is copied in the last column of the sub-matrix.</li>
      * </ul>
      *
-     * <div class="note"><b>Example:</b>
+     * <h4>Example</h4>
      * given the following sub-matrix which converts height values from feet to metres before to subtracts 25 metres:
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌    ┐   ┌             ┐   ┌   ┐
      *   │ z' │ = │ 0.3048  -25 │ × │ z │
      *   │ 1  │   │ 0         1 │   │ 1 │
-     *   └    ┘   └             ┘   └   ┘
-     * }
+     *   └    ┘   └             ┘   └   ┘</pre>
      *
      * Then a call to {@code Matrices.createPassThrough(2, subMatrix, 1)} will return the following matrix,
      * which can be used for converting the height (<var>z</var>) without affecting the other coordinate values
      * (<var>x</var>,<var>y</var>,<var>t</var>):
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌    ┐   ┌                      ┐   ┌   ┐
      *   │ x  │   │ 1  0  0       0    0 │   │ x │
      *   │ y  │   │ 0  1  0       0    0 │   │ y │
      *   │ z' │ = │ 0  0  0.3048  0  -25 │ × │ z │
      *   │ t  │   │ 0  0  0       1    0 │   │ t │
      *   │ 1  │   │ 0  0  0       0    1 │   │ 1 │
-     *   └    ┘   └                      ┘   └   ┘
-     * }
-     * </div>
+     *   └    ┘   └                      ┘   └   ┘</pre>
      *
      * @param  firstAffectedCoordinate  the lowest index of the affected coordinates.
      * @param  subMatrix                the matrix to use for affected coordinates.
@@ -1212,14 +1203,13 @@ public final class Matrices extends Static {
      * (<var>latitude</var>, <var>longitude</var>) axes, converts degrees to radians and converts
      * height values from feet to metres:</p>
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌                                                       ┐
      *   │ 0                     0.017453292519943295  0       0 │
      *   │ 0.017453292519943295  0                     0       0 │
      *   │ 0                     0                     0.3048  0 │
      *   │ 0                     0                     0       1 │
-     *   └                                                       ┘
-     * }
+     *   └                                                       ┘</pre>
      *
      * <div class="note"><b>Note:</b>
      * Formatting on a per-column basis is convenient for the kind of matrices used in referencing by coordinates,
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
index 9fabeea73e..55e47f39f7 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
@@ -637,14 +637,13 @@ public abstract class MatrixSIS implements Matrix, LenientComparable, Cloneable,
      * <code>{@linkplain #multiply(Matrix) multiply}(T)</code> where <var>T</var> is a matrix like
      * below (size varies):
      *
-     * {@preformat math
+     * <pre class="math">
      *        ┌                    ┐
      *        │ 1  0  0  vector[0] │
      *    T = │ 0  1  0  vector[1] │
      *        │ 0  0  1  vector[2] │
      *        │ 0  0  0  vector[3] │
-     *        └                    ┘
-     * }
+     *        └                    ┘</pre>
      *
      * The length of the given vector must be equal to the number of columns in this matrix.
      * The last vector element is 1 for an affine transform, but other values are allowed.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java
index e9eebd7762..842ba8490d 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java
@@ -135,15 +135,14 @@ final class NonSquareMatrix extends GeneralMatrix {
      * then insert NaN in place of the omitted dimensions. In the matrix below, we can see that (x,y) are
      * independent of (z,t) because the 3th and 4th columns contains only 0 elements:</p>
      *
-     * {@preformat math
+     * <pre class="math">
      *   ┌               ┐ -1        ┌                  ┐
      *   │ 2  0  0  0  8 │           │ 0.5  0     -4.00 │
      *   │ 0  4  0  0  5 │     =     │ 0    0.25  -1.25 │
      *   │ 0  0  0  0  1 │           │ 0    0       NaN │
      *   └               ┘           │ 0    0       NaN │
      *                               │ 0    0      1    │
-     *                               └                  ┘
-     * }
+     *                               └                  ┘</pre>
      *
      * There is an issue about whether the full row shall contain NaN, or only the last element (the translation
      * term) as in the above example.  The current implementation inserts a NaN value in the translation term and
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
index 6ac4162cbc..8e1e9ad91d 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
@@ -514,7 +514,7 @@ public class LambertConicConformal extends ConformalProjection {
     /**
      * Provides the transform equations for the spherical case of the Lambert Conformal projection.
      *
-     * <div class="note"><b>Implementation note:</b>
+     * <h2>Implementation note</h2>
      * this class contains explicit checks for latitude values at poles.
      * See the discussion in the {@link Mercator.Spherical} javadoc for an explanation.
      * The following is specific to the Lambert Conformal projection.
@@ -522,15 +522,13 @@ public class LambertConicConformal extends ConformalProjection {
      * <p>Comparison of observed behavior at poles between the spherical and ellipsoidal cases,
      * if no special checks are applied:</p>
      *
-     * {@preformat text
+     * <pre class="text">
      *     ┌───────┬──────────────────────────┬────────────────────────┐
      *     │       │ Spherical                │ Ellipsoidal            │
      *     ├───────┼──────────────────────────┼────────────────────────┤
      *     │ North │ Approximate  (y = small) │ Exact answer (y = 0.0) │
      *     │ South │ Exact answer (y = +∞)    │ Approximate  (y = big) │
-     *     └───────┴──────────────────────────┴────────────────────────┘
-     * }
-     * </div>
+     *     └───────┴──────────────────────────┴────────────────────────┘</pre>
      *
      * @author  Martin Desruisseaux (MPO, IRD, Geomatys)
      * @author  André Gosselin (MPO)
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Polyconic.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Polyconic.java
index ce027fb5b2..c8a5460413 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Polyconic.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Polyconic.java
@@ -69,23 +69,21 @@ public class Polyconic extends MeridianArcBased {
     /**
      * Coefficients for reverse projection. Snyder 18-17 gives:
      *
-     * {@preformat math
+     * <pre class="math">
      *     c₀ =    (-5/256 ⋅e⁶  +  -3/64 ⋅e⁴  +  -1/4⋅e²  +  1)
      *     c₂ = -2⋅(45/1024⋅e⁶  +   3/32 ⋅e⁴  +   3/8⋅e²)
      *     c₄ = +4⋅(45/1024⋅e⁶  +  15/256⋅e⁴)
      *     c₆ = -6⋅(35/3072⋅e⁶)
-     *     M′  = c₀ + c₂cos(2φ) + c₄cos(4φ) + c₆cos(6φ)
-     * }
+     *     M′  = c₀ + c₂cos(2φ) + c₄cos(4φ) + c₆cos(6φ)</pre>
      *
      * but using trigonometric identities we rewrite as:
      *
-     * {@preformat math
+     * <pre class="math">
      *     c₀ =    1 - e²
      *     c₂ = - 3/2 ⋅e⁴  +   3/2⋅e²
      *     c₄ = -15/8 ⋅e⁶  +  15/8⋅e⁴
      *     c₆ =  35/16⋅e⁶
-     *     M′  = c₀ + sin²φ⋅(c₂ + sin²φ⋅(c₄ + sin²φ⋅c₆))
-     * }
+     *     M′  = c₀ + sin²φ⋅(c₂ + sin²φ⋅(c₄ + sin²φ⋅c₆))</pre>
      *
      * @see <a href="https://svn.apache.org/repos/asf/sis/analysis/Map%20projection%20formulas.ods">Coefficients derivation</a>
      */
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
index db143e9bc2..2f9d39175f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
@@ -909,13 +909,12 @@ class ConcatenatedTransform extends AbstractMathTransform implements Serializabl
      * This method tries to delegate the concatenation to {@link #transform1} or {@link #transform2}.
      * Assuming that transforms are associative, this is equivalent to trying the following arrangements:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Instead of : other → tr1 → tr2
      *   Try:         (other → tr1) → tr2          where (…) denote an optimized concatenation.
      *
      *   Instead of : tr1 → tr2 → other
-     *   Try:         tr1 → (tr2 → other)          where (…) denote an optimized concatenation.
-     * }
+     *   Try:         tr1 → (tr2 → other)          where (…) denote an optimized concatenation.</pre>
      *
      * @return the simplified transform, or {@code null} if no such optimization is available.
      * @throws FactoryException if an error occurred while combining the transforms.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
index 8e962271d6..312e74c72c 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
@@ -257,9 +257,7 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math
      * Creates a new factory which will discover operation methods with a {@link ServiceLoader}.
      * The {@link OperationMethod} implementations shall be listed in the following file:
      *
-     * {@preformat text
-     *     META-INF/services/org.opengis.referencing.operation.OperationMethod
-     * }
+     * <pre class="text">META-INF/services/org.opengis.referencing.operation.OperationMethod</pre>
      *
      * {@code DefaultMathTransformFactory} parses the above-cited files in all JAR files in order to find all available
      * operation methods. By default, only operation methods that implement the {@link MathTransformProvider} interface
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
index 1a99906992..8b3f4f43a9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
@@ -116,12 +116,11 @@ public final strictfp class AbstractEnvelopeTest extends TestCase {
     /**
      * Tests the simple case (no anti-meridian crossing).
      *
-     * {@preformat text
+     * <pre class="text">
      *     ┌─────────────┐
      *     │  ┌───────┐  │
      *     │  └───────┘  │
-     *     └─────────────┘
-     * }
+     *     └─────────────┘</pre>
      */
     @Test
     public void testSimpleEnvelope() {
@@ -170,12 +169,11 @@ public final strictfp class AbstractEnvelopeTest extends TestCase {
     /**
      * Tests a case crossing the anti-meridian.
      *
-     * {@preformat text
+     * <pre class="text">
      *      ─────┐  ┌─────────              ─────┐      ┌─────
      *           │  │  ┌────┐       or      ──┐  │      │  ┌──
      *           │  │  └────┘               ──┘  │      │  └──
-     *      ─────┘  └─────────              ─────┘      └─────
-     * }
+     *      ─────┘  └─────────              ─────┘      └─────</pre>
      */
     @Test
     public void testCrossingAntiMeridian() {
@@ -232,12 +230,11 @@ public final strictfp class AbstractEnvelopeTest extends TestCase {
      * Tests a the anti-meridian case with a larger empty space
      * on the left side.
      *
-     * {@preformat text
+     * <pre class="text">
      *      ───┐    ┌─────────              ───┐      ┌─────
      *         │    │  ┌────┐       or      ───┼──┐   │  ┌──
      *         │    │  └────┘               ───┼──┘   │  └──
-     *      ───┘    └─────────              ───┘      └─────
-     * }
+     *      ───┘    └─────────              ───┘      └─────</pre>
      */
     @Test
     public void testCrossingAntiMeridianTwice() {
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
index 09c45fede8..bca5b182e6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
@@ -123,15 +123,14 @@ public final strictfp class WraparoundAdjustmentTest extends TestCase {
      * Tests {@link WraparoundAdjustment#shift(Envelope)}
      * with an envelope that cause the method to expand the area of interest. Illustration:
      *
-     * {@preformat text
+     * <pre class="text">
      *                  ┌────────────────────────────────────────────┐
      *                  │             Domain of validity             │
      *                  └────────────────────────────────────────────┘
      *   ┌────────────────────┐                                ┌─────
      *   │  Area of interest  │                                │  AOI
      *   └────────────────────┘                                └─────
-     *    ↖………………………………………………………360° period……………………………………………………↗︎
-     * }
+     *    ↖………………………………………………………360° period……………………………………………………↗︎</pre>
      *
      * @throws TransformException should never happen since this test does not transform coordinates.
      */
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/ClenshawSummation.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/ClenshawSummation.java
index ab0c30c499..451082f906 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/ClenshawSummation.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/ClenshawSummation.java
@@ -37,21 +37,19 @@ import org.apache.sis.util.StringBuilders;
  *
  * The idea is to rewrite some equations using trigonometric identities. Given:
  *
- * {@preformat math
- *     s  =  A⋅sin(θ) + B⋅sin(2θ) + C⋅sin(3θ) + D⋅sin(4θ) + E⋅sin(5θ) + F⋅sin(6θ)
- * }
+ * <pre class="math">
+ *     s  =  A⋅sin(θ) + B⋅sin(2θ) + C⋅sin(3θ) + D⋅sin(4θ) + E⋅sin(5θ) + F⋅sin(6θ)</pre>
  *
  * We rewrite as:
  *
- * {@preformat math
+ * <pre class="math">
  *     s  =  sinθ⋅(A′ + cosθ⋅(B′ + cosθ⋅(C′ + cosθ⋅(D′ + cosθ⋅(E′ + cosθ⋅F′)))))
  *     A′ =  A - C + E
  *     B′ =  2B - 4D + 6F
  *     C′ =  4C - 12E
  *     D′ =  8D - 32F
  *     E′ = 16E
- *     F′ = 32F
- * }
+ *     F′ = 32F</pre>
  *
  * Some calculations were done in an OpenOffice spreadsheet available on
  * <a href="https://svn.apache.org/repos/asf/sis/analysis/Map%20projection%20formulas.ods">Subversion</a>.
@@ -79,9 +77,8 @@ public final class ClenshawSummation {
      * Creates a new series expansion to be optimized by Clenshaw summation.
      * Given the following series:
      *
-     * {@preformat math
-     *     s  =  A⋅sin(θ) + B⋅sin(2θ) + C⋅sin(3θ) + D⋅sin(4θ) + E⋅sin(5θ) + F⋅sin(6θ)
-     * }
+     * <pre class="math">
+     *     s  =  A⋅sin(θ) + B⋅sin(2θ) + C⋅sin(3θ) + D⋅sin(4θ) + E⋅sin(5θ) + F⋅sin(6θ)</pre>
      *
      * the arguments given to this constructor shall be A, B, C, D, E and F in that exact order.
      */
@@ -93,15 +90,13 @@ public final class ClenshawSummation {
      * A coefficient to be multiplied by the sine or cosine of an angle. For example in the following expression,
      * each of A, B, C, D, E and F variable is a {@code Coefficient} instance.
      *
-     * {@preformat math
-     *     s  =  A⋅sin(θ) + B⋅sin(2θ) + C⋅sin(3θ) + D⋅sin(4θ) + E⋅sin(5θ) + F⋅sin(6θ)
-     * }
+     * <pre class="math">
+     *     s  =  A⋅sin(θ) + B⋅sin(2θ) + C⋅sin(3θ) + D⋅sin(4θ) + E⋅sin(5θ) + F⋅sin(6θ)</pre>
      *
      * Each {@code Coefficient} is itself defined by a sum of terms, for example:
      *
-     * {@preformat math
-     *     A  =  -1/2⋅ε  +  3/16⋅ε³  +  -1/32⋅ε⁵
-     * }
+     * <pre class="math">
+     *     A  =  -1/2⋅ε  +  3/16⋅ε³  +  -1/32⋅ε⁵</pre>
      */
     private static final class Coefficient {
         /**
@@ -123,9 +118,8 @@ public final class ClenshawSummation {
          * The {@code toSum[i]} term is multiplied by the {@code factors[i]} at the same index.
          * This method is used for computing B′ in expressions like:
          *
-         * {@preformat math
-         *     B′ = 2B - 4D + 6F
-         * }
+         * <pre class="math">
+         *     B′ = 2B - 4D + 6F</pre>
          *
          * @param toSum    the terms to sum, ignoring null elements.
          * @param factors  multiplication factor for each term to sum.
@@ -186,9 +180,8 @@ public final class ClenshawSummation {
      * One term in in the evaluation of a {@link Coefficient}. This term is usually single fraction.
      * For example, a {@code Coefficient} may be defined as below:
      *
-     * {@preformat math
-     *     A  =  -1/2⋅ε  +  3/16⋅ε³  +  -1/32⋅ε⁵
-     * }
+     * <pre class="math">
+     *     A  =  -1/2⋅ε  +  3/16⋅ε³  +  -1/32⋅ε⁵</pre>
      *
      * In above example each of -1/2, 3/16 and -1/32 fraction is a {@code Term} instance.
      * However, this class allows a term to be defined by an array of fractions if each term
@@ -222,9 +215,8 @@ public final class ClenshawSummation {
          * The {@code toSum[i]} term is multiplied by the {@code factors[i]} at the same index.
          * This method is used for computing B′ in expressions like:
          *
-         * {@preformat math
-         *     B′ = 2B - 4D + 6F
-         * }
+         * <pre class="math">
+         *     B′ = 2B - 4D + 6F</pre>
          *
          * Note that B, D and F above usually contain many terms, so this method will need to be invoked in a loop.
          *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
index 1689eb4fdf..a4f2fb45ad 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
@@ -135,10 +135,9 @@ public final strictfp class ResidualGridTest extends TestCase {
      * Tests {@link ResidualGrid#derivativeInCell(double, double)}.
      * The Jacobian is computed with those values:
      *
-     * {@preformat text
+     * <pre class="text">
      *   (0,4)   (2,3)
-     *   (1,4)   (3,3)
-     * }
+     *   (1,4)   (3,3)</pre>
      *
      * So this mean for example that when moving from 1 cell to the right, the residual change from (0,4) to (2,3).
      * Consequently, the <var>x</var> position is increased from (2-0) = 2 cells in addition to the move to the right
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
index 515908c599..2a3963049d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
@@ -54,10 +54,9 @@ public final strictfp class ConformalProjectionTest extends TransformTestCase {
      * This is a little bit more a Java test than an Apache SIS test (or to be more
      * accurate, a test of our understanding of the {@code java.lang.Math} library).
      *
-     * {@preformat text
+     * <pre class="text">
      *   Forward:  y = log(tan(π/4 + φ/2))
-     *   Inverse:  φ = π/2 - 2*atan(exp(-y))
-     * }
+     *   Inverse:  φ = π/2 - 2*atan(exp(-y))</pre>
      */
     @Test
     public void verifyMath() {
@@ -90,10 +89,9 @@ public final strictfp class ConformalProjectionTest extends TransformTestCase {
     /**
      * Tests the {@link ConformalProjection#expΨ(double, double)} function.
      *
-     * {@preformat text
+     * <pre class="text">
      *   Forward:  y = -log(t(φ))
-     *   Inverse:  φ = φ(exp(-y))
-     * }
+     *   Inverse:  φ = φ(exp(-y))</pre>
      */
     @Test
     @DependsOnMethod("verifyMath")
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java
index 22cc318e55..d56f820681 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MeridianArcTest.java
@@ -64,13 +64,12 @@ public final strictfp class MeridianArcTest extends MapProjectionTestCase {
      * The equation is given in Snyder 3-21. We use this equation as a reference for testing validity of other forms.
      * The equation is:
      *
-     * {@preformat math
+     * <pre class="math">
      *   M = a[(1 – e²/4 – 3e⁴/64  –  5e⁶/256  – …)⋅φ
      *          – (3e²/8 + 3e⁴/32  + 45e⁶/1024 + …)⋅sin2φ
      *                 + (15e⁴/256 + 45e⁶/1024 + …)⋅sin4φ
      *                            – (35e⁶/3072 + …)⋅sin6φ
-     *                                         + …]
-     * }
+     *                                         + …]</pre>
      *
      * @param  φ  latitude in radians.
      * @return distance on meridian from equator to the given latitude on an ellipsoid with semi-major axis of 1.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
index ec0fb5f54e..c7505abb2e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
@@ -30,17 +30,16 @@ import static java.lang.StrictMath.*;
  * A pseudo-transform for debugging purpose. The input points can be random numbers between 0 and 1.
  * The transformed points are build as below (when formatted in base 10):
  *
- * {@preformat text
- *     [1 digit for dimension] [3 first fraction digits] . [original digits from source]
- * }
+ * <blockquote>
+ * [1 digit for dimension] [3 first fraction digits] . [original digits from source]
+ * </blockquote>
  *
  * For example if the first input coordinate is (0.2, 0.5, 0.3), then the transformed coordinate will be:
  *
- * {@preformat text
+ * <pre class="text">
  *     1002.2
  *     2005.5
- *     3003.3
- * }
+ *     3003.3</pre>
  *
  * This inverse transform is not effective and this transform cannot compute {@linkplain #derivative derivative}.
  *
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
index a620075e51..5bcfdc37a0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
@@ -621,10 +621,9 @@ public final strictfp class CoordinateReferenceSystems extends AuthorityCodesRep
      * We use only the part of the name prior some keywords (e.g. {@code "zone"}).
      * For example if the following codes:
      *
-     * {@preformat text
+     * <pre class="text">
      *    EPSG:32609    WGS 84 / UTM zone 9N
-     *    EPSG:32610    WGS 84 / UTM zone 10N
-     * }
+     *    EPSG:32610    WGS 84 / UTM zone 10N</pre>
      *
      * We compare only the "WGS 84 / UTM" string, then the code. This is a reasonably easy way to keep a more
      * natural ordering ("9" sorted before "10", "UTM North" projections kept together and same for South).
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
index 6d06bf989d..e17f5559ad 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
@@ -214,14 +214,13 @@ public class ConverterRegistry {
      * Consider a converter from class {@code S} to class {@code T} where the two classes
      * are related in a hierarchy as below:
      *
-     * {@preformat text
+     * <pre class="text">
      *   C1
      *   └───C2
      *       ├───C3
      *       │   └───S
      *       └───C4
-     *           └───T
-     * }
+     *           └───T</pre>
      *
      * Invoking this method will register the given converter for all the following cases:
      *
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java
index 76a4ad6a7c..ab1527b75f 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java
@@ -28,9 +28,7 @@
  * fully qualified classnames of their {@link org.apache.sis.util.ObjectConverter} instances
  * in a file having exactly the following name:
  *
- * {@preformat text
- *     META-INF/services/org.apache.sis.util.ObjectConverter
- * }
+ * <pre class="text">META-INF/services/org.apache.sis.util.ObjectConverter</pre>
  *
  * Applications deployed in a container framework like OSGi shall use only the service loader,
  * because system converters are discarded every time that the classpath changes.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java b/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
index ddb7fc8459..f00b7b1d5b 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
@@ -58,7 +58,7 @@ import static org.apache.sis.util.Characters.isLineOrParagraphSeparator;
  *
  * produces the following output:
  *
- * {@preformat text
+ * <pre class="text">
  *   ╔═════════╤═════════╤════════╗
  *   ║ English │ French  │ r.e.d. ║
  *   ╟─────────┼─────────┼────────╢
@@ -66,8 +66,7 @@ import static org.apache.sis.util.Characters.isLineOrParagraphSeparator;
  *   ║ Venus   │ Vénus   │ 0.949  ║
  *   ║ Earth   │ Terre   │ 1.00   ║
  *   ║ Mars    │ Mars    │ 0.532  ║
- *   ╚═════════╧═════════╧════════╝
- * }
+ *   ╚═════════╧═════════╧════════╝</pre>
  *
  * @author  Martin Desruisseaux (MPO, IRD, Geomatys)
  * @version 1.0
diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java b/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
index dd526d0446..8d1f949d7a 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
@@ -222,9 +222,8 @@ public final class MathFunctions extends Static {
     /**
      * Returns the magnitude of the given vector. This is defined by:
      *
-     * {@preformat math
-     *     sqrt(vector[0]² + vector[1]² + … + vector[length-1]²)
-     * }
+     * <pre class="math">
+     *     sqrt(vector[0]² + vector[1]² + … + vector[length-1]²)</pre>
      *
      * If the given vector contains a NaN value, then the result is NaN.
      *
diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/RepeatedVector.java b/core/sis-utility/src/main/java/org/apache/sis/math/RepeatedVector.java
index 8b2da98244..1c19c850c5 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/RepeatedVector.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/RepeatedVector.java
@@ -33,26 +33,24 @@ import org.apache.sis.util.resources.Errors;
  * <p>{@link #cycleLength} is usually the length of the {@linkplain #base} vector, but not necessarily.
  * If {@link #occurrences} = 1 and {@code cycleLength} = 4 for example, then this class handles repetitions like below:</p>
  *
- * {@preformat text
+ * <pre class="text">
  *    10 12 15 20
  *    10 12 15 20    ← new cycle
  *    10 12 15 20    ← new cycle
  *    10 12 15 20    ← new cycle
- *    …etc…
- * }
+ *    …etc…</pre>
  *
  * If {@link #occurrences} &gt; 1, then this class handles repetitions in a different way
  * (in this example, {@link #cycleLength} is still 4):
  *
- * {@preformat text
+ * <pre class="text">
  *    10 10 10 10
  *    12 12 12 12
  *    15 15 15 15
  *    20 20 20 20
  *    10 10 10 10    ← new cycle
  *    12 12 12 12
- *    …etc…
- * }
+ *    …etc…</pre>
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.1
diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java b/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
index 4c4a9ce4ca..8140b18e8b 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
@@ -571,14 +571,13 @@ public class Statistics implements DoubleConsumer, LongConsumer, Cloneable, Seri
      * Returns a string representation of this statistics. This string will span
      * multiple lines, one for each statistical value. For example:
      *
-     * {@preformat text
+     * <pre class="text">
      *     Number of values:     8726
      *     Minimum value:       6.853
      *     Maximum value:       8.259
      *     Mean value:          7.421
      *     Root Mean Square:    7.846
-     *     Standard deviation:  6.489
-     * }
+     *     Standard deviation:  6.489</pre>
      *
      * @return a string representation of this statistics object.
      *
diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java b/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
index d691628148..979dd4f4de 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
@@ -42,16 +42,14 @@ import org.apache.sis.internal.util.Numerics;
  * By default, newly created {@code StatisticsFormat} instances will format statistical values
  * in a tabular format using spaces as the column separator.
  *
- * <div class="note"><b>Example:</b>
- * {@preformat text
+ * <h2>Example</h2>
+ * <pre class="text">
  *     Number of values:     8726
  *     Minimum value:       6.853
  *     Maximum value:       8.259
  *     Mean value:          7.421
  *     Root Mean Square:    7.846
- *     Standard deviation:  6.489
- * }
- * </div>
+ *     Standard deviation:  6.489</pre>
  *
  * <h2>Limitations</h2>
  * <ul>
diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java b/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
index 71ff8d91f9..ecef762d2f 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
@@ -599,37 +599,37 @@ public abstract class Vector extends AbstractList<Number> implements RandomAcces
      * than the number of consecutive <var>y</var> values before the <var>z</var> values, the number of consecutive <var>z</var>
      * values before the next values, and so on until the end of the vector.</p>
      *
-     * <div class="note"><b>Examples:</b>
-     * in the following vector, each value is repeated 3 times. So the array returned by this method would be {@code {4}},
+     * <h4>Examples</h4>
+     * In the following vector, each value is repeated 3 times. So the array returned by this method would be {@code {4}},
      * meaning that the first number appears 4 times, followed by a new number appearing 4 times, followed by a new number
      * appearing 4 times, and so on until the end of the vector.
      *
-     * {@preformat text
+     * <pre class="text">
      *    10, 10, 10, 10,
      *    12, 12, 12, 12,
-     *    15, 15, 15, 15
-     * }</div>
+     *    15, 15, 15, 15</pre>
      *
+     * <h4>Repetitions of repetitions</h4>
      * For the next level (the second integer in the returned array), this method represents above repetitions by single entities
      * then reapplies the same repetition detection. This method processes has if the (<var>x</var>, <var>x</var>, …, <var>x</var>,
      * <var>y</var>, <var>y</var>, …, <var>y</var>, <var>z</var>, <var>z</var>, …, <var>z</var>, …) vector was replaced by a new
      * (<b>x</b>, <b>y</b>, <b>z</b>, …) vector, then the same detection algorithm was applied recursively.
      *
-     * <div class="note"><b>Examples:</b>
-     * in the following vector, each value is repeated 2 times, then the sequence of 12 values is itself repeated 2 times.
+     * <h5>Examples</h5>
+     * In the following vector, each value is repeated 2 times, then the sequence of 12 values is itself repeated 2 times.
      * So the array returned by this method would be {@code {3,4}}, meaning that the first number appears 3 times, followed
      * by a new number appearing 3 times, <i>etc.</i> until we counted 4 groups of 3 numbers. Then the whole sequence is
      * repeated until the end of the vector.
      *
-     * {@preformat text
+     * <pre class="text">
      *    10, 10, 10,  12, 12, 12,  15, 15, 15,  18, 18, 18,
      *    10, 10, 10,  12, 12, 12,  15, 15, 15,  18, 18, 18,
-     *    10, 10, 10,  12, 12, 12,  15, 15, 15,  18, 18, 18
-     * }</div>
+     *    10, 10, 10,  12, 12, 12,  15, 15, 15,  18, 18, 18</pre>
      *
-     * <p>This method is useful for analyzing the localization grid provided by some files (for example in netCDF format).
+     * <h4>Use cases</h4>
+     * This method is useful for analyzing the localization grid provided by some files (for example in netCDF format).
      * Those grids sometimes have constant longitude for the same column index, or constant latitude for the same row index.
-     * This method can detect such regularity, which allows more efficient handling of the <cite>grid to CRS</cite> transform.</p>
+     * This method can detect such regularity, which allows more efficient handling of the <cite>grid to CRS</cite> transform.
      *
      * @param  candidates  probable values, or {@code null} or an empty array if unknown. If non-empty, those values will be used
      *         for narrowing the search, which may improve performances. There is no guarantee that the values returned by this
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java b/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java
index 568291a246..856ab4353a 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java
@@ -221,15 +221,13 @@ final class LinearConverter extends AbstractConverter implements LenientComparab
      * Returns the inverse of this unit converter.
      * Given that the formula applied by this converter is:
      *
-     * {@preformat math
-     *    y = (x⋅scale + offset) ∕ divisor
-     * }
+     * <pre class="math">
+     *    y = (x⋅scale + offset) ∕ divisor</pre>
      *
      * the inverse formula is:
      *
-     * {@preformat math
-     *    x = (y⋅divisor - offset) ∕ scale
-     * }
+     * <pre class="math">
+     *    x = (y⋅divisor - offset) ∕ scale</pre>
      */
     @Override
     public synchronized UnitConverter inverse() {
@@ -326,16 +324,14 @@ final class LinearConverter extends AbstractConverter implements LenientComparab
      * by the specified converter (right converter), and then converting by this converter (left converter).  In the
      * following equations, the 1 subscript is for the specified converter and the 2 subscript is for this converter:
      *
-     * {@preformat math
+     * <pre class="math">
      *    t = (x⋅scale₁ + offset₁) ∕ divisor₁
-     *    y = (t⋅scale₂ + offset₂) ∕ divisor₂
-     * }
+     *    y = (t⋅scale₂ + offset₂) ∕ divisor₂</pre>
      *
      * We rewrite as:
      *
-     * {@preformat math
-     *    y = (x⋅scale₁⋅scale₂ + offset₁⋅scale₂ + divisor₁⋅offset₂) ∕ (divisor₁⋅divisor₂)
-     * }
+     * <pre class="math">
+     *    y = (x⋅scale₁⋅scale₂ + offset₁⋅scale₂ + divisor₁⋅offset₂) ∕ (divisor₁⋅divisor₂)</pre>
      */
     @Override
     public UnitConverter concatenate(final UnitConverter converter) {
diff --git a/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java b/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java
index 69dbdae97c..3b887e41da 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java
@@ -55,9 +55,7 @@ import org.apache.sis.internal.util.MetadataServices;
  * In order to allow those classes to discover which resources are available,
  * {@code InstallationResources} implementations shall be declared in the following file:
  *
- * {@preformat text
- *     META-INF/services/org.apache.sis.setup.InstallationResources
- * }
+ * <pre class="text">META-INF/services/org.apache.sis.setup.InstallationResources</pre>
  *
  * Above registration is usually done automatically when extension modules are added on the classpath.
  * For example, adding the {@code org.apache.sis.non-free:sis-epsg} Maven dependency as documented on
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/Characters.java b/core/sis-utility/src/main/java/org/apache/sis/util/Characters.java
index f845bdfae9..97a4835a61 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/Characters.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/Characters.java
@@ -150,9 +150,9 @@ public final class Characters extends Static {
      * Determines whether the given character is a superscript. Most (but not all) superscripts
      * have a Unicode value in the [2070 … 207F] range. Superscripts are the following symbols:
      *
-     * {@preformat text
+     * <blockquote>
      *   ⁰ ¹ ² ³ ⁴ ⁵ ⁶ ⁷ ⁸ ⁹ ⁺ ⁻ ⁼ ⁽ ⁾ ⁿ
-     * }
+     * </blockquote>
      *
      * @param  c  the character to test.
      * @return {@code true} if the given character is a superscript.
@@ -173,9 +173,9 @@ public final class Characters extends Static {
      * Determines whether the given character is a subscript. All subscripts have
      * a Unicode value in the [2080 … 208E]. Subscripts are the following symbols:
      *
-     * {@preformat text
+     * <blockquote>
      *   ₀ ₁ ₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉ ₊ ₋ ₌ ₍ ₎
-     * }
+     * </blockquote>
      *
      * @param  c  the character to test.
      * @return {@code true} if the given character is a subscript.
@@ -188,9 +188,9 @@ public final class Characters extends Static {
      * Converts the given character argument to superscript.
      * Only the following characters can be converted (other characters are left unchanged):
      *
-     * {@preformat text
+     * <blockquote>
      *     0 1 2 3 4 5 6 7 8 9 + - = ( ) n
-     * }
+     * </blockquote>
      *
      * @param  c  the character to convert.
      * @return the given character as a superscript, or {@code c} if the given character cannot be converted.
@@ -220,9 +220,9 @@ public final class Characters extends Static {
      * Converts the given character argument to subscript.
      * Only the following characters can be converted (other characters are left unchanged):
      *
-     * {@preformat text
+     * <blockquote>
      *     0 1 2 3 4 5 6 7 8 9 + - = ( )
-     * }
+     * </blockquote>
      *
      * @param  c  the character to convert.
      * @return the given character as a subscript, or {@code c} if the given character cannot be converted.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
index ba38ea6f5b..faf716c62a 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
@@ -29,7 +29,7 @@ import java.util.List;
  * <p>Below is an example of what a two-columns {@code TreeTable} instance may look like
  * when {@linkplain TreeTableFormat formatted as a text}:</p>
  *
- * {@preformat text
+ * <pre class="text">
  *   Citation
  *     ├─Title…………………………………………………………… Open Geospatial Consortium
  *     ├─Presentation Forms………………………… document digital
@@ -41,13 +41,12 @@ import java.util.List;
  *     │           ├─Linkage……………………… https://www.ogc.org/
  *     │           └─Function…………………… information
  *     └─Identifiers
- *         └─Code…………………………………………………… OGC
- * }
+ *         └─Code…………………………………………………… OGC</pre>
  *
- * <p>In many cases, the columns are known in advance as hard-coded static constants.
+ * In many cases, the columns are known in advance as hard-coded static constants.
  * Those column constants are typically documented close to the class producing the
  * {@code TreeTable} instance. Using directly those static constants provides type
- * safety, as in the following example:</p>
+ * safety, as in the following example:
  *
  * {@snippet lang="java" :
  *     TreeTable table = ...;                   // Put here a TreeTable instance.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
index 8995ce2ba1..4f8803512d 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
@@ -55,22 +55,20 @@ import static org.apache.sis.util.Characters.NO_BREAK_SPACE;
  * If a {@code TreeTable} is formatted with only that column,
  * then the {@link String} result is like the following example:
  *
- * {@preformat text
+ * <pre class="text">
  *   Node #1
  *     ├─Node #2
  *     │   └─Node #4
- *     └─Node #3
- * }
+ *     └─Node #3</pre>
  *
  * If the same {@code TreeTable} is formatted with two columns,
  * then the {@link String} result is like the following example:
  *
- * {@preformat text
+ * <pre class="text">
  *   Node #1……………………… More #1
  *     ├─Node #2…………… More #2
  *     │   └─Node #4… More #4
- *     └─Node #3…………… More #3
- * }
+ *     └─Node #3…………… More #3</pre>
  *
  * This representation can be printed to the {@linkplain java.io.Console#writer() console output}
  * (for example) if the stream uses a monospaced font and supports Unicode characters.
@@ -932,10 +930,9 @@ public class TreeTableFormat extends TabularFormat<TreeTable> {
      *
      * The output with default values is like below:
      *
-     * {@preformat text
+     * <pre class="text">
      *   root
-     *     └─column0…… column1…… column2…… column3
-     * }
+     *     └─column0…… column1…… column2…… column3</pre>
      *
      * Subclasses can override this method if different column separators are desired.
      * Note however that doing so may prevent the {@link #parse parse(…)} method to work.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
index efca6912eb..ec31800fdf 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
@@ -47,23 +47,21 @@ import org.apache.sis.util.ArgumentChecks;
  * <caption>Example of tree depth reduction</caption>
  * <tr><th>Before</th><th class="sep">After</th></tr>
  * <tr><td>
- * {@preformat text
+ * <pre class="text">
  *   root
  *     ├─users
  *     │   └─alice
  *     │       ├─data
  *     │       │   └─mercator
  *     │       └─document
- *     └─lib
- * }
+ *     └─lib</pre>
  * </td><td class="sep">
- * {@preformat text
+ * <pre class="text">
  *   root
  *     ├─users/alice
  *     │   ├─data/mercator
  *     │   └─document
- *     └─lib
- * }
+ *     └─lib</pre>
  * </td></tr></table>
  * There is no predefined method for this task because there is too many parameters that
  * developers may want to customize (columns to merge, conditions for accepting the merge,
@@ -127,12 +125,11 @@ public final class TreeTables extends Static {
      * finds or creates the nodes for the following tree, where {@code "from"} is the
      * node given in argument to this method:</p>
      *
-     * {@preformat text
+     * <pre class="text">
      *   from
      *     └─users
      *         └─alice
-     *             └─data
-     * }
+     *             └─data</pre>
      *
      * @param  from    the root node from which to start the search.
      * @param  column  the column containing the file name.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java b/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
index 9d8159d966..b9a72c7f97 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
@@ -78,7 +78,7 @@ import static org.apache.sis.internal.util.StandardDateFormat.UTC;
  * The format can also be set from a {@code logging.properties} file.
  * For example, user can cut and paste the following properties into {@code logging.properties}:
  *
- * {@preformat text
+ * {@snippet lang="properties" :
  *     ###########################################################################
  *     # Properties for the apache.sis.org MonolineFormatter.
  *     # By default, MonolineFormatter displays only the log level
@@ -95,16 +95,16 @@ import static org.apache.sis.internal.util.StandardDateFormat.UTC;
  *     ###########################################################################
  *     org.apache.sis.util.logging.MonolineFormatter.time = HH:mm:ss.SSS
  *     org.apache.sis.util.logging.MonolineFormatter.source = class:short
- * }
+ *     }
  *
  * See {@link #setTimeFormat(String)} and {@link #setSourceFormat(String)} for more information about the
  * above {@code time} and {@code source} properties. Encoding and logging level are configured separately,
  * typically on the JDK {@link ConsoleHandler} like below:
  *
- * {@preformat text
+ * {@snippet lang="properties" :
  *     java.util.logging.ConsoleHandler.encoding = UTF-8
  *     java.util.logging.ConsoleHandler.level = FINE
- * }
+ *     }
  *
  * <h2>Thread safety</h2>
  * The same {@code MonolineFormatter} instance can be safely used by many threads without synchronization
@@ -285,9 +285,9 @@ public class MonolineFormatter extends Formatter {
      * Constructs a default {@code MonolineFormatter}. This no-argument constructor is invoked
      * by the logging system if the {@code logging.properties} file contains the following line:
      *
-     * {@preformat text
-     *   java.util.logging.ConsoleHandler.formatter = org.apache.sis.util.logging.MonolineFormatter
-     * }
+     * {@snippet lang="properties" :
+     *     java.util.logging.ConsoleHandler.formatter = org.apache.sis.util.logging.MonolineFormatter
+     *     }
      *
      * @since 1.0
      */
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java b/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
index 43c2120ccc..1ad2c73c91 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
@@ -291,21 +291,19 @@ public final strictfp class TestUtilities extends Static {
      * Returns the tree structure of the given string representation, without the localized text.
      * For example, given the following string:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Citation
      *     ├─Title…………………………………………………… Some title
      *     └─Cited responsible party
-     *         └─Individual name……………… Some person of contact
-     * }
+     *         └─Individual name……………… Some person of contact</pre>
      *
      * this method returns an array containing the following elements:
      *
-     * {@preformat text
+     * <pre class="text">
      *   "",
      *   "  ├─",
      *   "  └─",
-     *   "      └─"
-     * }
+     *   "      └─"</pre>
      *
      * This method is used for comparing two trees having string representation in different locales.
      * In such case, we cannot compare the actual text content. The best we can do is to compare
diff --git a/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java b/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java
index 5a6e3a2920..893ca69e57 100644
--- a/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java
+++ b/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java
@@ -55,7 +55,7 @@ import ucar.nc2.constants.CF;
  * for decoding <cite>Shikisai</cite> GCOM-C files produced by Japan Aerospace Exploration Agency (JAXA), version 1.00.
  * The file format is HDF5 and variables are like below (simplified):
  *
- * {@preformat text
+ * <pre class="text">
  *     group: Geometry_data {
  *         variables:
  *             float Latitude(161, 126)
@@ -95,8 +95,7 @@ import ucar.nc2.constants.CF;
  *         string :Contact_point = "JAXA/Earth Observation Research Center (EORC)"
  *         string :Processing_organization = "JAXA/GCOM-C science project"
  *         string :Processing_UT = "20181202 04:42:09"
- *     }
- * }
+ *     }</pre>
  *
  * Observations:
  * <ul class="verbose">
@@ -360,7 +359,7 @@ public final class GCOM_C extends Convention {
      * Returns the map projection definition for the given data variable.
      * This method expects the following attribute names in the {@value #GEOMETRY_DATA} group:
      *
-     * {@preformat text
+     * <pre class="text">
      *     group: Geometry_data {
      *         // group attributes:
      *         string Image_projection      = "EQA (sinusoidal equal area) projection from 0-deg longitude"
@@ -372,8 +371,7 @@ public final class GCOM_C extends Convention {
      *         float  Lower_left_latitude   =  70.0
      *         float  Lower_right_longitude =  87.714134
      *         float  Lower_right_latitude  =  70.0
-     *     }
-     * }
+     *     }</pre>
      *
      * @param  node  the group of variables from which to read attributes.
      * @return the map projection definition as a modifiable map, or {@code null} if none.
diff --git a/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java b/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java
index a77f0f9e76..f76d7cdbaf 100644
--- a/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java
+++ b/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java
@@ -38,7 +38,7 @@ import org.apache.sis.util.CharSequences;
  * for decoding <cite>Shizuku</cite> GCOM-W files produced by Japan Aerospace Exploration Agency (JAXA), version 3.
  * The file format is HDF5 and variables are like below (simplified):
  *
- * {@preformat text
+ * <pre class="text">
  *     variables:
  *         short "Geophysical Data"(1976, 243, 2)
  *             float SCALE FACTOR = 0.01
@@ -55,8 +55,7 @@ import org.apache.sis.util.CharSequences;
  *         string :ObservationStartDateTime = "2018-11-01T00:08:02.028Z"
  *         string :ObservationEndDateTime = "2018-11-01T00:57:24.247Z"
  *         string :PlatformShortName = "GCOM-W1" ;
- *         string :SensorShortName = "AMSR2" ;
- * }
+ *         string :SensorShortName = "AMSR2" ;</pre>
  *
  * Observations:
  * <ul class="verbose">
diff --git a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/LandsatStore.java b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/LandsatStore.java
index 091ef36086..f3cc765666 100644
--- a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/LandsatStore.java
+++ b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/LandsatStore.java
@@ -55,7 +55,7 @@ import org.apache.sis.setup.OptionKey;
  * Landsat data are distributed as a collection of TIFF files,
  * together with a single text file like below:
  *
- * {@preformat text
+ * <pre class="text">
  * GROUP = L1_METADATA_FILE
  *   GROUP = METADATA_FILE_INFO
  *     ORIGIN = "Image courtesy of the U.S. Geological Survey"
@@ -71,8 +71,7 @@ import org.apache.sis.setup.OptionKey;
  *     OUTPUT_FORMAT = "GEOTIFF"
  *     SPACECRAFT_ID = "LANDSAT_8"
  *     SENSOR_ID = "OLI_TIRS"
- *     etc...
- * }
+ *     etc...</pre>
  *
  * This class reads the content from the given input until the first occurrence of the {@code END} keyword.
  * Lines beginning with the {@code #} character (ignoring spaces) are treated as comment lines and ignored.
diff --git a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java
index 5b3d9e316e..f89e468680 100644
--- a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java
+++ b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java
@@ -81,17 +81,17 @@ import static org.apache.sis.internal.util.CollectionsExt.singletonOrNull;
  * <p>This class will parse properties found in the Landsat metadata file,
  * except {@code GROUP} and {@code END_GROUP}. Example:
  *
- * {@preformat text
+ * <pre class="text">
  *   DATE_ACQUIRED         = 2014-03-12
  *   SCENE_CENTER_TIME     = 03:02:01.5339408Z
  *   CORNER_UL_LAT_PRODUCT = 12.61111
  *   CORNER_UL_LON_PRODUCT = 108.33624
  *   CORNER_UR_LAT_PRODUCT = 12.62381
- *   CORNER_UR_LON_PRODUCT = 110.44017
- * }
+ *   CORNER_UR_LON_PRODUCT = 110.44017</pre>
  *
- * <p><b>NOTE FOR MAINTAINER:</b> if the work performed by this class is modified, consider updating
- * <a href="./doc-files/MetadataMapping.html">./doc-files/MetadataMapping.html</a> accordingly.</p>
+ * <h2>Note for maintainer</h2>
+ * If the work performed by this class is modified, consider updating
+ * <a href="./doc-files/MetadataMapping.html">./doc-files/MetadataMapping.html</a> accordingly.
  *
  * @author  Thi Phuong Hao Nguyen (VNSC)
  * @author  Rémi Maréchal (Geomatys)
diff --git a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
index 0eee25debb..08ce920cce 100644
--- a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
+++ b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
@@ -103,9 +103,8 @@ final class CRSBuilder extends ReferencingFactoryContainer {
      * its components. But some GeoTIFF files encode the names of all components in the value associated to
      * that key, as in the following example:
      *
-     * {@preformat text
-     *   GCS Name = wgs84|Datum = unknown|Ellipsoid = WGS_1984|Primem = Greenwich|
-     * }
+     * <pre class="text">
+     *   GCS Name = wgs84|Datum = unknown|Ellipsoid = WGS_1984|Primem = Greenwich|</pre>
      *
      * In such case, we will split the name into the components names to be stored in an array at indices
      * given by {@code GCRS}, {@code DATUM}, {@code ELLIPSOID} and {@code PRIMEM}.
@@ -898,9 +897,8 @@ final class CRSBuilder extends ReferencingFactoryContainer {
      * Splits the {@link GeoKeys#GeogCitation} value into its prime meridian, ellipsoid, datum and CRS name components.
      * This method is intended to parse geographic CRS names written like below:
      *
-     * {@preformat text
-     *   GCS Name = wgs84|Datum = unknown|Ellipsoid = WGS_1984|Primem = Greenwich|
-     * }
+     * <pre class="text">
+     *   GCS Name = wgs84|Datum = unknown|Ellipsoid = WGS_1984|Primem = Greenwich|</pre>
      *
      * The keywords of both Well Known Text (WKT) version 1 and 2 are accepted as keys for the datum, ellipsoid and
      * prime meridian names. All other keys are presumed to be for the geographic CRS name. If the given string does
diff --git a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoKeysLoader.java b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoKeysLoader.java
index 3936dd9d00..cfac8c653c 100644
--- a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoKeysLoader.java
+++ b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoKeysLoader.java
@@ -47,14 +47,13 @@ import static javax.imageio.plugins.tiff.GeoTIFFTagSet.*;
  *   <tr><td> 2051 </td><td> 34736 </td><td>  1 </td><td>     0 </td></tr>
  * </table>
  *
- * {@preformat text
+ * <pre class="text">
  *   GeoDoubleParams(34736) = {1.5}
- *   GeoAsciiParams(34737) = "Custom File|My Geographic|"
- * }
+ *   GeoAsciiParams(34737) = "Custom File|My Geographic|"</pre>
  *
- * <p>The first number in the {@code GeoKeyDirectory} table indicates that this is a version 1 GeoTIFF GeoKey directory.
+ * The first number in the {@code GeoKeyDirectory} table indicates that this is a version 1 GeoTIFF GeoKey directory.
  * This version will only change if the key structure is changed. The other numbers on the first line said that the file
- * uses revision 1.2 of the set of keys and that there is 6 key values.</p>
+ * uses revision 1.2 of the set of keys and that there is 6 key values.
  *
  * <p>The next line indicates that the first key (1024 = {@code ModelType}) has the value 2 (Geographic),
  * explicitly placed in the entry list since the TIFF tag location is 0.
diff --git a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometryBuilder.java b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
index 533a2bcbf6..338d7bf278 100644
--- a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
+++ b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
@@ -50,25 +50,23 @@ import org.apache.sis.math.Vector;
  * The policy about whether the conversion maps pixel corner or pixel center in GeoTIFF files does not seem
  * totally clear. But the practice at least with GDAL seems to consider the following as equivalent:
  *
- * {@preformat text
+ * <pre class="text">
  *     ModelTiepointTag = (0.0, 0.0, 0.0, -180.0, 90.0, 0.0)
  *     ModelPixelScaleTag = (0.002777777778, 0.002777777778, 0.0)
  *     GeoKeyDirectoryTag:
  *         GTModelTypeGeoKey    = 2    (ModelTypeGeographic)
  *         GTRasterTypeGeoKey   = 1    (RasterPixelIsArea)
- *         GeographicTypeGeoKey = 4326 (GCS_WGS_84)
- * }
+ *         GeographicTypeGeoKey = 4326 (GCS_WGS_84)</pre>
  *
  * and
  *
- * {@preformat text
+ * <pre class="text">
  *     ModelTiepointTag = (-0.5, -0.5, 0.0, -180.0, 90.0, 0.0)
  *     ModelPixelScaleTag = (0.002777777778, 0.002777777778, 0.0)
  *     GeoKeyDirectoryTag:
  *         GTModelTypeGeoKey    = 2    (ModelTypeGeographic)
  *         GTRasterTypeGeoKey   = 2    (RasterPixelIsPoint)
- *         GeographicTypeGeoKey = 4326 (GCS_WGS_84)
- * }
+ *         GeographicTypeGeoKey = 4326 (GCS_WGS_84)</pre>
  *
  * The former is {@link PixelInCell#CELL_CORNER} convention while the latter is {@link PixelInCell#CELL_CENTER}.
  * Note that the translation coefficients in the <cite>grid to CRS</cite> matrix is {@code crs - grid × scale}.
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java
index 810d8bbf67..cc08a5ce42 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CRSBuilderTest.java
@@ -34,9 +34,8 @@ public final strictfp class CRSBuilderTest extends TestCase {
     /**
      * Tests {@link CRSBuilder#splitName(String)}. The string used for this test is:
      *
-     * {@preformat text
-     *   GCS Name = wgs84|Datum = unknown|Ellipsoid = WGS_1984|Primem = Greenwich|
-     * }
+     * <pre class="text">
+     *   GCS Name = wgs84|Datum = unknown|Ellipsoid = WGS_1984|Primem = Greenwich|</pre>
      */
     @Test
     public void testSplitName() {
diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Convention.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Convention.java
index f8c2581ca7..a5e5d3a0a3 100644
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Convention.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Convention.java
@@ -296,7 +296,7 @@ public class Convention {
      * <div class="note"><b>Example:</b>
      * consider the following netCDF file (simplified):
      *
-     * {@preformat text
+     * <pre class="text">
      *   dimensions:
      *     grid_y =  161 ;
      *     grid_x =  126 ;
@@ -316,8 +316,7 @@ public class Convention {
      *     ushort SST(data_y, data_x) ;
      *       long_name = "Sea Surface Temperature" ;
      *       dim0 = "Line grids" ;
-     *       dim1 = "Pixel grids" ;
-     * }
+     *       dim1 = "Pixel grids" ;</pre>
      *
      * In this case, even if {@link #namesOfAxisVariables(Variable)} explicitly returns {@code {"Latitude", "Longitude"}}
      * we are still unable to associate the {@code SST} variable to those axes because they have no dimension in common.
diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/FeatureSet.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/FeatureSet.java
index 3e44370e91..b891a87ccc 100644
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/FeatureSet.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/FeatureSet.java
@@ -363,7 +363,7 @@ final class FeatureSet extends DiscreteSampling {
      * Those variable contains the actual data. For example if the sample dimension name
      * is "points", then we may have:
      *
-     * {@preformat text
+     * <pre class="text">
      *     double longitude(points);
      *         longitude:axis = "X";
      *         longitude:standard_name = "longitude";
@@ -376,8 +376,7 @@ final class FeatureSet extends DiscreteSampling {
      *         time:axis = "T";
      *         time:standard_name = "time";
      *         time:units = "minutes since 2014-11-29 00:00:00";
-     *     short myCustomProperty(points);
-     * }
+     *     short myCustomProperty(points);</pre>
      *
      * @param  features          where to add the {@code FeatureSet} instance.
      * @param  decoder           the source of the features to create.
diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridAdjustment.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridAdjustment.java
index 5dc97cdad4..e0dcc54157 100644
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridAdjustment.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridAdjustment.java
@@ -81,7 +81,7 @@ public final class GridAdjustment {
      * The mechanism is documented in {@link Convention#nameOfDimension(Variable, int)}.
      * For example, given a file with the following netCDF variables:
      *
-     * {@preformat text
+     * <pre class="text">
      *     float Latitude(grid_y, grid_x)
      *       dim0 = "Line grids"
      *       dim1 = "Pixel grids"
@@ -92,16 +92,14 @@ public final class GridAdjustment {
      *       resampling_interval = 10
      *     ushort SST(data_y, data_x)
      *       dim0 = "Line grids"
-     *       dim1 = "Pixel grids"
-     * }
+     *       dim1 = "Pixel grids"</pre>
      *
      * this method will add the following entries in the {@code toGridDimensions} map, provided that
      * the dimensions are not already keys in that map:
      *
-     * {@preformat text
+     * <pre class="text">
      *     "Line grids"   →  Dimension[grid_x]
-     *     "Pixel grids"  →  Dimension[grid_y]
-     * }
+     *     "Pixel grids"  →  Dimension[grid_y]</pre>
      *
      * @param  variable          the variable for which a "label to grid dimensions" mapping is desired.
      * @param  axes              all axes in the netCDF file (not only the variable axes).
diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/HYCOM.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/HYCOM.java
index 6feb96b583..467a30953a 100644
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/HYCOM.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/HYCOM.java
@@ -60,7 +60,7 @@ final class HYCOM {
      * If any variable uses the "day as %Y%m%d.%f" pseudo-units, converts to a number of days since the epoch.
      * The epoch is taken from the unit of the dimension. Example of netCDF file header:
      *
-     * {@preformat text
+     * <pre class="text">
      *     dimensions:
      *         MT = UNLIMITED ; // (1 currently)
      *         Y = 3298 ;
@@ -78,8 +78,7 @@ final class HYCOM {
      *             Date:FORTRAN_format = "(f13.4)" ;
      *     data:
      *         MT = 43024 ;
-     *         Date = 20181017.0000 ;
-     * }
+     *         Date = 20181017.0000 ;</pre>
      *
      * In this example, the real units of {@code Date(MT)} will be taken from {@code MT(MT)}, which is
      * "days since 1900-12-31 00:00:00".
diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
index fb0254c035..131d6b6247 100644
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
@@ -977,7 +977,7 @@ public abstract class Variable extends Node {
      * Multi-dimensional variables are flattened as a one-dimensional array (wrapped in a vector).
      * Example:
      *
-     * {@preformat text
+     * <pre class="text">
      *   DIMENSIONS:
      *     time: 3
      *     lat : 2
@@ -992,8 +992,7 @@ public abstract class Variable extends Node {
      *     (1,0,0) (1,0,1) (1,0,2) (1,0,3)
      *     (1,1,0) (1,1,1) (1,1,2) (1,1,3)
      *     (2,0,0) (2,0,1) (2,0,2) (2,0,3)
-     *     (2,1,0) (2,1,1) (2,1,2) (2,1,3)
-     * }
+     *     (2,1,0) (2,1,1) (2,1,2) (2,1,3)</pre>
      *
      * If {@link #hasRealValues()} returns {@code true}, then this method shall
      * {@linkplain #replaceNaN(Object) replace fill values and missing values by NaN values}.
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
index cf35c090dc..282074112e 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
@@ -1761,7 +1761,7 @@ parse:      for (int i = 0; i < length;) {
      * “Copyright, John Smith, 1992. All rights reserved.”
      * The result of above example will be:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Metadata
      *     └─Identification info
      *         └─Resource constraints
@@ -1774,8 +1774,7 @@ parse:      for (int i = 0; i < length;) {
      *                 └─Cited responsible party
      *                     ├─Party
      *                     │   └─Name…………………………… John Smith
-     *                     └─Role……………………………………… Owner
-     * }
+     *                     └─Role……………………………………… Owner</pre>
      *
      * Storage location is:
      *
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java
index b92ba3808c..15e8190b07 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java
@@ -37,15 +37,16 @@ import org.opengis.feature.AttributeType;
  * per line. For example, iteration over the following file will produce 4 {@code Feature} instances, even if there is
  * actually only three distinct instances because the feature "a" is splitted on 2 lines:
  *
- * {@preformat text
+ * {@snippet lang="csv" :
  *    a,  10, 150, 11.0 2.0 12.0 3.0
  *    b,  10, 190, 10.0 2.0 11.0 3.0
  *    a, 150, 190, 12.0 3.0 10.0 3.0
  *    c,  10, 190, 12.0 1.0 10.0 2.0 11.0 3.0
- * }
+ *    }
  *
- * <b>Multi-threading:</b> {@code Iter} is not thread-safe.
- * However, many {@code Iter} instances can be used concurrently for the same {@link Store} instance.
+ * <h2>Multi-threading</h2>
+ * {@code FeatureIterator} is not thread-safe.
+ * However, many {@code FeatureIterator} instances can be used concurrently for the same {@link Store} instance.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
index ad6a5e28ca..8c371d6432 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
@@ -36,12 +36,12 @@ import org.opengis.feature.Feature;
  * file will produce 3 {@code Feature} instances instead of 4, because the two lines of features "a"
  * will be merged in a single feature instance:
  *
- * {@preformat text
+ * {@snippet lang="csv" :
  *    a,  10, 150, 11.0 2.0 12.0 3.0
  *    b,  10, 190, 10.0 2.0 11.0 3.0
  *    a, 150, 190, 12.0 3.0 10.0 3.0
  *    c,  10, 190, 12.0 1.0 10.0 2.0 11.0 3.0
- * }
+ *    }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
index 4c5370968e..8c893f1178 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
@@ -342,9 +342,9 @@ final class Store extends URIDataStore implements FeatureSet {
      * The envelope returned by this method will be stored in the {@link #envelope} field.
      *
      * <p>Example:</p>
-     * {@preformat text
-     *   &#64;stboundedby, urn:ogc:def:crs:CRS:1.3:84, 2D, 50.23 9.23, 50.31 9.27, 2012-01-17T12:33:41Z, 2012-01-17T12:37:00Z, sec
-     * }
+     * {@snippet lang="csv" :
+     *   @stboundedby, urn:ogc:def:crs:CRS:1.3:84, 2D, 50.23 9.23, 50.31 9.27, 2012-01-17T12:33:41Z, 2012-01-17T12:37:00Z, sec
+     *   }
      *
      * This method sets {@link #timeEncoding} and {@link #spatialDimensionCount} as a side-effect.
      *
@@ -498,9 +498,9 @@ final class Store extends URIDataStore implements FeatureSet {
      * The feature type returned by this method will be stored in the {@link #featureType} field.
      *
      * <p>Example:</p>
-     * {@preformat text
-     *   &#64;columns, mfidref, trajectory, state,xsd:token, "type code",xsd:integer
-     * }
+     * {@snippet lang="csv" :
+     *   @columns, mfidref, trajectory, state,xsd:token, "type code",xsd:integer
+     *   }
      *
      * This method needs {@link #timeEncoding} and {@link #dissociate} to be computed.
      * This methods sets {@link #hasTrajectories} as a side-effect.
@@ -600,9 +600,9 @@ final class Store extends URIDataStore implements FeatureSet {
      * The value returned by this method will be stored in the {@link #foliation} field.
      *
      * <p>Example:</p>
-     * {@preformat text
-     *   &#64;foliation,Sequential
-     * }
+     * {@snippet lang="csv" :
+     *   @foliation,Sequential
+     *   }
      *
      * @param  elements  the line elements. The first elements should be {@code "@foliation"}.
      * @return the foliation metadata.
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java
index a9fb532ee4..63d65483f9 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java
@@ -29,14 +29,14 @@
  *
  * Example of moving features CSV file (adapted from OGC specification):
  *
- * {@preformat text
- *   &#64;stboundedby, urn:x-ogc:def:crs:EPSG::4326, 2D, 9.23 50.23, 9.27 50.31, 2012-01-17T12:33:41Z, 2012-01-17T12:37:00Z, sec
- *   &#64;columns,mfidref,trajectory,state,xsd:token,”type code”,xsd:integer
+ * {@snippet lang="csv" :
+ *   @stboundedby, urn:x-ogc:def:crs:EPSG::4326, 2D, 9.23 50.23, 9.27 50.31, 2012-01-17T12:33:41Z, 2012-01-17T12:37:00Z, sec
+ *   @columns,mfidref,trajectory,state,xsd:token,”type code”,xsd:integer
  *   a,  10, 150, 11.0 2.0 12.0 3.0, walking, 1
  *   b,  10, 190, 10.0 2.0 11.0 3.0, walking, 2
  *   a, 150, 190, 12.0 3.0 10.0 3.0, walking, 2
  *   c,  10, 190, 12.0 1.0 10.0 2.0 11.0 3.0, vehicle, 1
- * }
+ *   }
  *
  * <h2>Departures from OGC specification</h2>
  * Current implementation is not strictly compliant with the Moving Features specification.
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
index 392fcc13c2..61fd01b893 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
@@ -52,9 +52,7 @@ import org.apache.sis.util.resources.Errors;
  * <h2>Packaging data stores</h2>
  * JAR files that provide implementations of this class shall contain an entry with exactly the following path:
  *
- * {@preformat text
- *     META-INF/services/org.apache.sis.storage.DataStoreProvider
- * }
+ * <pre class="text">META-INF/services/org.apache.sis.storage.DataStoreProvider</pre>
  *
  * The above entry shall contain one line for each {@code DataStoreProvider} implementation provided in the JAR file,
  * where each line is the fully qualified name of the implementation class.
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/CoverageAggregator.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/CoverageAggregator.java
index 4711bd2c3a..efd75fb61e 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/CoverageAggregator.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/CoverageAggregator.java
@@ -54,7 +54,7 @@ import org.apache.sis.util.collection.BackingStoreException;
  * More specifically, {@code CoverageAggregator} organizes resources as below,
  * except that parent nodes having only one child are omitted:
  *
- * {@preformat text
+ * <pre class="text">
  *     Root aggregate
  *     ├─ All coverages with same sample dimensions #1
  *     │  └─ ...
@@ -64,8 +64,7 @@ import org.apache.sis.util.collection.BackingStoreException;
  *        └─ Coverages with equivalent reference systems #2
  *           ├─ Slices with compatible "grid to CRS" #1
  *           ├─ Slices with compatible "grid to CRS" #2
- *           └─ ...
- * }
+ *           └─ ...</pre>
  *
  * Where:
  *
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
index 879678970c..12c9973586 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
@@ -51,7 +51,7 @@ public final strictfp class MetadataBuilderTest extends TestCase {
      * Tests {@link MetadataBuilder#parseLegalNotice(String)}.
      * The expected result of this parsing is:
      *
-     * {@preformat text
+     * <pre class="text">
      *   Metadata
      *     └─Identification info
      *         └─Resource constraints
@@ -64,8 +64,7 @@ public final strictfp class MetadataBuilderTest extends TestCase {
      *                 └─Cited responsible party
      *                     ├─Party
      *                     │   └─Name…………………………… John Smith
-     *                     └─Role……………………………………… Owner
-     * }
+     *                     └─Role……………………………………… Owner</pre>
      */
     @Test
     public void testParseLegalNotice() {
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
index 421e59a612..072bcaabaa 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
@@ -135,12 +135,12 @@ public final strictfp class StoreTest extends TestCase {
     /**
      * Tests reading the data as a moving features. In the following data:
      *
-     * {@preformat text
+     * {@snippet lang="csv" :
      *     a,  10, 150, 11.0 2.0 12.0 3.0, walking, 1
      *     b,  10, 190, 10.0 2.0 11.0 3.0, walking, 2
      *     a, 150, 190, 12.0 3.0 10.0 3.0
      *     c,  10, 190, 12.0 1.0 10.0 2.0 11.0 3.0, vehicle, 1
-     * }
+     *     }
      *
      * the two rows for the "a" features shall be merged in a single trajectory.
      *


[sis] 06/06: Final cleanup for https://issues.apache.org/jira/browse/SIS-565

Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 7b8f3d62bf45acc059bf0654002cdf1d35eeb58e
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Dec 28 17:06:10 2022 +0100

    Final cleanup for https://issues.apache.org/jira/browse/SIS-565
---
 .../org/apache/sis/internal/doclet/Module.java     |  96 --------
 .../org/apache/sis/internal/doclet/Preformat.java  | 243 ---------------------
 pom.xml                                            |   2 -
 src/main/javadoc/sis.css                           |   6 +-
 4 files changed, 2 insertions(+), 345 deletions(-)

diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
deleted file mode 100644
index 65889114d7..0000000000
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.internal.doclet;
-
-import java.util.Set;
-import java.util.EnumSet;
-import java.nio.file.Path;
-import com.sun.source.doctree.DocTree;
-
-
-/**
- * The <code>@module</code> tag. This tag expects no argument.
- *
- * @author  Martin Desruisseaux (IRD, Geomatys)
- * @version 1.0
- * @since   0.3
- */
-public final class Module extends Taglet {
-    /**
-     * Constructs a <code>@module</code> taglet.
-     */
-    public Module() {
-    }
-
-    /**
-     * Returns the name of this custom tag.
-     *
-     * @return "module".
-     */
-    @Override
-    public String getName() {
-        return "module";
-    }
-
-    /**
-     * Returns the set of locations in which this taglet may be used.
-     *
-     * @return the set of locations in which this taglet may be used.
-     */
-    @Override
-    public Set<Location> getAllowedLocations() {
-        return EnumSet.of(Location.PACKAGE, Location.TYPE);
-    }
-
-    /**
-     * Returns {@code false} since <code>@module</code> is not an inline tag.
-     *
-     * @return always {@code false}.
-     */
-    @Override
-    public boolean isInlineTag() {
-        return false;
-    }
-
-    /**
-     * Given a {@code DocTree}s representing this custom tag, appends its string representation.
-     *
-     * @param  tag     the tag to format.
-     * @param  buffer  the buffer where to format the tag.
-     */
-    @Override
-    protected void format(final DocTree tag, final StringBuilder buffer) {
-        buffer.append("\n<p><font size=\"-1\">");
-        Path file = getCurrentFile();
-        if (file != null) {
-            String module = file.getFileName().toString();
-            while ((file = file.getParent()) != null) {
-                if (file.getFileName().toString().equals("src")) {
-                    file = file.getParent();
-                    if (file != null) {
-                        module = file.getFileName().toString();
-                    }
-                    break;
-                }
-            }
-            /*
-             * Appends the module link.
-             */
-            buffer.append("Defined in the <code>").append(module).append("</code> module").append("</font></p>\n");
-        }
-    }
-}
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
deleted file mode 100644
index 581da6e8d5..0000000000
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * 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.internal.doclet;
-
-import java.util.StringTokenizer;
-import com.sun.source.doctree.DocTree;
-import org.apache.sis.internal.book.CodeColorizer;
-
-
-/**
- * The <code>@preformat</code> tag for inserting a pre-formatted code in a javadoc comment.
- * The first word after the tag must be the format name ("java", "math", "wkt", "xml", "sql",
- * "shell" or "text").
- * The remaining is the text to format.
- *
- * <p>This taglet will automatically replace {@code &}, {@code <} and {@code >} by their HTML entities.
- * The only exception is {@code &#64;}, which is converted to the original {@code @} character because
- * we cannot use that character directly inside this taglet.</p>
- *
- * @author  Martin Desruisseaux (Geomatys)
- * @version 1.0
- * @since   0.3
- */
-public final class Preformat extends Taglet {
-    /**
-     * The set of legal words after {@code preformat}. We write them in lower-cases even if this is not
-     * conform to the Java convention for enumeration constants, because we will use {@link Enum#name()}
-     * for getting the string to look for after {@code preformat}.
-     */
-    private enum Style {
-        java, math, wkt, xml, sql, shell, text
-    }
-
-    /**
-     * Special characters to replace by HTML entities.
-     */
-    private static final String[] SPECIAL_CHARS = new String[] {
-        "&#64;", "@", // Because we cannot use @ directly in {@preformat}.
-        "&",     "&amp;",
-        "<",     "&lt;",
-        ">",     "&gt;"
-    };
-
-    /**
-     * Constructs a <code>@preformat</code> taglet.
-     */
-    public Preformat() {
-        super();
-    }
-
-    /**
-     * Returns the name of this custom tag.
-     *
-     * @return "preformat".
-     */
-    @Override
-    public String getName() {
-        return "preformat";
-    }
-
-    /**
-     * Given the <code>DocTree</code> representation of this custom tag, appends its string representation.
-     *
-     * @param  tag     the tag to format.
-     * @param  buffer  the buffer where to format the tag.
-     */
-    @Override
-    protected void format(final DocTree tag, final StringBuilder buffer) {
-        String text = text(tag).replace("\r\n", "\n").replace('\r', '\n');
-        String format = "<unspecified>";
-        /*
-         * Extracts the first word, which is expected to be the format name.
-         */
-        for (int i=0; i<text.length(); i++) {
-            if (Character.isWhitespace(text.charAt(i))) {
-                format = text.substring(0, i);
-                text = trim(text.substring(i));
-                break;
-            }
-        }
-        Style style;
-        try {
-            style = Style.valueOf(format);
-        } catch (IllegalArgumentException e) {
-            printWarning("Unknown format: " + format);
-            style = Style.text;
-        }
-        /*
-         * Counts the minimal amount of spaces in the margin.
-         */
-        int margin = 0;
-        StringTokenizer tk = new StringTokenizer(text, "\r\n");
-all:    while (tk.hasMoreTokens()) {
-            final String line = tk.nextToken();
-            int stop = line.length();
-            if (margin != 0 && margin < stop) {
-                stop = margin;
-            }
-            for (int i=0; i<stop; i++) {
-                if (!Character.isSpaceChar(line.charAt(i))) {
-                    if (margin == 0 || i < margin) {
-                        margin = i;
-                    }
-                    if (i == 0) {
-                        break all;
-                    }
-                    break;
-                }
-            }
-        }
-        /*
-         * Nows inserts each line.
-         */
-        buffer.append("<blockquote><pre>");
-        tk = new StringTokenizer(text, "\r\n", true);
-        while (tk.hasMoreTokens()) {
-            String line = tk.nextToken();
-            if (!line.startsWith("\n")) {
-                if (margin < line.length()) {
-                    line = line.substring(margin);
-                }
-                for (int i=0; i<SPECIAL_CHARS.length;) {
-                    line = line.replace(SPECIAL_CHARS[i++], SPECIAL_CHARS[i++]);
-                }
-                switch (style) {
-                    case java: colorJava(line, buffer); continue;
-                    case math: styleMath(line, buffer); continue;
-                }
-            }
-            buffer.append(line);
-        }
-        buffer.append("</pre></blockquote>");
-    }
-
-    /**
-     * Adds syntactic coloration for the given line.
-     */
-    private static void colorJava(final String line, final StringBuilder buffer) {
-        char quote = 0;                             // The kind of quoting in progress (" or ').
-        final int length = line.length();
-        for (int i=0; i<length; i++) {
-            final char c = line.charAt(i);
-            if (quote == 0) {
-                if (Character.isJavaIdentifierStart(c)) {
-                    int j = i;
-                    while (++j < length && Character.isJavaIdentifierPart(line.charAt(j)));
-                    final String word = line.substring(i, j);
-                    final boolean keyword = CodeColorizer.JAVA_KEYWORDS.contains(word);
-                    i = j-1;
-                    boolean function = false;
-                    if (!keyword || word.equals("this") || word.equals("super")) {
-                        while (j < length) {
-                            final char t = line.charAt(j++);
-                            if (!Character.isWhitespace(t)) {
-                                function = (t == '(');
-                                break;
-                            }
-                        }
-                    }
-                    if (function) buffer.append("<b>");
-                    if (keyword)  buffer.append("<font color=\"green\">");
-                    if (true)     buffer.append(word);
-                    if (keyword)  buffer.append("</font>");
-                    if (function) buffer.append("</b>");
-                    continue;
-                }
-                switch (c) {
-                    case '/': {
-                        if (i+1 < length && line.charAt(i+1) == '/') {
-                            buffer.append("<i><font color=\"gray\">").append(line.substring(i)).append("</font></i>");
-                            return;
-                        }
-                        break;
-                    }
-                    case '\'':                                 // fall through
-                    case '"': {
-                        quote = c;
-                        buffer.append("<font color=\"orangered\">").append(c);
-                        continue;
-                    }
-                }
-            } else if (c == quote) {
-                quote = 0;
-                buffer.append(c).append("</font>");
-                continue;
-            }
-            buffer.append(c);
-        }
-    }
-
-    /**
-     * Adds italic on variables in a math formulas.
-     * We will put in italic only the single latin letters.
-     */
-    private static void styleMath(final String line, final StringBuilder buffer) {
-        final int length = line.length();
-        for (int i=0; i<length; i++) {
-            final char c = line.charAt(i);
-            if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) {
-                if ((i == 0 || !Character.isLetterOrDigit(line.codePointBefore(i))) &&
-                    (i+1 >= length || !Character.isLetterOrDigit(line.codePointAt(i+1))))
-                {
-                    buffer.append("<var>").append(c).append("</var>");
-                    continue;
-                }
-            }
-            buffer.append(c);
-        }
-    }
-
-    /**
-     * Removes the leading and trailing linefeeds (but not other kind of spaces).
-     */
-    private static String trim(final String line) {
-        int high = line.length();
-        while (high != 0) {
-            final char c = line.charAt(high - 1);
-            if (c != '\r' && c != '\n') break;
-            high--;
-        }
-        int low = 0;
-        while (low != high) {
-            final char c = line.charAt(low);
-            if (c != '\r' && c != '\n') break;
-            low++;
-        }
-        return line.substring(low, high);
-    }
-}
diff --git a/pom.xml b/pom.xml
index 48a80bf84c..273d02a1f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -925,9 +925,7 @@
             <tag><placement>a</placement> <name>todo</name>     <head>TODO:</head></tag>
           </tags>
           <taglets>
-            <taglet><tagletClass>org.apache.sis.internal.doclet.Module</tagletClass></taglet>
             <taglet><tagletClass>org.apache.sis.internal.doclet.Include</tagletClass></taglet>
-            <taglet><tagletClass>org.apache.sis.internal.doclet.Preformat</tagletClass></taglet>
           </taglets>
           <doclet>org.apache.sis.internal.doclet.Doclet</doclet>
           <tagletArtifact>
diff --git a/src/main/javadoc/sis.css b/src/main/javadoc/sis.css
index cc771d60c3..7514090095 100644
--- a/src/main/javadoc/sis.css
+++ b/src/main/javadoc/sis.css
@@ -231,11 +231,9 @@ div.preformat {
 }
 
 /*
- * Output of {@preformat} inline tag.
+ * Preformatted blocks.
  */
-pre.code-sample {
-  margin-left:   40px;
-  margin-right:  40px;
+pre.text, pre.math {
   margin-top:    12px;
   margin-bottom: 12px;
 }