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 2b32e74c22061ecf0a3bed5a7208d5be5f935914
Merge: c654790fde fda2336cee
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon May 9 15:06:01 2022 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
NOTICE | 12 ++++++----
README | 18 +++++++-------
application/sis-console/src/main/artifact/README | 28 +++++++++++-----------
application/sis-javafx/src/main/artifact/README | 14 +++++------
cloud/pom.xml | 2 +-
cloud/{sis-cloud-S3 => sis-cloud-aws}/pom.xml | 0
.../apache/sis/cloud/aws/internal/Resources.java | 0
.../sis/cloud/aws/internal/Resources.properties | 0
.../sis/cloud/aws/internal/Resources_fr.properties | 0
.../sis/cloud/aws/internal/package-info.java | 0
.../org/apache/sis/cloud/aws/s3/BucketStore.java | 0
.../apache/sis/cloud/aws/s3/CachedByteChannel.java | 0
.../apache/sis/cloud/aws/s3/ClientFileSystem.java | 0
.../org/apache/sis/cloud/aws/s3/DerivedList.java | 0
.../org/apache/sis/cloud/aws/s3/FileService.java | 0
.../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 0
.../apache/sis/cloud/aws/s3/KeyPathMatcher.java | 0
.../apache/sis/cloud/aws/s3/ObjectAttributes.java | 0
.../org/apache/sis/cloud/aws/s3/PathIterator.java | 0
.../org/apache/sis/cloud/aws/s3/package-info.java | 0
.../services/java.nio.file.spi.FileSystemProvider | 0
.../sis/cloud/aws/s3/ClientFileSystemTest.java | 0
.../sis/cloud/aws/s3/KeyPathMatcherTest.java | 0
.../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 0
.../org/apache/sis/test/suite/AWSTestSuite.java | 0
.../org/apache/sis/test/suite/package-info.txt | 0
.../sis/metadata/sql/MetadataWriterTest.java | 6 ++---
.../apache/sis/setup/OptionalInstallations.java | 2 +-
pom.xml | 2 +-
29 files changed, 45 insertions(+), 39 deletions(-)
diff --cc pom.xml
index 11c6246f79,1ebecd20a9..5a4e7e17e1
--- 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.1</sis.non-free.version> <!-- Used
only if "non-free" profile is activated. -->
+ <sis.non-free.version>1.2</sis.non-free.version> <!-- Used
only if "non-free" profile is activated. -->
<javafx.version>17</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>
