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 b91d66b6e9dd0646f177e2dba6b93ba508e9f9e7
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Oct 3 15:01:12 2023 +0200
Adjust dependency declarations.
---
.../apache/sis/buildtools/gradle/BuildHelper.java | 1 +
endorsed/build.gradle.kts | 2 ++
.../org.apache.sis.console/main/module-info.java | 18 ++++++++-------
.../src/org.apache.sis.util/main/module-info.java | 2 +-
optional/build.gradle.kts | 5 +++++
.../src/org.apache.sis.gui/main/module-info.java | 26 +++++++++++++---------
6 files changed, 34 insertions(+), 20 deletions(-)
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java
b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java
index 9de2c9fa86..729fa33f0e 100644
---
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java
+++
b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java
@@ -160,6 +160,7 @@ public final class BuildHelper implements Plugin<Project> {
});
});
tasks.withType(Jar.class).forEach((task) -> {
+ task.getOutputs().dir(Conventions.fileRelativeToBuild(project,
Conventions.LIBS_DIRECTORY));
task.setActions(List.of((t) -> { // Replace the default
action by our own.
ModularJAR.execute(BuildHelper.this, (Jar) t);
}));
diff --git a/endorsed/build.gradle.kts b/endorsed/build.gradle.kts
index b2616486d2..2cf5c89f2e 100644
--- a/endorsed/build.gradle.kts
+++ b/endorsed/build.gradle.kts
@@ -64,6 +64,8 @@ dependencies {
compileOnly(libs.ucar)
compileOnly(libs.aws.s3)
compileOnly(drivers.postgres)
+ runtimeOnly(drivers.derby.core)
+ runtimeOnly(drivers.derby.tools)
// Test dependencies
testImplementation(tests.junit4)
diff --git a/endorsed/src/org.apache.sis.console/main/module-info.java
b/endorsed/src/org.apache.sis.console/main/module-info.java
index e564a8e00a..7062473f92 100644
--- a/endorsed/src/org.apache.sis.console/main/module-info.java
+++ b/endorsed/src/org.apache.sis.console/main/module-info.java
@@ -23,14 +23,16 @@
* @since 0.3
*/
module org.apache.sis.console {
- requires java.sql;
- requires java.rmi;
- requires java.management;
- requires jakarta.xml.bind;
-
- requires transitive org.apache.sis.util;
- requires org.apache.sis.storage;
- requires org.apache.sis.storage.xml;
+ requires java.sql;
+ requires java.rmi;
+ requires java.management;
+ requires jakarta.xml.bind;
+ requires transitive org.apache.sis.util; // Transitive because
of `ResourcesDownloader`.
+ requires org.apache.sis.metadata;
+ requires org.apache.sis.referencing;
+ requires org.apache.sis.feature;
+ requires org.apache.sis.storage;
+ requires org.apache.sis.storage.xml; // Because of GPX in
`OutputFormat`.
provides org.apache.sis.setup.InstallationResources
with org.apache.sis.console.ResourcesDownloader;
diff --git a/endorsed/src/org.apache.sis.util/main/module-info.java
b/endorsed/src/org.apache.sis.util/main/module-info.java
index 9023c40490..34ebd8ec24 100644
--- a/endorsed/src/org.apache.sis.util/main/module-info.java
+++ b/endorsed/src/org.apache.sis.util/main/module-info.java
@@ -34,8 +34,8 @@
* @since 0.3
*/
module org.apache.sis.util {
- requires java.sql;
requires java.management;
+ requires transitive java.sql;
requires transitive java.logging;
requires transitive java.measure;
requires transitive org.opengis.geoapi.pending;
diff --git a/optional/build.gradle.kts b/optional/build.gradle.kts
index f7dcb18634..52a2f77766 100644
--- a/optional/build.gradle.kts
+++ b/optional/build.gradle.kts
@@ -60,7 +60,12 @@ dependencies {
api (files("${mainDepPath}/org.apache.sis.feature"))
api (files("${mainDepPath}/org.apache.sis.storage"))
implementation(files("${mainDepPath}/org.apache.sis.storage.xml"))
+ runtimeOnly (files("${mainDepPath}/org.apache.sis.storage.netcdf"))
+ runtimeOnly (files("${mainDepPath}/org.apache.sis.storage.geotiff"))
+ runtimeOnly
(files("${mainDepPath}/org.apache.sis.storage.earthobservation"))
api (files("${mainDepPath}/org.apache.sis.portrayal"))
+ runtimeOnly (drivers.derby.core)
+ runtimeOnly (drivers.derby.tools)
// Test dependencies
testImplementation(tests.geoapi)
diff --git a/optional/src/org.apache.sis.gui/main/module-info.java
b/optional/src/org.apache.sis.gui/main/module-info.java
index 96119af63c..ace019036c 100644
--- a/optional/src/org.apache.sis.gui/main/module-info.java
+++ b/optional/src/org.apache.sis.gui/main/module-info.java
@@ -25,21 +25,25 @@
* @since 1.1
*/
module org.apache.sis.gui {
- // Dependencies visible in public API.
+ requires java.prefs;
+ requires java.logging;
requires transitive java.desktop;
+ requires java.sql;
+ requires java.xml;
+ requires jakarta.xml.bind;
+ requires transitive javafx.base;
requires transitive javafx.controls;
+ requires transitive javafx.graphics;
+ requires javafx.web;
+ requires transitive org.apache.sis.util;
+ requires transitive org.apache.sis.metadata;
+ requires transitive org.apache.sis.referencing;
+ requires org.apache.sis.referencing.gazetteer;
+ requires transitive org.apache.sis.feature;
+ requires transitive org.apache.sis.storage;
+ requires org.apache.sis.storage.xml; // Those formats
have special handling in `DataViewer`.
requires transitive org.apache.sis.portrayal;
- // Dependencies for implementation only.
- requires java.prefs;
- requires java.logging;
- requires java.sql;
- requires java.xml;
- requires jakarta.xml.bind;
- requires javafx.web;
- requires org.apache.sis.storage.xml;
- requires org.apache.sis.referencing.gazetteer;
-
provides org.apache.sis.setup.InstallationResources
with org.apache.sis.gui.internal.io.OptionalDataDownloader;
