Jar entries should not depend on user TZ (#185)

This is a reproducibility related fix, as previous versions of takari-lifecycle produced JARs were reproducible only in same TZ as original. Fix was to use latest takari-archiver 1.0.3 that contains the fix. Fixes #172
takari · Sep 9, 2024 · 79cf56c · 79cf56c
1 parent 38c703c
commit 79cf56c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/takari-lifecycle-plugin/pom.xml b/takari-lifecycle-plugin/pom.xml
@@ -172,7 +172,7 @@
     <dependency>
       <groupId>io.takari</groupId>
       <artifactId>takari-archiver</artifactId>
-      <version>1.0.0</version>
+      <version>1.0.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/takari-lifecycle-plugin/src/main/java/io/takari/maven/plugins/jar/AggregateSource.java b/takari-lifecycle-plugin/src/main/java/io/takari/maven/plugins/jar/AggregateSource.java
@@ -32,7 +32,7 @@ public AggregateSource(List<Iterable<ExtendedArchiveEntry>> sources) {
 
     @Override
     public Iterable<ExtendedArchiveEntry> entries() {
-        final Predicate<ExtendedArchiveEntry> uniquePathFilter = new Predicate<ExtendedArchiveEntry>() {
+        final Predicate<ExtendedArchiveEntry> uniquePathFilter = new Predicate<>() {
             private final Set<String> entryNames = new HashSet<>();
 
             @Override

diff --git a/takari-lifecycle-plugin/src/main/java/io/takari/maven/plugins/jar/Jar.java b/takari-lifecycle-plugin/src/main/java/io/takari/maven/plugins/jar/Jar.java
@@ -265,7 +265,7 @@ private Iterable<ExtendedArchiveEntry> jarManifestSource(MavenProject project) t
         ByteArrayOutputStream buf = new ByteArrayOutputStream();
         manifest.write(buf);
 
-        return singleton((ExtendedArchiveEntry) new BytesEntry(MANIFEST_PATH, buf.toByteArray()));
+        return singleton(new BytesEntry(MANIFEST_PATH, buf.toByteArray()));
     }
 
     protected ExtendedArchiveEntry pomPropertiesSource(MavenProject project) throws IOException {

diff --git a/takari-lifecycle-plugin/src/test/java/io/takari/maven/plugins/jar/JarTest.java b/takari-lifecycle-plugin/src/test/java/io/takari/maven/plugins/jar/JarTest.java
@@ -23,12 +23,15 @@
 import java.net.URLClassLoader;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
+import java.util.TimeZone;
 import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -204,7 +207,7 @@ private static void assertZipEntries(File zipFile, String... expected) throws IO
                 actualSb.append(entry.isDirectory() ? "D " : "F ")
                         .append(entry.getName())
                         .append(' ')
-                        .append(entry.getTime())
+                        .append(dosToJavaTime(entry.getTime()))
                         .append('\n');
             }
 
@@ -217,6 +220,18 @@ private static void assertZipEntries(File zipFile, String... expected) throws IO
         }
     }
 
+    /**
+     * The method {@link ZipEntry#getTime()} "adjusts" the DOS timestamp ("local time") to Java time ("UTC") by using
+     * "default timezone" of the user. This means, that the method returns different timestamps in different Timezones.
+     * while the value to assert against is Java UTC time. Meaning, test would pass in some TZ but fail in others.
+     * Same applies to DST as well. This method merely "undoes" the adjustment, making it into UTC.
+     */
+    private static long dosToJavaTime(long time) {
+        Calendar cal = Calendar.getInstance(TimeZone.getDefault(), Locale.ROOT);
+        cal.setTimeInMillis(time);
+        return time + ((cal.get(Calendar.ZONE_OFFSET) + (cal.get(Calendar.DST_OFFSET))));
+    }
+
     private static <T> List<T> toList(Enumeration<T> e) {
         ArrayList<T> l = new ArrayList<T>();
         while (e.hasMoreElements()) {