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 +-
.../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 +-
...actoryTest.java => StandardGeometriesTest.java} | 35 +++--
.../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/internal/jaxb/gml/CodeListAdapter.java | 12 +-
.../apache/sis/internal/jaxb/gml/GMLAdapter.java | 2 +-
.../apache/sis/internal/jaxb/gml/TimePeriod.java | 4 +-
.../apache/sis/internal/jaxb/gts/TM_Duration.java | 2 +-
.../sis/internal/jaxb/gts/TM_PeriodDuration.java | 2 +-
.../org/apache/sis/internal/jaxb/lan/Country.java | 20 ++-
.../apache/sis/internal/jaxb/lan/LanguageCode.java | 6 +-
.../sis/internal/jaxb/lan/LocaleAdapter.java | 4 +-
.../jaxb/lan/LocalisedCharacterString.java | 6 +-
.../apache/sis/internal/jaxb/lan/PT_FreeText.java | 4 +-
.../apache/sis/internal/jaxb/lan/PT_Locale.java | 30 ++--
.../apache/sis/internal/jaxb/lan/TextGroup.java | 4 +-
.../internal/jaxb/metadata/replace/Parameter.java | 5 +
.../jaxb/metadata/replace/QualityParameter.java | 20 ++-
.../metadata/replace/ReferenceSystemMetadata.java | 6 +-
.../internal/jaxb/metadata/replace/SensorType.java | 12 +-
.../jaxb/metadata/replace/ServiceParameter.java | 43 ++++--
.../sis/internal/metadata/ReferencingServices.java | 17 +--
.../sis/internal/metadata/sql/ScriptRunner.java | 35 ++++-
.../org/apache/sis/metadata/sql/Installer.java | 15 +-
.../main/java/org/apache/sis/util/iso/Types.java | 58 +++----
.../org.apache.sis.internal.util.MetadataServices | 1 +
.../sis/internal/jaxb/gco/MultiplicityTest.java | 22 ++-
.../sis/internal/jaxb/lan/PT_LocaleTest.java | 27 ++--
.../java/org/apache/sis/metadata/Assertions.java | 3 +-
.../metadata/iso/citation/DefaultCitationTest.java | 32 ++--
.../sis/metadata/iso/extent/DefaultExtentTest.java | 32 +++-
.../DefaultServiceIdentificationTest.java | 18 ++-
.../iso/lineage/DefaultProcessStepTest.java | 21 ++-
.../quality/AbstractPositionalAccuracyTest.java | 22 ++-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 52 ++++++-
.../java/org/apache/sis/test/sql/TestDatabase.java | 29 ++--
.../apache/sis/test/xml/DocumentComparator.java | 8 +-
.../java/org/apache/sis/test/xml/TestCase.java | 104 +++++++------
.../java/org/apache/sis/test/xml/package-info.java | 2 +-
.../sis/util/iso/DefaultNameFactoryTest.java | 5 +-
.../java/org/apache/sis/util/iso/TypesTest.java | 9 --
.../jaxb/referencing/CC_OperationParameter.java | 14 +-
.../apache/sis/internal/jaxb/referencing/Code.java | 6 +-
.../jaxb/referencing/SC_DerivedCRSType.java | 6 +-
.../internal/referencing/provider/Description.java | 41 +++--
.../referencing/provider/SatelliteTracking.java | 4 +-
.../sis/parameter/DefaultParameterDescriptor.java | 6 +-
.../sis/parameter/DefaultParameterValue.java | 2 +-
...pache.sis.internal.metadata.ReferencingServices | 1 +
.../sis/parameter/ParameterMarshallingTest.java | 43 +++++-
.../referencing/crs/DefaultCompoundCRSTest.java | 14 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 14 +-
.../referencing/crs/DefaultGeodeticCRSTest.java | 14 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 20 ++-
.../sis/referencing/cs/DefaultCartesianCSTest.java | 14 +-
.../referencing/cs/DefaultEllipsoidalCSTest.java | 14 +-
.../referencing/datum/DefaultEllipsoidTest.java | 24 +--
.../datum/DefaultGeodeticDatumTest.java | 12 +-
.../datum/DefaultPrimeMeridianTest.java | 15 +-
.../datum/DefaultTemporalDatumTest.java | 14 +-
.../datum/DefaultVerticalDatumTest.java | 25 +--
.../referencing/factory/sql/EPSGFactoryTest.java | 14 +-
.../DefaultConcatenatedOperationTest.java | 14 +-
.../operation/DefaultPassThroughOperationTest.java | 14 +-
.../operation/SingleOperationMarshallingTest.java | 17 ++-
.../operation/projection/InitializerTest.java | 8 +-
.../operation/transform/LinearTransformTest.java | 5 +-
.../transform/ProjectiveTransformTest.java | 3 -
.../sis/test/integration/MetadataVerticalTest.java | 15 +-
.../sis/internal/system/OptionalDependency.java | 50 ++----
.../apache/sis/internal/util/MetadataServices.java | 12 +-
.../org/apache/sis/internal/util/Numerics.java | 59 +------
.../java/org/apache/sis/math/SequenceVector.java | 5 +-
.../java/org/apache/sis/measure/NumberRange.java | 4 +-
.../java/org/apache/sis/setup/GeometryLibrary.java | 25 ++-
.../java/org/apache/sis/util/ArgumentChecks.java | 21 +++
.../src/main/java/org/apache/sis/util/Numbers.java | 13 +-
.../sis/util/ResourceInternationalString.java | 82 +++-------
.../org/apache/sis/internal/util/NumericsTest.java | 28 ----
.../test/java/org/apache/sis/test/TestCase.java | 2 -
.../java/org/apache/sis/test/TestUtilities.java | 16 +-
ide-project/NetBeans/build.xml | 14 ++
ide-project/NetBeans/nbproject/project.properties | 4 +-
pom.xml | 23 ++-
.../profile/fra/DirectReferenceSystemTest.java | 13 +-
.../apache/sis/profile/japan/JapanProfileTest.java | 26 ++--
.../sis/internal/netcdf/DiscreteSampling.java | 4 +-
.../jdbc/AbstractTestBaseForInternalJDBC.java | 3 +-
.../internal/shapefile/jdbc/DBFConnectionTest.java | 4 +-
.../internal/shapefile/jdbc/DBFResultSetTest.java | 2 -
.../internal/shapefile/jdbc/DBFStatementTest.java | 2 -
.../sis/storage/shapefile/ShapeFileTest.java | 3 +-
.../apache/sis/internal/sql/feature/Database.java | 2 +-
.../sis/internal/sql/feature/GeometryGetter.java | 6 +-
.../sis/internal/sql/feature/SelectionClause.java | 2 +-
.../internal/sql/feature/GeometryGetterTest.java | 12 +-
.../sql/feature/SelectionClauseWriterTest.java | 5 +-
.../sis/internal/sql/postgis/PostgresTest.java | 28 +++-
.../org/apache/sis/storage/sql/SQLStoreTest.java | 29 +++-
.../sis/internal/storage/MetadataBuilder.java | 5 +-
.../org/apache/sis/internal/storage/csv/Store.java | 4 +-
.../sis/internal/storage/wkt/StoreFormat.java | 4 +-
.../internal/storage/xml/MimeTypeDetectorTest.java | 6 +-
.../apache/sis/storage/StorageConnectorTest.java | 23 ++-
.../sis/internal/storage/gpx/Description.java | 62 ++++++++
.../org/apache/sis/internal/storage/gpx/Types.java | 7 +-
.../storage/xml/stream/StaxStreamReader.java | 3 +-
.../sis/internal/storage/gpx/ReaderTest.java | 27 ++--
.../apache/sis/internal/storage/gpx/TestData.java | 91 +++++++++++
.../sis/internal/storage/gpx/WriterTest.java | 35 +++--
178 files changed, 1839 insertions(+), 1134 deletions(-)
create mode 100644
core/sis-feature/src/main/java/org/apache/sis/internal/feature/StandardGeometries.java
copy
core/sis-feature/src/test/java/org/apache/sis/internal/feature/{j2d/FactoryTest.java
=> StandardGeometriesTest.java} (61%)
create mode 100644
core/sis-metadata/src/main/resources/META-INF/services/org.apache.sis.internal.util.MetadataServices
copy
application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java
=>
core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Description.java
(53%)
create mode 100644
core/sis-referencing/src/main/resources/META-INF/services/org.apache.sis.internal.metadata.ReferencingServices
create mode 100644
storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Description.java
create mode 100644
storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/TestData.java
