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 5cf53d65d2ec35c6125dc79af2b2c5e490a31a40
Merge: c89fcb2b94 6b2e63471f
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Dec 26 17:52:25 2022 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1: upgrade from JSR-363 to JSR-385.
NOTICE | 4 +-
README | 2 +-
.../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 | 4 +-
.../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 +-
36 files changed, 518 insertions(+), 128 deletions(-)
diff --cc ide-project/NetBeans/nbproject/project.properties
index fbd73f1c14,7a129754dd..bad85c7086
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -91,8 -98,7 +91,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.1-SNAPSHOT
- jsr363.version = 1.0
+ jsr385.version = 2.1.3
jaxb.version = 2.3.3
jaxb.runtime = 2.3.7
istack.version = 3.0.12
@@@ -124,8 -130,8 +124,8 @@@ postgresql.version = 42.5.
maven.repository = ${user.home}/.m2/repository
endorsed.classpath =
javac.classpath=\
- ${project.GeoAPI}/dist/geoapi.jar:\
+
${maven.repository}/org/opengis/geoapi-pending/${geoapi.version}/geoapi-pending-${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:\
