You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/05/09 13:05:44 UTC
[sis] branch geoapi-4.0 updated (0666ddb3dd -> fda2336cee)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
from 0666ddb3dd Better handling of directory on S3 storage.
new 3cff280029 Set <sis.non-free.version> to 1.2 in anticipation for 1.2 release. Update README and NOTICE files.
new fda2336cee Rename `sis-cloud-S3` module as `sis-cloud-aws`.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/pom.xml (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/internal/Resources.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/internal/Resources.properties (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/internal/Resources_fr.properties (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/internal/package-info.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/java/org/apache/sis/cloud/aws/s3/package-info.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java (100%)
rename cloud/{sis-cloud-S3 => sis-cloud-aws}/src/test/java/org/apache/sis/test/suite/package-info.txt (100%)
[sis] 01/02: Set to 1.2 in anticipation for 1.2 release. Update README and NOTICE files.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 3cff280029bf7e1b53ec0d2a78c5fc7b139660f8
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon May 9 14:59:42 2022 +0200
Set <sis.non-free.version> to 1.2 in anticipation for 1.2 release.
Update README and NOTICE files.
---
NOTICE | 12 ++++++----
README | 18 +++++++-------
application/sis-console/src/main/artifact/README | 28 +++++++++++-----------
application/sis-javafx/src/main/artifact/README | 14 +++++------
.../sis/metadata/sql/MetadataWriterTest.java | 6 ++---
.../apache/sis/setup/OptionalInstallations.java | 2 +-
pom.xml | 2 +-
7 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/NOTICE b/NOTICE
index 5209376c3e..ef42142e7e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,8 @@
Apache Spatial Information System (SIS)
-Copyright 2010-2021 The Apache Software Foundation
+Copyright 2010-2022 The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
The Javadoc contains documentation from the Open Geospatial Consortium
(OGC®) specifications (https://www.ogc.org/standards/), also known as OpenGIS.
@@ -22,15 +22,19 @@ http://math.nist.gov/javanumerics/jama/
The `sis-feature` module can optionally use the Esri Geometry API
developed by ESRI under Apache license 2.
-http://github.com/Esri/geometry-api-java/
+https://github.com/Esri/geometry-api-java/
The `sis-netcdf` module can optionally use the UCAR netCDF library
developed by Unidata under MIT-style license.
https://www.unidata.ucar.edu/software/netcdf-java/
+The `sis-cloud-aws` module depends on the Amazon SDK library
+developed by Amazon under Apache 2 license.
+https://aws.amazon.com/sdk-for-java/
+
The test suite uses software developed by the JUnit community
under Eclipse public license version 2.
-http://junit.org/junit4/
+https://junit.org/junit4/
-------------------------------------------------------------
diff --git a/README b/README
index 326b7f2585..d6ece2ee62 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-=============================================
-Welcome to Apache SIS <http://sis.apache.org>
-=============================================
+==============================================
+Welcome to Apache SIS <https://sis.apache.org>
+==============================================
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
@@ -15,7 +15,7 @@ of coordinates between different reference systems. The SIS storage modules
provide a common approach to the reading and writing of metadata, features and
coverages applicable to simple imagery as to many dimensional data structures.
-SIS is a project of the Apache Software Foundation <http://www.apache.org/>.
+SIS is a project of the Apache Software Foundation <https://www.apache.org/>.
Apache SIS, SIS, Apache, the Apache feather logo, and the Apache SIS
project logo are trademarks of The Apache Software Foundation.
@@ -24,20 +24,22 @@ project logo are trademarks of The Apache Software Foundation.
Getting Started
===============
-Running Apache SIS requires Java 8 or higher. Building SIS requires Java 17
-or higher together with Maven 3 <http://maven.apache.org/> build system.
+Running the library part of Apache SIS requires Java 8 or higher.
+Running the JavaFX application part requires Java 16 or higher.
+Building SIS requires Java 17 or higher
+together with Maven 3 <https://maven.apache.org/> build system.
To build SIS, use the following command in this directory:
mvn install
Information for running a command-line tool can be found on the web site:
-(<http://sis.apache.org/command-line.html>)
+(<https://sis.apache.org/command-line.html>)
License (see also LICENSE)
==========================
-Collective work: Copyright 2010-2021 The Apache Software Foundation.
+Collective work: Copyright 2010-2022 The Apache Software Foundation.
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
diff --git a/application/sis-console/src/main/artifact/README b/application/sis-console/src/main/artifact/README
index bb742ef0e6..c4b05633b3 100644
--- a/application/sis-console/src/main/artifact/README
+++ b/application/sis-console/src/main/artifact/README
@@ -1,8 +1,8 @@
-=============================================
-Welcome to Apache SIS <http://sis.apache.org>
-=============================================
+==============================================
+Welcome to Apache SIS <https://sis.apache.org>
+==============================================
-SIS is a project of the Apache Software Foundation <http://www.apache.org>
+SIS is a project of the Apache Software Foundation <https://www.apache.org>
for developing geospatial applications in the Java programming language.
The library can be used for desktop or server applications.
@@ -17,37 +17,37 @@ SIS requires Java 8 or later.
Unix
----
-1) Unzip 'apache-sis-1.1-bin.zip' in any directory.
-2) Add the 'apache-sis-1.1/bin' directory to the path.
-3) Invoke 'sis' on the command line.
+1) Unzip `apache-sis-1.2-bin.zip` in any directory.
+2) Add the `apache-sis-1.2/bin` directory to the path.
+3) Invoke `sis` on the command line.
Windows
-------
-There is not yet 'sis.bat' file for Windows.
+There is not yet `sis.bat` file for Windows.
The following steps need to be done manually:
-1) Unzip 'apache-sis-1.1-bin.zip' in any directory.
-2) Invoke 'java -jar lib/sis.jar' on the command line.
+1) Unzip `apache-sis-1.2-bin.zip` in any directory.
+2) Invoke `java -jar lib/sis.jar` on the command line.
Configuration (Unix only)
=========================
-A 'SIS_OPTS' environment variable can optionally be set for specifying options
+A `SIS_OPTS` environment variable can optionally be set for specifying options
to be given to any execution of Apache SIS. For example for setting the
encoding to UTF-8:
export SIS_OPTS="--encoding UTF-8"
-Optional dependencies can be added to the 'lib' folder. For example adding the
-UCAR netCDF library in the 'lib' folder will cause Apache SIS to decode a
+Optional dependencies can be added to the `lib` folder. For example adding the
+UCAR netCDF library in the `lib` folder will cause Apache SIS to decode a
wider range of file formats like NcML files.
License (see also LICENSE)
==========================
-Collective work: Copyright 2010-2021 The Apache Software Foundation.
+Collective work: Copyright 2010-2022 The Apache Software Foundation.
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
diff --git a/application/sis-javafx/src/main/artifact/README b/application/sis-javafx/src/main/artifact/README
index 6e551f3115..471be1e6e6 100644
--- a/application/sis-javafx/src/main/artifact/README
+++ b/application/sis-javafx/src/main/artifact/README
@@ -1,6 +1,6 @@
-=============================================
-Welcome to Apache SIS <http://sis.apache.org>
-=============================================
+==============================================
+Welcome to Apache SIS <https://sis.apache.org>
+==============================================
SIS is a project of the Apache Software Foundation <https://www.apache.org>
for developing geospatial applications in the Java programming language.
@@ -15,10 +15,10 @@ Installation
For developing applications using the SIS library or for using on command-line,
the only requirement is Java 8 or later. For launching the desktop application,
-requirements are Java 11 or later and JavaFX 13 or later.
+requirements are Java 16 or later and JavaFX 13 or later.
-1) Unzip `apache-sis-1.1-bin.zip` in any directory.
-2) Add the `apache-sis-1.1/bin` directory to the path.
+1) Unzip `apache-sis-1.2-bin.zip` in any directory.
+2) Add the `apache-sis-1.2/bin` directory to the path.
3) Invoke `sis` or `sisfx` on the command line.
@@ -39,7 +39,7 @@ range of file formats like NcML files.
License (see also LICENSE)
==========================
-Collective work: Copyright 2010-2021 The Apache Software Foundation.
+Collective work: Copyright 2010-2022 The Apache Software Foundation.
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
index 00e8d21864..23bf003cea 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@ -162,9 +162,9 @@ public final strictfp class MetadataWriterTest extends TestCase {
assertEquals("International Association of Oil & Gas Producers", party.getName().toString());
final Contact contact = TestUtilities.getSingleton(party.getContactInfo());
/*
- * Invoke for the deprecated 'getOnlineResource()' method (singular form) before the non-deprecated
- * 'getOnlineResources()' (plural form) replacement. They shall give the same result no matter which
- * form were stored in the database.
+ * Invoke the deprecated `getOnlineResource()` method (singular form) before the non-deprecated
+ * `getOnlineResources()` (plural form) replacement. They shall give the same result no matter
+ * which form were stored in the database.
*/
@SuppressWarnings("deprecation")
final OnlineResource resource = contact.getOnlineResource();
diff --git a/core/sis-utility/src/main/java/org/apache/sis/setup/OptionalInstallations.java b/core/sis-utility/src/main/java/org/apache/sis/setup/OptionalInstallations.java
index 4b2b11be7e..282650b2ff 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/setup/OptionalInstallations.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/setup/OptionalInstallations.java
@@ -60,7 +60,7 @@ public abstract class OptionalInstallations extends InstallationResources implem
* Where to download the EPSG scripts after user has approved the terms of use.
*/
private static final String EPSG_DOWNLOAD_URL =
- "https://repo1.maven.org/maven2/org/apache/sis/non-free/sis-epsg/1.1/sis-epsg-1.1.jar";
+ "https://repo1.maven.org/maven2/org/apache/sis/non-free/sis-epsg/1.2/sis-epsg-1.2.jar";
/**
* Estimation of the EPSG database size after installation, in megabytes.
diff --git a/pom.xml b/pom.xml
index d5858f3982..1ebecd20a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -556,7 +556,7 @@
<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>
</properties>
[sis] 02/02: Rename `sis-cloud-S3` module as `sis-cloud-aws`.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit fda2336cee8c173d2dcb4e141ad1bfbdec2d02a6
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon May 9 15:04:59 2022 +0200
Rename `sis-cloud-S3` module as `sis-cloud-aws`.
---
cloud/pom.xml | 2 +-
cloud/{sis-cloud-S3 => sis-cloud-aws}/pom.xml | 0
.../src/main/java/org/apache/sis/cloud/aws/internal/Resources.java | 0
.../main/java/org/apache/sis/cloud/aws/internal/Resources.properties | 0
.../main/java/org/apache/sis/cloud/aws/internal/Resources_fr.properties | 0
.../src/main/java/org/apache/sis/cloud/aws/internal/package-info.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/FileService.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java | 0
.../src/main/java/org/apache/sis/cloud/aws/s3/package-info.java | 0
.../resources/META-INF/services/java.nio.file.spi.FileSystemProvider | 0
.../src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java | 0
.../src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java | 0
.../src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java | 0
.../src/test/java/org/apache/sis/test/suite/AWSTestSuite.java | 0
.../src/test/java/org/apache/sis/test/suite/package-info.txt | 0
22 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/cloud/pom.xml b/cloud/pom.xml
index cb5b91119d..3a2959c1ce 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -116,7 +116,7 @@
Sub-modules included in the build
=========================================================== -->
<modules>
- <module>sis-cloud-S3</module>
+ <module>sis-cloud-aws</module>
</modules>
</project>
diff --git a/cloud/sis-cloud-S3/pom.xml b/cloud/sis-cloud-aws/pom.xml
similarity index 100%
rename from cloud/sis-cloud-S3/pom.xml
rename to cloud/sis-cloud-aws/pom.xml
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/internal/Resources.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/internal/Resources.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/internal/Resources.properties b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources.properties
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/internal/Resources.properties
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources.properties
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/internal/Resources_fr.properties b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources_fr.properties
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/internal/Resources_fr.properties
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/Resources_fr.properties
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/internal/package-info.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/package-info.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/internal/package-info.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/internal/package-info.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/BucketStore.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/CachedByteChannel.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/DerivedList.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/FileService.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPath.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/KeyPathMatcher.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/ObjectAttributes.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/PathIterator.java
diff --git a/cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/package-info.java b/cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/package-info.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/java/org/apache/sis/cloud/aws/s3/package-info.java
rename to cloud/sis-cloud-aws/src/main/java/org/apache/sis/cloud/aws/s3/package-info.java
diff --git a/cloud/sis-cloud-S3/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider b/cloud/sis-cloud-aws/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider
similarity index 100%
rename from cloud/sis-cloud-S3/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider
rename to cloud/sis-cloud-aws/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider
diff --git a/cloud/sis-cloud-S3/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
rename to cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
diff --git a/cloud/sis-cloud-S3/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
rename to cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
diff --git a/cloud/sis-cloud-S3/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java
rename to cloud/sis-cloud-aws/src/test/java/org/apache/sis/cloud/aws/s3/KeyPathTest.java
diff --git a/cloud/sis-cloud-S3/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java
similarity index 100%
rename from cloud/sis-cloud-S3/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java
rename to cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/AWSTestSuite.java
diff --git a/cloud/sis-cloud-S3/src/test/java/org/apache/sis/test/suite/package-info.txt b/cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/package-info.txt
similarity index 100%
rename from cloud/sis-cloud-S3/src/test/java/org/apache/sis/test/suite/package-info.txt
rename to cloud/sis-cloud-aws/src/test/java/org/apache/sis/test/suite/package-info.txt