13
0
2025-07-17 05:41:00 +00:00
committed by Git OBS Bridge
parent f125c3d4c2
commit 2faf59ff75
3 changed files with 7 additions and 34 deletions

View File

@@ -1,32 +0,0 @@
From c520041530230b5a143f36405de7a9a21871d5fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Mon, 30 Sep 2024 19:53:57 +0200
Subject: [PATCH 3/3] reproducible from environment
---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 8a191aef..cf2064c7 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -2671,6 +2671,15 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
private String getBottomText() {
final String inceptionYear = project.getInceptionYear();
+ final String sde = System.getenv("SOURCE_DATE_EPOCH");
+ if (sde != null) {
+ if (outputTimestamp == null
+ || outputTimestamp.length() < 1
+ || ((outputTimestamp.length() == 1) && !Character.isDigit(outputTimestamp.charAt(0)))) {
+ outputTimestamp = sde;
+ }
+ }
+
// get Reproducible Builds outputTimestamp date value or the current local date.
final LocalDate localDate = MavenArchiver.parseBuildOutputTimestamp(outputTimestamp)
.map(instant -> instant.atZone(ZoneOffset.UTC).toLocalDate())
--
2.50.1

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 17 05:40:16 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Removed patch:
* 0003-reproducible-from-environment.patch
+ We made the modification more central in maven-archiver
-------------------------------------------------------------------
Tue Jul 15 11:40:44 UTC 2025 - Fridrich Strba <fstrba@suse.com>

View File

@@ -34,7 +34,6 @@ Source1: %{base_name}-build.xml
Patch0: %{base_name}-bootstrap-resources.patch
Patch1: 0001-Be-consistent-about-data-encoding-when-copying-files.patch
Patch2: 0002-Make-the-legacyMode-consistent-and-actually-useful.patch
#Patch3: 0003-reproducible-from-environment.patch
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3
BuildRequires: apache-commons-text
@@ -118,7 +117,6 @@ cp %{SOURCE1} build.xml
%endif
%patch -P 1 -p1
%patch -P 2 -p1
#patch -P 3 -p1
%pom_remove_dep :::test: