Update maven-assembly-plugin to version 3.6.0 / rev 6 via SR 1112413

https://build.opensuse.org/request/show/1112413 by user fstrba + dimstar_suse improvements for reproducibility
bmwiedemann · Sep 20, 2023 · 5a7aece · 5a7aece
1 parent 24be506
commit 5a7aece
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 0 deletions.
diff --git a/packages/m/maven-assembly-plugin/.files b/packages/m/maven-assembly-plugin/.files
diff --git a/packages/m/maven-assembly-plugin/.rev b/packages/m/maven-assembly-plugin/.rev
@@ -39,4 +39,12 @@
     <comment>3.6.0</comment>
     <requestid>1109284</requestid>
   </revision>
+  <revision rev="6" vrev="2">
+    <srcmd5>d46fc251a71914d3fa2dc5ab2f923bc0</srcmd5>
+    <version>3.6.0</version>
+    <time>1695209480</time>
+    <user>dimstar_suse</user>
+    <comment>improvements for reproducibility</comment>
+    <requestid>1112413</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/m/maven-assembly-plugin/aggregated-timestamp.patch 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
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 14 14:00:28 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <fstrba@suse.com>
 

diff --git 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