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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 24b12731b9 Add GPG signing for endorsed and optional modules.
Incubator modules are not signed because not intended to be released.
24b12731b9 is described below
commit 24b12731b9b7b84d0dd5ee78931049b2ae33c9f5
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Oct 5 15:32:24 2023 +0200
Add GPG signing for endorsed and optional modules.
Incubator modules are not signed because not intended to be released.
---
.../sis/buildtools/gradle/ModularSources.java | 11 +++++-----
endorsed/build.gradle.kts | 24 ++++++++++++++++++++++
optional/build.gradle.kts | 8 ++++++++
3 files changed, 38 insertions(+), 5 deletions(-)
diff --git
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java
b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java
index b07e0cc9ca..9525b4f796 100644
---
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java
+++
b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java
@@ -39,7 +39,7 @@ final class ModularSources extends ZipWriter.JDK {
/**
* The Java system property to set to {@code true} for enabling Javadoc
generation.
*/
- private static final String CREATE_JAVADOC_PROPERTY =
"org.apache.sis.create-javadoc";
+ private static final String RELEASE_VERSION_PROPERTY =
"org.apache.sis.releaseVersion";
/**
* Creates a helper instance.
@@ -101,13 +101,14 @@ final class ModularSources extends ZipWriter.JDK {
}
/*
* For performance reason, we actually generate the Javadoc only
of the
- * "org.apache.sis.create-javadoc" system property is set to
`true`.
+ * "org.apache.sis.releaseVersion" system property is set to a
non-null value.
* Otherwise the Javadoc files will be empty.
*/
- if (Boolean.getBoolean(CREATE_JAVADOC_PROPERTY)) {
+ final String version =
System.getProperty(RELEASE_VERSION_PROPERTY);
+ if (version != null) {
final var pb = new ProcessBuilder("javadoc",
"-locale", "en",
- "-doctitle", "Apache SIS API",
+ "-doctitle", "Apache SIS " + version + "
API",
"-tag", "category:X:Category:",
"-tag", "todo:a:TODO:",
"-nonavbar", "-noindex", "-nodeprecatedlist",
"-notree", "-nohelp",
@@ -129,7 +130,7 @@ final class ModularSources extends ZipWriter.JDK {
"For performance reason, Javadoc generation is
disabled by default.\n" +
"For generating Javadoc, set the following system
property:\n" +
"\n" +
- " " + CREATE_JAVADOC_PROPERTY + "=true\n" +
+ " " + RELEASE_VERSION_PROPERTY + "=<version>\n" +
"\n");
}
} else {
diff --git a/endorsed/build.gradle.kts b/endorsed/build.gradle.kts
index b8671e60c3..c4806ce7ed 100644
--- a/endorsed/build.gradle.kts
+++ b/endorsed/build.gradle.kts
@@ -42,6 +42,7 @@ version = "2.0-SNAPSHOT"
plugins {
`java-library`
`maven-publish`
+ signing
id("org.apache.sis.buildtools")
}
@@ -444,3 +445,26 @@ publishing {
}
}
}
+
+signing {
+ useGpgCmd()
+ if (System.getProperty("org.apache.sis.releaseVersion") != null) {
+ sign(publishing.publications["util"])
+ sign(publishing.publications["metadata"])
+ sign(publishing.publications["referencing"])
+ sign(publishing.publications["referencing.gazetteer"])
+ sign(publishing.publications["feature"])
+ sign(publishing.publications["portrayal"])
+ sign(publishing.publications["storage"])
+ sign(publishing.publications["storage.sql"])
+ sign(publishing.publications["storage.xml"])
+ sign(publishing.publications["storage.netcdf"])
+ sign(publishing.publications["storage.geotiff"])
+ sign(publishing.publications["storage.earthobservation"])
+ sign(publishing.publications["cloud.aws"])
+ sign(publishing.publications["profile.france"])
+ sign(publishing.publications["profile.japan"])
+ sign(publishing.publications["console"])
+ sign(publishing.publications["openoffice"])
+ }
+}
diff --git a/optional/build.gradle.kts b/optional/build.gradle.kts
index 0bfacae2f5..a96990dfa5 100644
--- a/optional/build.gradle.kts
+++ b/optional/build.gradle.kts
@@ -32,6 +32,7 @@ if (!File(pathToFX, "javafx.base.jar").isFile()) {
plugins {
`java-library`
`maven-publish`
+ signing
id("org.apache.sis.buildtools")
}
@@ -175,3 +176,10 @@ publishing {
}
}
}
+
+signing {
+ useGpgCmd()
+ if (System.getProperty("org.apache.sis.releaseVersion") != null) {
+ sign(publishing.publications["gui"])
+ }
+}
