[sis] 01/01: Merge branch 'geoapi-3.1'. This merge completes the preparation for JPMS (Jigsaw) and prepares the upgrade from JUnit 4 to JUnit 5.

2023-07-15 Thread desruisseaux
This is an automated email from the ASF dual-hosted git repository.

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

commit 3c78638b96e1e5cb3bacabc80a125f752148478f
Merge: f1ea236300 230b6bceb6
Author: Martin Desruisseaux 
AuthorDate: Sat Jul 15 15:55:53 2023 +0200

Merge branch 'geoapi-3.1'.
This merge completes the preparation for JPMS (Jigsaw)
and prepares the upgrade from JUnit 4 to JUnit 5.

https://github.com/apache/sis/pull/34

 .gitattributes |  43 --
 .../apache/sis/console/MimeTypeCommandTest.java|  14 +-
 .../gui/referencing/PositionableProjection.java|  10 ++
 application/sis-webapp/pom.xml |  10 +-
 .../org/apache/sis/services/ServletListener.java   |   6 +-
 .../org/apache/sis/coverage/SampleDimension.java   |  16 +-
 .../apache/sis/feature/DefaultAttributeType.java   |   5 +-
 .../sis/feature/GroupAsPolylineOperation.java  |   4 +-
 .../sis/feature/builder/FeatureTypeBuilder.java|   2 +-
 .../apache/sis/filter/BinaryGeometryFilter.java|  30 ++--
 .../org/apache/sis/filter/BinarySpatialFilter.java |  15 +-
 .../apache/sis/filter/DefaultFilterFactory.java|   4 +-
 .../java/org/apache/sis/filter/DistanceFilter.java |  23 ++-
 .../apache/sis/internal/feature/Geometries.java|  99 
 .../sis/internal/feature/GeometryFactories.java|  26 +++-
 .../sis/internal/feature/GeometryWithCRS.java  |  13 +-
 .../sis/internal/feature/GeometryWrapper.java  |  72 +
 .../org/apache/sis/internal/feature/Resources.java |   5 +
 .../sis/internal/feature/Resources.properties  |   1 +
 .../sis/internal/feature/Resources_fr.properties   |   1 +
 .../internal/feature/SpatialOperationContext.java  |  12 +-
 .../sis/internal/feature/StandardGeometries.java   | 170 +
 .../apache/sis/internal/feature/esri/Factory.java  |  44 --
 .../apache/sis/internal/feature/esri/Wrapper.java  |  13 +-
 .../sis/internal/feature/esri/package-info.java|   2 +-
 .../apache/sis/internal/feature/j2d/Factory.java   |  22 +--
 .../sis/internal/feature/j2d/PointWrapper.java |  12 +-
 .../apache/sis/internal/feature/j2d/Wrapper.java   |  12 +-
 .../sis/internal/feature/j2d/package-info.java |   2 +-
 .../apache/sis/internal/feature/jts/Factory.java   |  57 ---
 .../apache/sis/internal/feature/jts/Wrapper.java   |  53 +--
 .../sis/internal/filter/GeometryConverter.java |   8 +-
 .../java/org/apache/sis/internal/filter/Node.java  |  12 +-
 .../internal/filter/sqlmm/GeometryConstructor.java |   9 +-
 .../sis/internal/filter/sqlmm/GeometryParser.java  |  11 +-
 .../sis/internal/filter/sqlmm/OneGeometry.java |  15 +-
 .../apache/sis/internal/filter/sqlmm/SQLMM.java|   2 +-
 .../sis/internal/filter/sqlmm/ST_FromBinary.java   |   2 +-
 .../sis/internal/filter/sqlmm/ST_FromText.java |   2 +-
 .../apache/sis/internal/filter/sqlmm/ST_Point.java |  21 ++-
 .../sis/internal/filter/sqlmm/ST_Transform.java|  10 +-
 .../sis/internal/filter/sqlmm/SpatialFunction.java |   2 +-
 .../sis/internal/filter/sqlmm/TwoGeometries.java   |  23 ++-
 .../apache/sis/feature/EnvelopeOperationTest.java  |   6 +-
 .../sis/filter/BinarySpatialFilterTestCase.java|   4 +-
 .../sis/internal/feature/GeometriesTestCase.java   |  14 +-
 .../internal/feature/StandardGeometriesTest.java   |  59 +++
 .../sis/internal/feature/esri/FactoryTest.java |  22 ++-
 .../apache/sis/internal/feature/jts/JTSTest.java   |  14 +-
 .../internal/filter/sqlmm/RegistryTestCase.java|   8 +-
 .../sis/internal/jaxb/code/MD_ObligationCode.java  |   2 +-
 .../sis/internal/jaxb/gco/GO_CharacterString.java  |  20 ++-
 .../apache/sis/internal/jaxb/gco/GO_DateTime.java  |   4 +-
 .../apache/sis/internal/jaxb/gco/GO_Distance.java  |   2 +-
 .../apache/sis/internal/jaxb/gco/GO_Integer.java   |   2 +-
 .../apache/sis/internal/jaxb/gco/GO_Measure.java   |   2 +-
 .../internal/jaxb/gco/GO_MultiplicityRange.java|   8 +-
 .../org/apache/sis/internal/jaxb/gco/GO_Real.java  |   2 +-
 .../apache/sis/internal/jaxb/gco/GO_Record.java|   2 +-
 .../sis/internal/jaxb/gco/GO_RecordType.java   |   2 +-
 .../apache/sis/internal/jaxb/gco/GO_Temporal.java  |   4 +-
 .../org/apache/sis/internal/jaxb/gco/GO_URL.java   |   6 +-
 .../sis/internal/jaxb/gco/GO_UnlimitedInteger.java |   4 +-
 .../jaxb/gco/InternationalStringAdapter.java   |   2 +-
 .../apache/sis/internal/jaxb/gco/Multiplicity.java |   2 +-
 .../sis/internal/jaxb/gco/MultiplicityRange.java   |   8 +-
 .../sis/internal/jaxb/gco/StringAdapter.java   |   2 +-
 .../sis/internal/jaxb/gco/UnlimitedInteger.java|  16 +-
 .../org/apache/sis/internal/jaxb/gcx/Anchor.java   |   2 +-
 .../org/apache/sis/internal/jaxb/gcx/FileName.java |   4 +-
 .../apache/sis/internal/jaxb/gcx/MimeFileType.java |   4 +-
 .../sis/internal/jaxb/geometry/GM_Object.java  |   2 +-
 

[sis] branch master updated (f1ea236300 -> 3c78638b96)

2023-07-15 Thread desruisseaux
This is an automated email from the ASF dual-hosted git repository.

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


from f1ea236300 Merge branch 'geoapi-3.1'. This merge prepares Apache SIS 
to JPMS (Jigsaw) modularisation.
 add 927b7a8dad Post-merge cleanup.
 add d168fb0b19 Complete the list of files to handle as text or binary 
files.
 add 5603926dfb Make `SampleDimension.Builder` more robust to cases where 
the given range is empty.
 add 22f15fab7b Add a new `GeometryLibrary.GEOAPI` enumeration which 
exposes the JTS, ERSI or Java2D wrapper as an org.opengis.geometry.Geometry 
instance.
 add 85aeeb0626 Remove `Numerics.CACHE` in anticipation for "Value object" 
in future Java version. We note also that the standard autoboxing method is 
flagged as @IntrinsicCandidate.
 add 4984b31e9c Replace reflection by `ServiceLoader` uses in the 
`OptionalDependency` class. This is needed because reflection no longer works 
after module encapsulation.
 add 6812aa0843 Give public access to JAXB adapters in internal API. It 
reduces the needs for `opens` statements in `module-info.java`.
 add 659e00a438 All tests shall open resource files from the module 
containing the resources. This is necessary for making possible to execute 
those tests in JPMS context.
 add 25eb197481 Relax a check from `assertSame(…) to `assertEquals(…)` for 
test that may depend on execution order. With Maven, we used some custom 
annotation for controlling JUnit execution order. After JPMS migration, we will 
have (at least temporarily) less control on that.
 add 0cd54bd9de `ResourceInternationalString` needs to let subclasses 
invoke `ResourceBundle.getBundle(…)` themselves. This is necessary in a JPMS 
context, because this class is not allowed to load resources of another module.
 add bb45c5eb60 Avoid using `ServiceLoader` directly in the test, because 
it will not run in a JPMS context. Opportunistic warning resolution.
 add b8ba8d1b84 Remove @RunWith(TestRunner.class) annotation. They are no 
longer necessary since their removal in GeoAPI 4.0 development branch.
 add 7834870b72 Upgrade dependency from JUnit 4 to JUnit 5 vintage. The 
tests themselves are not yet modified.
 add ec94f00ea7 Upgrade dependencies.
 add 61e182e593 Remove the geotoolkit repository. It was used for GeoAPI 
snapshots, but we do not deploy them anymore for more than 2 years. Developers 
should stay on the `master` branch, or if they really want to build the 
`geoapi-4.0` or `geoapi-3.1` branch then they need to build GeoAPI locally from 
the sources at the same date. This is very unconvenient, but we will try to 
provide a better solution with a more flexibile build system (possibly by 
migrating from Maven to Gradle).
 add 27912b1368 Update NetBeans project configuration for compatibility 
with recent changes. Note that we may delete this configuration in favor of 
pure Maven or Gradle project in the future, so the NetBeans project files may 
be temporary.
 add 18e2964bf2 `ScriptRunner.run(…)` shall receive an `InputStream` 
supplied by the caller instead of invoking `Class.getResourceAsStream(String)` 
as a convenience. This is necessary in JPMS (Jigsaw) context.
 add c25bbe6e9c Ensure that `InputStream` marks are supported in a test 
that need them. This is not always the case in a JPMS context.
 add 3c96c2597c Opens two more classes to reflection by JAXB in JPMS 
context.
 add f5390fda93 Upgrade JavaEE (now JakartaEE) and OSGi dependencies. They 
are used in incubated modules only, not released. JakartaEE is narrowed to the 
servlet API part only.
 add 7c87ae6e32 Avoid dependency toward `org.apache.sis.test` in modules 
that are still in incubating phase. Those modules were always excluded from 
Apache SIS releases. For making future releases easier, the incubated modules 
may move in a separated group of modules, for example an "incubator" group.
 add 230b6bceb6 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge 
contains more preparation for JPMS (Jigsaw) modularisation, mostly in ensuring 
that resources are loaded inside the boundaries of the module that contains 
them.
 new 3c78638b96 Merge branch 'geoapi-3.1'. This merge completes the 
preparation for JPMS (Jigsaw) and prepares the upgrade from JUnit 4 to JUnit 5.

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


Summary of changes:
 .gitattributes |  43 --
 .../apache/sis/console/MimeTypeCommandTest.java|  14 +-
 .../gui/referencing/PositionableProjection.java|  10 ++
 application/sis-webapp/pom.xml |  10 +-
 .../org/apache/sis/services/ServletListener.java   |   6 +-
 

[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This merge contains more preparation for JPMS (Jigsaw) modularisation, mostly in ensuring that resources are loaded inside the boundaries of the

2023-07-15 Thread desruisseaux
This is an automated email from the ASF dual-hosted git repository.

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

commit 230b6bceb613af544c6f1e162c28bca2ab7ed708
Merge: 4afa8fd56a 7c87ae6e32
Author: Martin Desruisseaux 
AuthorDate: Sat Jul 15 14:35:06 2023 +0200

Merge branch 'geoapi-4.0' into geoapi-3.1.
This merge contains more preparation for JPMS (Jigsaw) modularisation,
mostly in ensuring that resources are loaded inside the boundaries of
the module that contains them.

 .gitattributes |  43 --
 .../apache/sis/console/MimeTypeCommandTest.java|  14 +-
 .../gui/referencing/PositionableProjection.java|  10 ++
 application/sis-webapp/pom.xml |  10 +-
 .../org/apache/sis/services/ServletListener.java   |   6 +-
 .../test/java/org/apache/sis/cql/CQLTestCase.java  |   3 +-
 .../org/apache/sis/coverage/SampleDimension.java   |  16 +-
 .../apache/sis/feature/DefaultAttributeType.java   |   5 +-
 .../sis/feature/GroupAsPolylineOperation.java  |   4 +-
 .../sis/feature/builder/FeatureTypeBuilder.java|   2 +-
 .../apache/sis/filter/BinaryGeometryFilter.java|  30 ++--
 .../org/apache/sis/filter/BinarySpatialFilter.java |  15 +-
 .../apache/sis/filter/DefaultFilterFactory.java|   4 +-
 .../java/org/apache/sis/filter/DistanceFilter.java |  23 ++-
 .../apache/sis/internal/feature/Geometries.java|  99 
 .../sis/internal/feature/GeometryFactories.java|  26 +++-
 .../sis/internal/feature/GeometryWithCRS.java  |  13 +-
 .../sis/internal/feature/GeometryWrapper.java  |  72 +
 .../org/apache/sis/internal/feature/Resources.java |   5 +
 .../sis/internal/feature/Resources.properties  |   1 +
 .../sis/internal/feature/Resources_fr.properties   |   1 +
 .../internal/feature/SpatialOperationContext.java  |  12 +-
 .../sis/internal/feature/StandardGeometries.java   | 170 +
 .../apache/sis/internal/feature/esri/Factory.java  |  44 --
 .../apache/sis/internal/feature/esri/Wrapper.java  |  13 +-
 .../sis/internal/feature/esri/package-info.java|   2 +-
 .../apache/sis/internal/feature/j2d/Factory.java   |  22 +--
 .../sis/internal/feature/j2d/PointWrapper.java |  14 +-
 .../apache/sis/internal/feature/j2d/Wrapper.java   |  12 +-
 .../sis/internal/feature/j2d/package-info.java |   2 +-
 .../apache/sis/internal/feature/jts/Factory.java   |  57 ---
 .../apache/sis/internal/feature/jts/Wrapper.java   |  53 +--
 .../sis/internal/filter/GeometryConverter.java |   8 +-
 .../java/org/apache/sis/internal/filter/Node.java  |  12 +-
 .../internal/filter/sqlmm/GeometryConstructor.java |   9 +-
 .../sis/internal/filter/sqlmm/GeometryParser.java  |  11 +-
 .../sis/internal/filter/sqlmm/OneGeometry.java |  15 +-
 .../apache/sis/internal/filter/sqlmm/SQLMM.java|   2 +-
 .../sis/internal/filter/sqlmm/ST_FromBinary.java   |   2 +-
 .../sis/internal/filter/sqlmm/ST_FromText.java |   2 +-
 .../apache/sis/internal/filter/sqlmm/ST_Point.java |  21 ++-
 .../sis/internal/filter/sqlmm/ST_Transform.java|  10 +-
 .../sis/internal/filter/sqlmm/SpatialFunction.java |   2 +-
 .../sis/internal/filter/sqlmm/TwoGeometries.java   |  23 ++-
 .../apache/sis/feature/EnvelopeOperationTest.java  |   6 +-
 .../sis/filter/BinarySpatialFilterTestCase.java|   4 +-
 .../sis/internal/feature/GeometriesTestCase.java   |  14 +-
 .../internal/feature/StandardGeometriesTest.java   |  59 +++
 .../sis/internal/feature/esri/FactoryTest.java |  22 ++-
 .../apache/sis/internal/feature/jts/JTSTest.java   |  14 +-
 .../internal/filter/sqlmm/RegistryTestCase.java|   8 +-
 .../sis/internal/jaxb/code/MD_ObligationCode.java  |   2 +-
 .../internal/jaxb/code/SV_ParameterDirection.java  |   2 +-
 .../sis/internal/jaxb/gco/GO_CharacterString.java  |  20 ++-
 .../apache/sis/internal/jaxb/gco/GO_DateTime.java  |   4 +-
 .../apache/sis/internal/jaxb/gco/GO_Distance.java  |   2 +-
 .../apache/sis/internal/jaxb/gco/GO_Integer.java   |   2 +-
 .../apache/sis/internal/jaxb/gco/GO_Measure.java   |   2 +-
 .../internal/jaxb/gco/GO_MultiplicityRange.java|   8 +-
 .../org/apache/sis/internal/jaxb/gco/GO_Real.java  |   2 +-
 .../apache/sis/internal/jaxb/gco/GO_Record.java|   2 +-
 .../sis/internal/jaxb/gco/GO_RecordType.java   |   2 +-
 .../apache/sis/internal/jaxb/gco/GO_Temporal.java  |   4 +-
 .../org/apache/sis/internal/jaxb/gco/GO_URL.java   |   6 +-
 .../sis/internal/jaxb/gco/GO_UnlimitedInteger.java |   4 +-
 .../jaxb/gco/InternationalStringAdapter.java   |   2 +-
 .../apache/sis/internal/jaxb/gco/Multiplicity.java |   2 +-
 .../sis/internal/jaxb/gco/MultiplicityRange.java   |   8 +-
 .../sis/internal/jaxb/gco/StringAdapter.java   |   2 +-
 .../sis/internal/jaxb/gco/UnlimitedInteger.java|  16 +-
 .../org/apache/sis/internal/jaxb/gcx/Anchor.java   |   2 +-
 

[sis] branch geoapi-3.1 updated (4afa8fd56a -> 230b6bceb6)

2023-07-15 Thread desruisseaux
This is an automated email from the ASF dual-hosted git repository.

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


from 4afa8fd56a Merge branch 'geoapi-4.0' into geoapi-3.1. They are the 
commits from pull request #34.
 add 927b7a8dad Post-merge cleanup.
 add d168fb0b19 Complete the list of files to handle as text or binary 
files.
 add 5603926dfb Make `SampleDimension.Builder` more robust to cases where 
the given range is empty.
 add 22f15fab7b Add a new `GeometryLibrary.GEOAPI` enumeration which 
exposes the JTS, ERSI or Java2D wrapper as an org.opengis.geometry.Geometry 
instance.
 add 85aeeb0626 Remove `Numerics.CACHE` in anticipation for "Value object" 
in future Java version. We note also that the standard autoboxing method is 
flagged as @IntrinsicCandidate.
 add 4984b31e9c Replace reflection by `ServiceLoader` uses in the 
`OptionalDependency` class. This is needed because reflection no longer works 
after module encapsulation.
 add 6812aa0843 Give public access to JAXB adapters in internal API. It 
reduces the needs for `opens` statements in `module-info.java`.
 add 659e00a438 All tests shall open resource files from the module 
containing the resources. This is necessary for making possible to execute 
those tests in JPMS context.
 add 25eb197481 Relax a check from `assertSame(…) to `assertEquals(…)` for 
test that may depend on execution order. With Maven, we used some custom 
annotation for controlling JUnit execution order. After JPMS migration, we will 
have (at least temporarily) less control on that.
 add 0cd54bd9de `ResourceInternationalString` needs to let subclasses 
invoke `ResourceBundle.getBundle(…)` themselves. This is necessary in a JPMS 
context, because this class is not allowed to load resources of another module.
 add bb45c5eb60 Avoid using `ServiceLoader` directly in the test, because 
it will not run in a JPMS context. Opportunistic warning resolution.
 add b8ba8d1b84 Remove @RunWith(TestRunner.class) annotation. They are no 
longer necessary since their removal in GeoAPI 4.0 development branch.
 add 7834870b72 Upgrade dependency from JUnit 4 to JUnit 5 vintage. The 
tests themselves are not yet modified.
 add ec94f00ea7 Upgrade dependencies.
 add 61e182e593 Remove the geotoolkit repository. It was used for GeoAPI 
snapshots, but we do not deploy them anymore for more than 2 years. Developers 
should stay on the `master` branch, or if they really want to build the 
`geoapi-4.0` or `geoapi-3.1` branch then they need to build GeoAPI locally from 
the sources at the same date. This is very unconvenient, but we will try to 
provide a better solution with a more flexibile build system (possibly by 
migrating from Maven to Gradle).
 add 27912b1368 Update NetBeans project configuration for compatibility 
with recent changes. Note that we may delete this configuration in favor of 
pure Maven or Gradle project in the future, so the NetBeans project files may 
be temporary.
 add 18e2964bf2 `ScriptRunner.run(…)` shall receive an `InputStream` 
supplied by the caller instead of invoking `Class.getResourceAsStream(String)` 
as a convenience. This is necessary in JPMS (Jigsaw) context.
 add c25bbe6e9c Ensure that `InputStream` marks are supported in a test 
that need them. This is not always the case in a JPMS context.
 add 3c96c2597c Opens two more classes to reflection by JAXB in JPMS 
context.
 add f5390fda93 Upgrade JavaEE (now JakartaEE) and OSGi dependencies. They 
are used in incubated modules only, not released. JakartaEE is narrowed to the 
servlet API part only.
 add 7c87ae6e32 Avoid dependency toward `org.apache.sis.test` in modules 
that are still in incubating phase. Those modules were always excluded from 
Apache SIS releases. For making future releases easier, the incubated modules 
may move in a separated group of modules, for example an "incubator" group.
 new 230b6bceb6 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge 
contains more preparation for JPMS (Jigsaw) modularisation, mostly in ensuring 
that resources are loaded inside the boundaries of the module that contains 
them.

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


Summary of changes:
 .gitattributes |  43 --
 .../apache/sis/console/MimeTypeCommandTest.java|  14 +-
 .../gui/referencing/PositionableProjection.java|  10 ++
 application/sis-webapp/pom.xml |  10 +-
 .../org/apache/sis/services/ServletListener.java   |   6 +-
 .../test/java/org/apache/sis/cql/CQLTestCase.java  |   3 +-
 .../org/apache/sis/coverage/SampleDimension.java   |  16 +-
 .../apache/sis/feature/DefaultAttributeType.java   |   5 +-
 

[sis] branch geoapi-4.0 updated: Avoid dependency toward `org.apache.sis.test` in modules that are still in incubating phase. Those modules were always excluded from Apache SIS releases. For making fu

2023-07-15 Thread desruisseaux
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


The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
 new 7c87ae6e32 Avoid dependency toward `org.apache.sis.test` in modules 
that are still in incubating phase. Those modules were always excluded from 
Apache SIS releases. For making future releases easier, the incubated modules 
may move in a separated group of modules, for example an "incubator" group.
7c87ae6e32 is described below

commit 7c87ae6e3265f7a5a787164f50a505c108c5906d
Author: Martin Desruisseaux 
AuthorDate: Sat Jul 15 11:55:19 2023 +0200

Avoid dependency toward `org.apache.sis.test` in modules that are still in 
incubating phase.
Those modules were always excluded from Apache SIS releases. For making 
future releases easier,
the incubated modules may move in a separated group of modules, for example 
an "incubator" group.
---
 core/sis-cql/src/test/java/org/apache/sis/cql/CQLTestCase.java| 3 +--
 .../sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java  | 3 +--
 .../org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java | 4 +---
 .../java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java | 2 --
 .../java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java | 2 --
 .../src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java | 3 +--
 6 files changed, 4 insertions(+), 13 deletions(-)

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 a405b7ea36..9403c3edfc 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
@@ -19,7 +19,6 @@ package org.apache.sis.cql;
 import org.opengis.filter.FilterFactory;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.apache.sis.filter.DefaultFilterFactory;
-import org.apache.sis.test.TestCase;
 import org.opengis.feature.Feature;
 
 
@@ -30,7 +29,7 @@ import org.opengis.feature.Feature;
  * @version 1.1
  * @since   1.1
  */
-abstract class CQLTestCase extends TestCase {
+abstract class CQLTestCase {
 /**
  * The factory to use for creating filter and expressions.
  */
diff --git 
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
 
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
index 62d79b1a42..a8157c17cc 100644
--- 
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
+++ 
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
@@ -28,7 +28,6 @@ import java.sql.SQLException;
 import java.util.logging.Logger;
 
 import org.apache.sis.storage.shapefile.ShapeFileTest;
-import org.apache.sis.test.TestCase;
 import org.junit.Before;
 
 /**
@@ -36,7 +35,7 @@ import org.junit.Before;
  * all these tests are currently based on the SignedBikeRoute_4326_clipped.dbf 
DBase 3 file.
  * @author Marc LE BIHAN
  */
-public abstract class AbstractTestBaseForInternalJDBC extends TestCase {
+public abstract class AbstractTestBaseForInternalJDBC {
 /** Logger. */
 protected Logger log = 
Logger.getLogger("org.apache.sis.internal.shapefile.jdbc");
 
diff --git 
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
 
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
index 0221a4c086..18d9d27bdf 100644
--- 
a/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
+++ 
b/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
@@ -20,7 +20,6 @@ import java.sql.*;
 import java.util.Properties;
 
 import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.test.DependsOnMethod;
 import org.junit.*;
 
 import static org.junit.Assert.*;
@@ -57,7 +56,7 @@ public class DBFConnectionTest extends 
AbstractTestBaseForInternalJDBC {
 public void openCloseConnectionWithAnotherCharset() throws SQLException {
 Properties info = new Properties();
 info.put("record_charset", "UTF-8");
-
+
 final Driver driver = new DBFDriver();
 final Connection connection = 
driver.connect(this.dbfFile.getAbsolutePath(), info);
 assertFalse("Connection should be opened", connection.isClosed());
@@ -73,7 +72,6 @@ public class DBFConnectionTest extends 
AbstractTestBaseForInternalJDBC {
  * @throws SQLException if an error occurred while opening the database.
  */
 @Test(expected=SQLConnectionClosedException.class)
-@DependsOnMethod("openCloseConnection")