(maven-shade-plugin) branch master updated: [MSHADE-471] deal with DST

[hboutemy]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 7de9ae7  [MSHADE-471] deal with DST
7de9ae7 is described below

commit 7de9ae718876c5b1a9808726c8ad1e101aa5db0d
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sat Apr 13 17:29:05 2024 +0200

    [MSHADE-471] deal with DST
---
 src/main/java/org/apache/maven/plugins/shade/DefaultShader.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java 
b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index c4b22bf..c11978e 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -34,6 +34,7 @@ import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -43,7 +44,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.TimeZone;
 import java.util.concurrent.Callable;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -102,7 +102,9 @@ public class DefaultShader implements Shader {
                 for (ZipExtraField field : fields) {
                     if 
(X5455_ExtendedTimestamp.HEADER_ID.equals(field.getHeaderId())) {
                         // extended timestamp extra field: need to translate 
UTC to local time for Reproducible Builds
-                        return entry.getTime() - 
TimeZone.getDefault().getRawOffset();
+                        Calendar cal = Calendar.getInstance();
+                        cal.setTimeInMillis(entry.getTime());
+                        return entry.getTime() - 
(cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET));
                     }
                 }
             } catch (ZipException ze) {