This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch 1.3-RC
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 634cd3dbd041a38a1e3b0fa1aec688db4fa484f6
Merge: 20ae4b58a9 2f0e340e1f
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Dec 9 18:38:11 2022 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
NOTICE | 4 +--
README | 4 +--
.../sis/coverage/grid/DisjointExtentException.java | 2 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 19 ++++++++++--
.../org/apache/sis/internal/feature/Resources.java | 6 ++--
.../sis/internal/feature/Resources.properties | 2 +-
.../sis/internal/feature/Resources_fr.properties | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 7 +++++
.../referencing/factory/CommonAuthorityCode.java | 10 ++++++-
.../factory/CommonAuthorityFactory.java | 35 +++++++++++-----------
.../java/org/apache/sis/internal/util/Strings.java | 2 +-
.../apache/sis/setup/OptionalInstallations.java | 4 +--
pom.xml | 2 +-
.../apache/sis/internal/storage/PRJDataStore.java | 11 +++++--
.../sis/internal/storage/esri/RawRasterStore.java | 16 ++++++----
.../sis/internal/storage/image/WorldFileStore.java | 18 ++++++-----
.../internal/storage/csv/StoreProviderTest.java | 5 +++-
17 files changed, 97 insertions(+), 52 deletions(-)
diff --cc pom.xml
index dc8b9256b8,b44f90992d..805a509207
--- a/pom.xml
+++ b/pom.xml
@@@ -556,9 -556,9 +556,9 @@@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<sis.plugin.version>${project.version}</sis.plugin.version>
- <sis.non-free.version>1.2</sis.non-free.version> <!-- Used
only if "non-free" profile is activated. -->
+ <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>4.0-SNAPSHOT</geoapi.version>
+ <geoapi.version>3.1-SNAPSHOT</geoapi.version>
</properties>
<profiles>
