#114 added Archiver.setFilenameComparator(Comparator<String>)

permits optional ordering of archive entries to enable reproducible builds
codehaus-plexus · Aug 25, 2019 · 0ffc599 · 0ffc599
1 parent b1787bb
commit 0ffc599
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -57,12 +57,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.1.1</version>
+      <version>3.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-io</artifactId>
-      <version>3.1.1</version>
+      <version>3.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.UndeclaredThrowableException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -109,6 +110,11 @@ public abstract class AbstractArchiver
      */
     private Date lastModifiedDate;
 
+    /**
+     * @sine 4.2.0
+     */
+    private Comparator<String> filenameComparator;
+
     // contextualized.
     private ArchiverManager archiverManager;
 
@@ -352,6 +358,7 @@ public void addFileSet( @Nonnull final FileSet fileSet )
         collection.setUsingDefaultExcludes( fileSet.isUsingDefaultExcludes() );
         collection.setStreamTransformer( fileSet.getStreamTransformer() );
         collection.setFileMappers( fileSet.getFileMappers() );
+        collection.setFilenameComparator( getFilenameComparator() );
 
         if ( getOverrideDirectoryMode() > -1 || getOverrideFileMode() > -1 )
         {
@@ -1151,4 +1158,14 @@ public Date getLastModifiedDate()
         return lastModifiedDate;
     }
 
+    @Override
+    public void setFilenameComparator( Comparator<String> filenameComparator )
+    {
+        this.filenameComparator = filenameComparator;
+    }
+
+    public Comparator<String> getFilenameComparator()
+    {
+        return filenameComparator;
+    }
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/Archiver.java b/src/main/java/org/codehaus/plexus/archiver/Archiver.java
@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Map;
@@ -413,4 +414,8 @@ ResourceIterator getResources()
      */
     Date getLastModifiedDate();
 
+    /**
+     * @since 4.2.0
+     */
+    void setFilenameComparator( Comparator<String> filenameComparator );
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Map;
 import javax.annotation.Nonnull;
@@ -344,4 +345,9 @@ public Date getLastModifiedDate()
         return target.getLastModifiedDate();
     }
 
+    @Override
+    public void setFilenameComparator( final Comparator<String> filenameComparator )
+    {
+        target.setFilenameComparator( filenameComparator );
+    }
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Map;
 import javax.annotation.Nonnull;
@@ -359,4 +360,10 @@ public Date getLastModifiedDate()
         return null;
     }
 
+    @Override
+    public void setFilenameComparator( final Comparator<String> filenameComparator )
+    {
+
+    }
+
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -55,6 +56,8 @@ public class TrackingArchiver
 
     private Date lastModified;
 
+    private Comparator<String> filenameComparator;
+
     @Override
     public void createArchive()
         throws ArchiverException, IOException
@@ -415,4 +418,10 @@ public Date getLastModifiedDate()
         return lastModified;
     }
 
+
+    @Override
+    public void setFilenameComparator( final Comparator<String> filenameComparator )
+    {
+        this.filenameComparator = filenameComparator;
+    }
 }