From 6bd43c3b9e932d3fd5431943ac4a2dee03ebed6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sun, 23 Oct 2022 19:06:38 +0200 Subject: [PATCH] keep file/directory permissions in Reproducible Builds mode --- .../org/codehaus/plexus/archiver/AbstractArchiver.java | 7 +------ src/main/java/org/codehaus/plexus/archiver/Archiver.java | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java index da3a7da24..207717fd9 100755 --- a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java @@ -1283,12 +1283,7 @@ public void configureReproducibleBuild( FileTime lastModifiedTime ) // 2. sort filenames in each directory when scanning filesystem setFilenameComparator( String::compareTo ); - // 3. ignore file/directory mode from filesystem, since they may vary based on local user umask - // notice: this overrides execute bit on Unix (that is already ignored on Windows) - setFileMode( Archiver.DEFAULT_FILE_MODE ); - setDirectoryMode( Archiver.DEFAULT_DIR_MODE ); - - // 4. ignore uid/gid from filesystem (for tar) + // 3. ignore uid/gid from filesystem (for tar) setOverrideUid( 0 ); setOverrideUserName( "root" ); // is it possible to avoid this, like "tar --numeric-owner"? setOverrideGid( 0 ); diff --git a/src/main/java/org/codehaus/plexus/archiver/Archiver.java b/src/main/java/org/codehaus/plexus/archiver/Archiver.java index d51f6f49a..ed0240516 100644 --- a/src/main/java/org/codehaus/plexus/archiver/Archiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/Archiver.java @@ -488,7 +488,6 @@ ResourceIterator getResources() * * * @param lastModifiedTime The last modification time of the entries