diff --git a/packages/m/maven-assembly-plugin/.files b/packages/m/maven-assembly-plugin/.files index 1ca3594b505..83eb9f19d9b 100644 Binary files a/packages/m/maven-assembly-plugin/.files and b/packages/m/maven-assembly-plugin/.files differ diff --git a/packages/m/maven-assembly-plugin/.rev b/packages/m/maven-assembly-plugin/.rev index 6bf7c872ac4..a7602576d93 100644 --- a/packages/m/maven-assembly-plugin/.rev +++ b/packages/m/maven-assembly-plugin/.rev @@ -39,4 +39,12 @@ 3.6.0 1109284 + + d46fc251a71914d3fa2dc5ab2f923bc0 + 3.6.0 + + dimstar_suse + improvements for reproducibility + 1112413 + diff --git a/packages/m/maven-assembly-plugin/aggregated-timestamp.patch b/packages/m/maven-assembly-plugin/aggregated-timestamp.patch new file mode 100644 index 00000000000..644955111ff --- /dev/null +++ b/packages/m/maven-assembly-plugin/aggregated-timestamp.patch @@ -0,0 +1,15 @@ +--- maven-assembly-plugin-3.6.0/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java 2023-05-11 20:35:38.000000000 +0200 ++++ maven-assembly-plugin-3.6.0/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java 2023-09-14 15:46:56.659107385 +0200 +@@ -95,7 +95,11 @@ + f.deleteOnExit(); + + try (Writer writer = getWriter(f)) { +- writer.write(commentChars + " Aggregated on " + new Date() + " from: "); ++ Date now = new Date(); ++ if (System.getenv("SOURCE_DATE_EPOCH") != null) { ++ now = new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))); ++ } ++ writer.write(commentChars + " Aggregated on " + now + " from: "); + + for (final String filename : filenames) { + writer.write("\n" + commentChars + " " + filename); diff --git a/packages/m/maven-assembly-plugin/maven-assembly-plugin.changes b/packages/m/maven-assembly-plugin/maven-assembly-plugin.changes index f57b3cda618..f8286fdc98d 100644 --- a/packages/m/maven-assembly-plugin/maven-assembly-plugin.changes +++ b/packages/m/maven-assembly-plugin/maven-assembly-plugin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 14 14:00:28 UTC 2023 - Fridrich Strba + +- Added patch: + * aggregated-timestamp.patch + + use SOURCE_DATE_EPOCH for the timestamp of aggregated + properties + ------------------------------------------------------------------- Wed Sep 6 13:45:19 UTC 2023 - Fridrich Strba diff --git a/packages/m/maven-assembly-plugin/maven-assembly-plugin.spec b/packages/m/maven-assembly-plugin/maven-assembly-plugin.spec index 2a24cf1d076..8ab23cce6f8 100644 --- a/packages/m/maven-assembly-plugin/maven-assembly-plugin.spec +++ b/packages/m/maven-assembly-plugin/maven-assembly-plugin.spec @@ -24,6 +24,7 @@ License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/plugins/maven-assembly-plugin/ Source0: https://downloads.apache.org/maven/plugins/%{name}-%{version}-source-release.zip +Patch0: aggregated-timestamp.patch BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: maven-local @@ -64,6 +65,7 @@ This package provides %{summary}. %prep %setup -q +%patch0 -p1 %pom_remove_dep jaxen:jaxen