[MRRESOURCES-139] Bump Bump maven-archiver from 3.6.0 to 3.6.1

Avoid using deprecated methods
apache · Sep 13, 2023 · 5ee6079 · 5ee6079
1 parent 296c2ab
commit 5ee6079
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -138,7 +138,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
-      <version>3.6.0</version>
+      <version>3.6.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

diff --git a/...ain/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java b/...ain/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
@@ -35,20 +35,20 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.TimeZone;
 import java.util.TreeMap;
 
 import org.apache.commons.io.output.DeferredFileOutputStream;
@@ -800,14 +800,13 @@ public Object internalGet(String key) {
         context.put(KEY_PROJECTS_ORGS, null);
         // the following properties are cheap to calculate, so we provide them eagerly
 
-        // Reproducible Builds: try to use reproducible output timestamp
-        MavenArchiver archiver = new MavenArchiver();
-        Date outputDate = archiver.parseOutputTimestamp(outputTimestamp);
-
         String inceptionYear = project.getInceptionYear();
-        SimpleDateFormat yearFormat = new SimpleDateFormat("yyyy");
-        yearFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-        String year = yearFormat.format((outputDate == null) ? new Date() : outputDate);
+
+        // Reproducible Builds: try to use reproducible output timestamp
+        String year = MavenArchiver.parseBuildOutputTimestamp(outputTimestamp)
+                .orElseGet(Instant::now)
+                .atZone(ZoneId.of("UTC+10"))
+                .format(DateTimeFormatter.ofPattern("yyyy"));
 
         if (inceptionYear == null || inceptionYear.isEmpty()) {
             if (getLog().isDebugEnabled()) {