Update maven to version 3.9.2 / rev 18 via SR 1108981

https://build.opensuse.org/request/show/1108981 by user fstrba + anag+factory More reproducible stuff
bmwiedemann · Sep 6, 2023 · 16f034e · 16f034e
1 parent 0943734
commit 16f034e
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 0 deletions.
diff --git a/packages/m/maven/.files b/packages/m/maven/.files
diff --git a/packages/m/maven/.rev b/packages/m/maven/.rev
@@ -135,4 +135,12 @@
     <comment>3.9.2</comment>
     <requestid>1093804</requestid>
   </revision>
+  <revision rev="18" vrev="2">
+    <srcmd5>7cc2a9eaae59e2f3306536eeb69808f0</srcmd5>
+    <version>3.9.2</version>
+    <time>1694019408</time>
+    <user>anag+factory</user>
+    <comment>More reproducible stuff</comment>
+    <requestid>1108981</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/m/maven/0005-Reproducible-maven.build.timestamp.patch b/packages/m/maven/0005-Reproducible-maven.build.timestamp.patch
@@ -0,0 +1,65 @@
+From 599dc0284287da5d48f578f5fe90b84dd4e0e485 Mon Sep 17 00:00:00 2001
+From: Emmanuel Bourg <ebourg@apache.org>
+Date: Mon, 4 Sep 2023 17:10:19 +0200
+Subject: [PATCH 5/5] Reproducible maven.build.timestamp
+
+Set the maven.build.timestamp variable to the date defined by
+the SOURCE_DATE_EPOCH environment variable to make the Maven
+builds reproducible.
+---
+ .../interpolation/BuildTimestampValueSource.java       | 10 +++++++++-
+ .../maven/model/interpolation/MavenBuildTimestamp.java | 10 +++++++++-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
+index f2af8036a..9e0db2cb0 100644
+--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
++++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
+@@ -44,7 +44,15 @@ public BuildTimestampValueSource(Date startTime, String format) {
+     public Object getValue(String expression) {
+         if ("build.timestamp".equals(expression) || "maven.build.timestamp".equals(expression)) {
+             if (formattedDate == null && startTime != null) {
+-                formattedDate = new SimpleDateFormat(format).format(startTime);
++                if ( System.getenv( "SOURCE_DATE_EPOCH" ) == null ) {
++                    formattedDate = new SimpleDateFormat( format ).format( startTime );
++                } else {
++                    // Use the SOURCE_DATE_EPOCH timestamp and make the format locale insensitive
++                    SimpleDateFormat fmt = new SimpleDateFormat( format, java.util.Locale.ENGLISH );
++                    fmt.setTimeZone( java.util.TimeZone.getTimeZone( "UTC" ) );
++                    Date date = new Date( 1000 * Long.parseLong( System.getenv( "SOURCE_DATE_EPOCH" ) ) );
++                    formattedDate = fmt.format( date );
++                }
+             }
+
+             return formattedDate;
+diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
+index e1721334f..2ea2ce381 100644
+--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
++++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
+@@ -21,6 +21,7 @@
+ import java.text.SimpleDateFormat;
+ import java.util.Date;
+ import java.util.GregorianCalendar;
++import java.util.Locale;
+ import java.util.Properties;
+ import java.util.TimeZone;
+
+@@ -56,7 +57,14 @@ public MavenBuildTimestamp(Date time, String timestampFormat) {
+         if (time == null) {
+             time = new Date();
+         }
+-        SimpleDateFormat dateFormat = new SimpleDateFormat(timestampFormat);
++
++        Locale locale = Locale.getDefault();
++        if ( System.getenv( "SOURCE_DATE_EPOCH" ) != null ) {
++            time = new Date( 1000 * Long.parseLong( System.getenv( "SOURCE_DATE_EPOCH" ) ) );
++            locale = Locale.ENGLISH;
++        }
++
++        SimpleDateFormat dateFormat = new SimpleDateFormat( timestampFormat, locale );
+         dateFormat.setCalendar(new GregorianCalendar());
+         dateFormat.setTimeZone(DEFAULT_BUILD_TIME_ZONE);
+         formattedTimestamp = dateFormat.format(time);
+-- 
+2.42.0
+
diff --git a/packages/m/maven/maven.changes b/packages/m/maven/maven.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep  4 15:13:23 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * 0005-Reproducible-maven.build.timestamp.patch
+    + debian patch to make maven builds more reproducible
+
 -------------------------------------------------------------------
 Mon Jun 19 15:31:21 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

diff --git a/packages/m/maven/maven.spec b/packages/m/maven/maven.spec
@@ -37,6 +37,7 @@ Patch1:         0001-Adapt-mvn-script.patch
 Patch2:         0002-Invoke-logback-via-reflection.patch
 Patch3:         0003-Remove-dependency-on-powermock.patch
 Patch4:         0004-Fix-build-with-qdox-2.0.1.patch
+Patch5:         0005-Reproducible-maven.build.timestamp.patch
 BuildRequires:  ant
 BuildRequires:  aopalliance
 BuildRequires:  apache-commons-cli
@@ -182,6 +183,7 @@ BuildArch:      noarch
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # not really used during build, but a precaution
 find -name '*.jar' -not -path '*/test/*' -delete