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:57 UTC

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

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 ...