From 6a1ce77eb4a32d90038db776f48575c66f8cc529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Sol=C3=B3rzano?= <jorsol@gmail.com>
Date: Tue, 28 Jun 2022 10:57:20 +0200
Subject: [PATCH] [MSOURCES-132] - Update Maven Archiver to 3.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jorge Solórzano <jorsol@gmail.com>
---
 pom.xml                                              |  7 ++++++-
 src/it/reproducible/verify.groovy                    | 12 +++++++++++-
 .../maven/plugins/source/AbstractSourceJarMojo.java  |  4 +---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 654d1d3..82d87fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,13 +120,18 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
-      <version>3.5.0</version>
+      <version>3.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>3.4.2</version>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.11.0</version>
+    </dependency>
   
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
diff --git a/src/it/reproducible/verify.groovy b/src/it/reproducible/verify.groovy
index 54ebe23..19b8af7 100644
--- a/src/it/reproducible/verify.groovy
+++ b/src/it/reproducible/verify.groovy
@@ -18,6 +18,8 @@
  * under the License.
  */
 
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
 import org.apache.commons.compress.archivers.zip.*;
 
 File deployDir = new File( basedir, 'target/repo/org/apache/maven/its/reproducible/1.0' )
@@ -63,13 +65,21 @@ long javaToDosTime( Date d )
            d.getSeconds() >> 1;
 }
 
+// Normalize to UTC
+long millis = Instant.parse( "2019-08-21T18:28:52Z" ).toEpochMilli();
+Calendar cal = Calendar.getInstance();
+cal.setTimeInMillis( millis );
+millis = millis - ( cal.get( Calendar.ZONE_OFFSET ) + cal.get( Calendar.DST_OFFSET ) );
+FileTime timestamp = FileTime.fromMillis( millis );
+
 for ( ZipArchiveEntry zae : zipFile.getEntries() )
 {
     r.append( sprintf( "%d %4d (%3d) %8x %d %<tF %<tT %<tz %d %6o %s %s; %s\n", zae.getMethod(), zae.getSize(), zae.getCompressedSize(), zae.getCrc(), zae.getTime(), javaToDosTime( zae.getLastModifiedDate() ), zae.getUnixMode(), zae.getName(), ( zae.getComment() == null ) ? '-' : zae.getComment(), describeExtra( zae.getExtraFields() ) ) )
+    assert timestamp.equals( zae.getLastModifiedTime() );
 }
 zipFile.close();
 
 String buf = r.toString()
 println buf
 
-assert buf.startsWith( "reproducible-1.0-sources.jar sha1 = 3a3687b063cfc164fbbccd1b9573b4232f540e8a" )
+assert buf.startsWith( "reproducible-1.0-sources.jar sha1 = f159379802c1f0dc1083af21352286b09d364519" )
diff --git a/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java b/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
index 72c475a..dab4cbc 100644
--- a/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
@@ -432,9 +432,8 @@ protected MavenArchiver createArchiver()
         archiver.setCreatedBy( "Maven Source Plugin", "org.apache.maven.plugins", "maven-source-plugin" );
         archiver.setBuildJdkSpecDefaultEntry( false );
 
-        
         // configure for Reproducible Builds based on outputTimestamp value
-        archiver.configureReproducible( outputTimestamp );
+        archiver.configureReproducibleBuild( outputTimestamp );
 
         if ( project.getBuild() != null )
         {
@@ -442,7 +441,6 @@ protected MavenArchiver createArchiver()
 
             for ( Resource r : resources )
             {
-
                 if ( r.getDirectory().endsWith( "maven-shared-archive-resources" ) )
                 {
                     addDirectory( archiver.getArchiver(), new File( r.getDirectory() ), getCombinedIncludes( null ),