From 0b4f6ad518d3e64a4edc9aa2f79a2285b4aa2168 Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Tue, 10 May 2022 10:12:29 -0400 Subject: [PATCH] build: Use -notimestamp option for javadoc for reproducibility Signed-off-by: BJ Hargrave --- .../src/aQute/bnd/repository/maven/provider/Tool.java | 1 + build.gradle | 1 + gradle-plugins/biz.aQute.bnd.gradle/build.gradle.kts | 8 ++++++++ maven/bnd-plugin-parent/pom.xml | 1 + 4 files changed, 11 insertions(+) diff --git a/biz.aQute.repository/src/aQute/bnd/repository/maven/provider/Tool.java b/biz.aQute.repository/src/aQute/bnd/repository/maven/provider/Tool.java index eeecec3a04..8ca71ca81f 100644 --- a/biz.aQute.repository/src/aQute/bnd/repository/maven/provider/Tool.java +++ b/biz.aQute.repository/src/aQute/bnd/repository/maven/provider/Tool.java @@ -86,6 +86,7 @@ public Jar doJavadoc(Map options, boolean exportsOnly) throws Ex try (PrintWriter writer = IO.writer(javadocOptions)) { writer.println("-quiet"); + writer.println("-notimestamp"); // reproducibility writer.println("-protected"); writer.printf("%s '%s'%n", "-d", fileName(javadoc)); writer.println("-charset 'UTF-8'"); diff --git a/build.gradle b/build.gradle index a9fb01406b..8081ce347d 100644 --- a/build.gradle +++ b/build.gradle @@ -42,6 +42,7 @@ subprojects { "NotThreadSafe:t:", "GuardedBy:mf:\"Guarded By:\"" ] + options.noTimestamp = true } tasks.named("test") { useJUnitPlatform() diff --git a/gradle-plugins/biz.aQute.bnd.gradle/build.gradle.kts b/gradle-plugins/biz.aQute.bnd.gradle/build.gradle.kts index 1deb351f08..2a3c038942 100644 --- a/gradle-plugins/biz.aQute.bnd.gradle/build.gradle.kts +++ b/gradle-plugins/biz.aQute.bnd.gradle/build.gradle.kts @@ -192,6 +192,14 @@ tasks.withType { isReproducibleFileOrder = true } +// Reproducible javadoc +tasks.withType { + options { + this as StandardJavadocDocletOptions // unsafe cast + isNoTimestamp = true + } +} + tasks.pluginUnderTestMetadata { // Include dsl SourceSet pluginClasspath.from(sourceSets["dsl"].output) diff --git a/maven/bnd-plugin-parent/pom.xml b/maven/bnd-plugin-parent/pom.xml index 6d17b19ecb..77f3939b38 100644 --- a/maven/bnd-plugin-parent/pom.xml +++ b/maven/bnd-plugin-parent/pom.xml @@ -294,6 +294,7 @@ false none + true