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 215e951ad180c731d8d5215fa6885504013948f8
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Aug 18 14:41:52 2023 +0200
Rename the `org.apache.sis.test` modules with an `endorsed`, `incubator` or
`optional` suffix.
This is for avoiding confusion between modules of same name in different
Gradle sub-projects.
We previously relied on the fact that those modules where not reused for
avoiding confusion
(i.e. they exist only in a scope local to the sub-project), but it does not
seem sufficient.
---
endorsed/build.gradle.kts | 4 ++--
.../test/module-info.java | 2 +-
incubator/build.gradle.kts | 4 ++--
.../test/module-info.java | 2 +-
optional/build.gradle.kts | 4 ++--
.../test/module-info.java | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/endorsed/build.gradle.kts b/endorsed/build.gradle.kts
index 28a3b4e04f..6c9ad7a0f6 100644
--- a/endorsed/build.gradle.kts
+++ b/endorsed/build.gradle.kts
@@ -89,7 +89,7 @@ dependencies {
/*
* Compile main and tests classes from Module Source Hierarchy.
- * The test classes require some additional dependencies declared in the
`org.apache.sis.test` module.
+ * The test classes require some additional dependencies declared in the
`org.apache.sis.test.endorsed` module.
*/
var srcDir = file("src") // Must be the same as the hard-coded
value in `BuildHelper.java`.
tasks.compileJava {
@@ -97,7 +97,7 @@ tasks.compileJava {
}
tasks.compileTestJava {
srcDir.list().forEach {
- addRead(options.compilerArgs, it, "org.apache.sis.test,junit")
+ addRead(options.compilerArgs, it, "org.apache.sis.test.endorsed,junit")
}
addExportForTests(options.compilerArgs)
}
diff --git a/endorsed/src/org.apache.sis.test/test/module-info.java
b/endorsed/src/org.apache.sis.test.endorsed/test/module-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.test/test/module-info.java
rename to endorsed/src/org.apache.sis.test.endorsed/test/module-info.java
index 565c714bb9..b5ef65a6f1 100644
--- a/endorsed/src/org.apache.sis.test/test/module-info.java
+++ b/endorsed/src/org.apache.sis.test.endorsed/test/module-info.java
@@ -22,7 +22,7 @@
* @version 1.4
* @since 1.4
*/
-module org.apache.sis.test {
+module org.apache.sis.test.endorsed {
requires transitive org.opengis.geoapi.conformance;
requires transitive org.apache.derby.tools;
requires transitive org.hsqldb;
diff --git a/incubator/build.gradle.kts b/incubator/build.gradle.kts
index be719b4b30..d78d2f957e 100644
--- a/incubator/build.gradle.kts
+++ b/incubator/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
/*
* Generate ANTLR4 source files, then compile main and tests classes from
Module Source Hierarchy.
- * The test classes require some additional dependencies declared in the
`org.apache.sis.test` module.
+ * The test classes require some additional dependencies declared in the
`org.apache.sis.test.incubator` module.
*
* Note: as of Gradle 8.2, the ANTLR task does not work well with arbitrary
source directories.
* We have to keep default convention even if it does not fit well in Module
Source Hierarchy.
@@ -82,7 +82,7 @@ tasks.compileJava {
}
tasks.compileTestJava {
srcDir.list().forEach {
- addRead(options.compilerArgs, it, "org.apache.sis.test,junit")
+ addRead(options.compilerArgs, it,
"org.apache.sis.test.incubator,junit")
}
}
diff --git a/incubator/src/org.apache.sis.test/test/module-info.java
b/incubator/src/org.apache.sis.test.incubator/test/module-info.java
similarity index 96%
rename from incubator/src/org.apache.sis.test/test/module-info.java
rename to incubator/src/org.apache.sis.test.incubator/test/module-info.java
index a4dea60674..5cea0f2dc5 100644
--- a/incubator/src/org.apache.sis.test/test/module-info.java
+++ b/incubator/src/org.apache.sis.test.incubator/test/module-info.java
@@ -22,6 +22,6 @@
* @version 1.4
* @since 1.4
*/
-module org.apache.sis.test {
+module org.apache.sis.test.incubator {
requires transitive org.opengis.geoapi.conformance;
}
diff --git a/optional/build.gradle.kts b/optional/build.gradle.kts
index 997b286b37..0dbdae7fc9 100644
--- a/optional/build.gradle.kts
+++ b/optional/build.gradle.kts
@@ -71,7 +71,7 @@ dependencies {
/*
* Compile main and tests classes from Module Source Hierarchy.
- * The test classes require some additional dependencies declared in the
`org.apache.sis.test` module.
+ * The test classes require some additional dependencies declared in the
`org.apache.sis.test.optional` module.
*/
var srcDir = file("src") // Must be the same as the hard-coded
value in `BuildHelper.java`.
tasks.compileJava {
@@ -81,7 +81,7 @@ tasks.compileJava {
tasks.compileTestJava {
patchForTests(options.compilerArgs);
srcDir.list().forEach {
- addRead(options.compilerArgs, it, "org.apache.sis.test,junit")
+ addRead(options.compilerArgs, it, "org.apache.sis.test.optional,junit")
}
}
diff --git a/optional/src/org.apache.sis.test/test/module-info.java
b/optional/src/org.apache.sis.test.optional/test/module-info.java
similarity index 96%
rename from optional/src/org.apache.sis.test/test/module-info.java
rename to optional/src/org.apache.sis.test.optional/test/module-info.java
index a4dea60674..dcdcaaddf8 100644
--- a/optional/src/org.apache.sis.test/test/module-info.java
+++ b/optional/src/org.apache.sis.test.optional/test/module-info.java
@@ -22,6 +22,6 @@
* @version 1.4
* @since 1.4
*/
-module org.apache.sis.test {
+module org.apache.sis.test.optional {
requires transitive org.opengis.geoapi.conformance;
}
