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 2ef86ebf35a088c3d11ad60226d29432b45123da
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Nov 27 12:30:29 2023 +0100
Move the `buildSrc` source code to its traditional location.
The "Module Source Hierarchy" has no effect for this sub-project since it
contains a single module.
The intend is to make easier to add conventions in the way described by
Gradle documentation.
---
buildSrc/build.gradle.kts | 23 ----------------------
.../org/apache/sis/buildtools/book/Assembler.java | 0
.../apache/sis/buildtools/book/BookException.java | 0
.../org/apache/sis/buildtools/book/Characters.java | 0
.../apache/sis/buildtools/book/CodeColorizer.java | 0
.../apache/sis/buildtools/book/package-info.java | 0
.../sis/buildtools/coding/ReorganizeImports.java | 0
.../buildtools/coding/VerifyVersionInJavadoc.java | 0
.../apache/sis/buildtools/coding/package-info.java | 0
.../org/apache/sis/buildtools/doclet/Doclet.java | 0
.../org/apache/sis/buildtools/doclet/Include.java | 0
.../org/apache/sis/buildtools/doclet/Rewriter.java | 0
.../org/apache/sis/buildtools/doclet/Taglet.java | 0
.../apache/sis/buildtools/doclet/package-info.java | 0
.../apache/sis/buildtools/gradle/Assembler.java | 0
.../apache/sis/buildtools/gradle/BuildHelper.java | 0
.../apache/sis/buildtools/gradle/Conventions.java | 0
.../apache/sis/buildtools/gradle/Dependency.java | 0
.../apache/sis/buildtools/gradle/JavaMaker.java | 0
.../sis/buildtools/gradle/ModularCompilation.java | 0
.../apache/sis/buildtools/gradle/ModularJAR.java | 0
.../sis/buildtools/gradle/ModularJavadoc.java | 0
.../sis/buildtools/gradle/ModularPublishing.java | 0
.../sis/buildtools/gradle/ModularSources.java | 0
.../apache/sis/buildtools/gradle/ModularTest.java | 0
.../sis/buildtools/gradle/SISBuildException.java | 0
.../org/apache/sis/buildtools/gradle/UnoPkg.java | 0
.../apache/sis/buildtools/gradle/ZipWriter.java | 0
.../apache/sis/buildtools/gradle/package-info.java | 0
.../org/apache/sis/buildtools/maven/Element.java | 0
.../org/apache/sis/buildtools/maven/Generator.java | 0
.../apache/sis/buildtools/maven/package-info.java | 0
.../sis/buildtools/maven/workaround/Argument.java | 0
.../maven/workaround/ProxyGenerator.java | 0
.../buildtools/maven/workaround/package-info.java | 0
.../resources/IndexedResourceCompiler.java | 0
.../sis/buildtools/resources/package-info.java | 0
.../org/apache/sis/buildtools/book/GEOAPI.lst | 0
.../org/apache/sis/buildtools/book/OGC.lst | 0
.../org/apache/sis/buildtools/book/SIS.lst | 0
.../org/apache/sis/buildtools/book/XML_PREFIX.lst | 0
.../resources/IndexedResourceCompilerTest.java | 0
42 files changed, 23 deletions(-)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index c32e77e311..cfbc70ea94 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -27,29 +27,6 @@ gradlePlugin {
}
}
-/*
- * Source files are organized following the same convention than other Apache
SIS sub-projects.
- * However since there is currently only one module in `buildSRC`, we do not
need to configure
- * for Module Source Hierarchy. We let Gradle uses Package Hierarchy (the
default Gradle mode)
- * and simulate the module source hierarchy with `setSrcDirs(…)`.
- */
-sourceSets {
- main {
- java {
- setSrcDirs(listOf("src/org.apache.sis.buildtools/main"))
- }
- resources {
- setSrcDirs(listOf("src/org.apache.sis.buildtools/main"))
- include("**/*.lst")
- }
- }
- test {
- java {
- setSrcDirs(listOf("src/org.apache.sis.buildtools/test"))
- }
- }
-}
-
/*
* All dependencies used by the plugin.
*/
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/Assembler.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/book/Assembler.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/Assembler.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/book/Assembler.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/BookException.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/book/BookException.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/BookException.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/book/BookException.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/Characters.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/book/Characters.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/Characters.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/book/Characters.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/CodeColorizer.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/book/CodeColorizer.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/CodeColorizer.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/book/CodeColorizer.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/package-info.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/book/package-info.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/package-info.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/book/package-info.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/coding/ReorganizeImports.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/coding/ReorganizeImports.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/coding/VerifyVersionInJavadoc.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/VerifyVersionInJavadoc.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/coding/VerifyVersionInJavadoc.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/coding/VerifyVersionInJavadoc.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/coding/package-info.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/package-info.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/coding/package-info.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/coding/package-info.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/Doclet.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/doclet/Doclet.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/Doclet.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/doclet/Doclet.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/Include.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/doclet/Include.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/Include.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/doclet/Include.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/Rewriter.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/doclet/Rewriter.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/Rewriter.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/doclet/Rewriter.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/Taglet.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/doclet/Taglet.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/Taglet.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/doclet/Taglet.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/package-info.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/doclet/package-info.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/doclet/package-info.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/doclet/package-info.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Assembler.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Assembler.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Assembler.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Assembler.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/BuildHelper.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/BuildHelper.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Conventions.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Conventions.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Conventions.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Conventions.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Dependency.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Dependency.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/Dependency.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/JavaMaker.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/JavaMaker.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/JavaMaker.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/gradle/JavaMaker.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularCompilation.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularCompilation.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularCompilation.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularCompilation.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJAR.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularJAR.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJAR.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularJAR.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJavadoc.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularJavadoc.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJavadoc.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularJavadoc.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularPublishing.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularPublishing.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularPublishing.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularPublishing.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularSources.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularSources.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularTest.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularTest.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularTest.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ModularTest.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/SISBuildException.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/SISBuildException.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/SISBuildException.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/SISBuildException.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/UnoPkg.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/UnoPkg.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/UnoPkg.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/gradle/UnoPkg.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ZipWriter.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ZipWriter.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ZipWriter.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/gradle/ZipWriter.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/package-info.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/gradle/package-info.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/package-info.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/gradle/package-info.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/Element.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/maven/Element.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/Element.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/maven/Element.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/Generator.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/maven/Generator.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/Generator.java
rename to buildSrc/src/main/java/org/apache/sis/buildtools/maven/Generator.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/package-info.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/maven/package-info.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/package-info.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/maven/package-info.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/workaround/Argument.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/maven/workaround/Argument.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/workaround/Argument.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/maven/workaround/Argument.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/workaround/ProxyGenerator.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/maven/workaround/ProxyGenerator.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/workaround/ProxyGenerator.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/maven/workaround/ProxyGenerator.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/workaround/package-info.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/maven/workaround/package-info.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/maven/workaround/package-info.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/maven/workaround/package-info.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/resources/IndexedResourceCompiler.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/resources/IndexedResourceCompiler.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/resources/IndexedResourceCompiler.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/resources/IndexedResourceCompiler.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/resources/package-info.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/resources/package-info.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/resources/package-info.java
rename to
buildSrc/src/main/java/org/apache/sis/buildtools/resources/package-info.java
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/GEOAPI.lst
b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/GEOAPI.lst
rename to buildSrc/src/main/resources/org/apache/sis/buildtools/book/GEOAPI.lst
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/OGC.lst
b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/OGC.lst
rename to buildSrc/src/main/resources/org/apache/sis/buildtools/book/OGC.lst
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/SIS.lst
b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/SIS.lst
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/SIS.lst
rename to buildSrc/src/main/resources/org/apache/sis/buildtools/book/SIS.lst
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/XML_PREFIX.lst
b/buildSrc/src/main/resources/org/apache/sis/buildtools/book/XML_PREFIX.lst
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/book/XML_PREFIX.lst
rename to
buildSrc/src/main/resources/org/apache/sis/buildtools/book/XML_PREFIX.lst
diff --git
a/buildSrc/src/org.apache.sis.buildtools/test/org/apache/sis/buildtools/resources/IndexedResourceCompilerTest.java
b/buildSrc/src/test/java/org/apache/sis/buildtools/resources/IndexedResourceCompilerTest.java
similarity index 100%
rename from
buildSrc/src/org.apache.sis.buildtools/test/org/apache/sis/buildtools/resources/IndexedResourceCompilerTest.java
rename to
buildSrc/src/test/java/org/apache/sis/buildtools/resources/IndexedResourceCompilerTest.java
