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 2dbd6f306ffc8e59333ca1f025f7dfe9fccedefe
Merge: b9602ed1a7 5cf53d65d2
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Dec 26 19:35:30 2022 +0100
Upgrade GeoAPI dependency from 3.0.1 to 3.0.2 release candidate.
It implies an upgrade of Unit API from JSR-363 to JSR-385.
The JSR upgrade is done by the merge of branch 'geoapi-3.1'.
https://issues.apache.org/jira/browse/SIS-563
NOTICE | 4 +-
README | 4 +-
.../java/org/apache/sis/xml/ValueConverter.java | 4 +-
.../java/org/apache/sis/io/wkt/AbstractParser.java | 4 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 4 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 4 +-
.../referencing/factory/sql/EPSGDataAccess.java | 4 +-
.../sis/internal/converter/StringConverter.java | 4 +-
.../java/org/apache/sis/io/CompoundFormat.java | 2 +-
.../org/apache/sis/measure/AbstractConverter.java | 8 +-
.../java/org/apache/sis/measure/AbstractUnit.java | 86 +++++++++++++++-
.../org/apache/sis/measure/ConventionalUnit.java | 10 +-
.../apache/sis/measure/DefaultQuantityFactory.java | 75 ++++++++++++++
.../org/apache/sis/measure/LinearConverter.java | 8 +-
.../java/org/apache/sis/measure/Quantities.java | 4 +-
.../org/apache/sis/measure/QuantityFormat.java | 110 ++++++++++++++++++++-
.../main/java/org/apache/sis/measure/Scalar.java | 53 +++++++++-
.../java/org/apache/sis/measure/SystemUnit.java | 18 +++-
.../java/org/apache/sis/measure/UnitFormat.java | 44 +++++----
.../java/org/apache/sis/measure/UnitRegistry.java | 25 ++++-
.../java/org/apache/sis/measure/UnitServices.java | 83 +++++++++++-----
.../main/java/org/apache/sis/measure/Units.java | 8 +-
.../java/org/apache/sis/measure/package-info.java | 2 +-
.../org/apache/sis/measure/QuantitiesTest.java | 5 +-
.../org/apache/sis/measure/SystemUnitTest.java | 4 +-
.../org/apache/sis/measure/UnitDimensionTest.java | 4 +-
.../org/apache/sis/measure/UnitFormatTest.java | 12 +--
.../org/apache/sis/measure/UnitServicesTest.java | 13 +--
ide-project/NetBeans/nbproject/project.properties | 6 +-
pom.xml | 11 ++-
.../apache/sis/internal/earth/netcdf/GCOM_C.java | 6 +-
.../apache/sis/internal/earth/netcdf/GCOM_W.java | 6 +-
.../org/apache/sis/internal/netcdf/Convention.java | 6 +-
.../org/apache/sis/internal/netcdf/Variable.java | 4 +-
.../sis/internal/netcdf/impl/ChannelDecoder.java | 4 +-
.../sis/internal/netcdf/impl/VariableInfo.java | 6 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 6 +-
37 files changed, 529 insertions(+), 132 deletions(-)
diff --cc README
index d617b55a6d,6d6ccb228f..ff9a4fab0c
--- a/README
+++ b/README
@@@ -3,7 -3,7 +3,7 @@@ Welcome to Apache SIS <https://sis.apac
==============================================
SIS is a Java language library for developing geospatial applications.
--The library is an implementation of GeoAPI 3.0.1 interfaces and can be used
++The library is an implementation of GeoAPI 3.0.2 interfaces and can be used
for desktop or server applications. Apache SIS provides data structures for
geographic features and associated metadata along with methods to manipulate
those data structures. The SIS metadata module forms the base of the library
diff --cc ide-project/NetBeans/nbproject/project.properties
index 1188080b9f,bad85c7086..dbcefa18a9
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -90,8 -91,8 +90,8 @@@ test.jpn-profile.dir = ${project.root}/
# Those dependencies must exist in the local Maven repository.
# Those numbers should match the ones declared in the pom.xml files.
#
- geoapi.version = 3.0.1
- jsr363.version = 1.0
-geoapi.version = 3.1-SNAPSHOT
++geoapi.version = 3.0.2
+ jsr385.version = 2.1.3
jaxb.version = 2.3.3
jaxb.runtime = 2.3.7
istack.version = 3.0.12
@@@ -123,8 -124,8 +123,8 @@@ postgresql.version = 42.5.
maven.repository = ${user.home}/.m2/repository
endorsed.classpath =
javac.classpath=\
-
${maven.repository}/org/opengis/geoapi-pending/${geoapi.version}/geoapi-pending-${geoapi.version}.jar:\
+
${maven.repository}/org/opengis/geoapi/${geoapi.version}/geoapi-${geoapi.version}.jar:\
-
${maven.repository}/javax/measure/unit-api/${jsr363.version}/unit-api-${jsr363.version}.jar:\
+
${maven.repository}/javax/measure/unit-api/${jsr385.version}/unit-api-${jsr385.version}.jar:\
${maven.repository}/jakarta/xml/bind/jakarta.xml.bind-api/${jaxb.version}/jakarta.xml.bind-api-${jaxb.version}.jar:\
${maven.repository}/com/esri/geometry/esri-geometry-api/${esri.api.version}/esri-geometry-api-${esri.api.version}.jar:\
${maven.repository}/org/locationtech/jts/jts-core/${jts.version}/jts-core-${jts.version}.jar:\
diff --cc pom.xml
index ed1eadd793,1eef11c8a4..5192839f31
--- a/pom.xml
+++ b/pom.xml
@@@ -58,7 -58,7 +58,7 @@@
<description>
Apache Spatial Information System (SIS) is a free software, Java language
library for developing geospatial applications.
SIS provides data structures for geographic features and associated
metadata along with methods to manipulate those data structures.
-- The library is an implementation of GeoAPI 3.0.1 interfaces and can be
used for desktop or server applications.
++ The library is an implementation of GeoAPI 3.0.2 interfaces and can be
used for desktop or server applications.
The SIS metadata module forms the base of the library and enables the
creation of metadata objects which comply with the ISO 19115 international
standard.
The SIS referencing module enable the construction of geodetic data
structures for geospatial referencing as defined by ISO 19111 standard,
along with the associated operations which enable the transformation of
coordinates between different reference systems.
@@@ -552,7 -552,7 +552,7 @@@
<sis.plugin.version>${project.version}</sis.plugin.version>
<sis.non-free.version>1.3</sis.non-free.version> <!-- Used
only if "non-free" profile is activated. -->
<javafx.version>19</javafx.version> <!-- Used
only if "javafx" profile is activated. -->
- <geoapi.version>3.0.1</geoapi.version>
- <geoapi.version>3.1-SNAPSHOT</geoapi.version>
++ <geoapi.version>3.0.2</geoapi.version>
</properties>
<profiles>
@@@ -987,8 -987,19 +987,15 @@@
</releases>
</pluginRepository>
</pluginRepositories>
-
- <!-- Used for GeoAPI snapshots only.
- Shall be removed on SIS master. -->
+ <repositories>
+ <repository>
- <id>geotoolkit</id>
- <name>Geotoolkit.org repository</name>
- <url>https://maven.geotoolkit.org</url>
++ <id>geoapi.staging</id>
++ <name>GeoAPI staging repository</name>
++
<url>https://oss.sonatype.org/content/repositories/orgopengis-1200/</url>
+ </repository>
+ </repositories>
-
<!-- ==============================================================
Group of modules to build in approximate dependency order.
============================================================== -->
diff --cc
storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
index be3fdffcbc,d1136cf475..2cb13e87af
---
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
+++
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
@@@ -31,9 -31,10 +31,9 @@@ import java.io.IOException
import javax.measure.Unit;
import javax.measure.UnitConverter;
import javax.measure.IncommensurableException;
- import javax.measure.format.ParserException;
+ import javax.measure.format.MeasurementParseException;
import org.opengis.util.CodeList;
-import org.opengis.util.NameFactory;
import org.opengis.util.InternationalString;
import org.opengis.metadata.Metadata;
import org.opengis.metadata.Identifier;
