[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. It fixes a bug introduced by the replacement of `Path` by `URI` in coordinate operation parameters.

[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 0a621ef6cfbc5d7d0550e19907cd2297dc4955f3
Merge: bece843ce4 186c01efb9
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Jan 17 19:01:10 2023 +0100

    Merge branch 'geoapi-4.0' into geoapi-3.1.
    It fixes a bug introduced by the replacement of `Path` by `URI` in 
coordinate operation parameters.

 .../sis/referencing/factory/sql/EPSGDataAccess.java       | 13 +++++++++----
 .../apache/sis/util/resources/IndexedResourceBundle.java  | 15 +++++++++------
 ide-project/NetBeans/nbproject/genfiles.properties        |  4 ++--
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 874d87f86b,dbf91a7a89..c2045fe572
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
  build.xml.data.CRC32=58e6b21c
  build.xml.script.CRC32=462eaba0
  build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=e6c2891e
 -nbproject/build-impl.xml.data.CRC32=b95fb13b
 -nbproject/build-impl.xml.script.CRC32=69d63511
++nbproject/build-impl.xml.data.CRC32=9ea8c775
 +nbproject/build-impl.xml.script.CRC32=02d4f276
- nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.104.0.48
+ nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.105.0.48