You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/09/21 14:57:06 UTC
[maven-assembly-plugin] branch MASSEMBLY-921 updated: use
plexus-archiver w/ PR 124 merged to get reproducible uid/gid in tar
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MASSEMBLY-921
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
The following commit(s) were added to refs/heads/MASSEMBLY-921 by this push:
new 1bf0739 use plexus-archiver w/ PR 124 merged to get reproducible uid/gid in tar
1bf0739 is described below
commit 1bf0739e5e9aecf2d13b99b78bab00d193c650d4
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Sep 21 16:57:02 2019 +0200
use plexus-archiver w/ PR 124 merged to get reproducible uid/gid in tar
---
src/it/projects/reproducible/verify.groovy | 4 +-
.../archive/archiver/AssemblyProxyArchiver.java | 48 ++++++++++++++++++++++
2 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/it/projects/reproducible/verify.groovy b/src/it/projects/reproducible/verify.groovy
index 9917fca..f80fc4b 100644
--- a/src/it/projects/reproducible/verify.groovy
+++ b/src/it/projects/reproducible/verify.groovy
@@ -26,5 +26,5 @@ File deployDir = new File( basedir, 'target/repo/org/apache/maven/its/reproducib
assert deployDir.exists()
assert new File( deployDir, 'reproducible-1.0-src.zip.sha1' ).text == '079d0af3f42cd8cd3faad6b49547298cf8a3eb39'
-assert new File( deployDir, 'reproducible-1.0-src.tar.sha1' ).text == '2f8ed1e4e4fc64117e7cfc49ca655977acfd6668'
-assert new File( deployDir, 'reproducible-1.0-src.jar.sha1' ).text == '079d0af3f42cd8cd3faad6b49547298cf8a3eb39'
+assert new File( deployDir, 'reproducible-1.0-src.tar.sha1' ).text == '6433b2101247b3686faade1f4e81c972dbfe6d2f'
+assert new File( deployDir, 'reproducible-1.0-src.jar.sha1' ).text == '1bc78c1141aae276dcaef36c2a336cbb6014b220'
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
index 9ac4024..8e5f978 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
@@ -1055,4 +1055,52 @@ public class AssemblyProxyArchiver
delegate.configureReproducible( sourceDateEpoch );
}
+ @Override
+ public void setOverrideUid( int uid )
+ {
+ delegate.setOverrideUid( uid );
+ }
+
+ @Override
+ public void setOverrideUserName( String userName )
+ {
+ delegate.setOverrideUserName( userName );
+ }
+
+ @Override
+ public int getOverrideUid()
+ {
+ return delegate.getOverrideUid();
+ }
+
+ @Override
+ public String getOverrideUserName()
+ {
+ return delegate.getOverrideUserName();
+ }
+
+ @Override
+ public void setOverrideGid( int gid )
+ {
+ delegate.setOverrideGid( gid );
+ }
+
+ @Override
+ public void setOverrideGroupName( String groupName )
+ {
+ delegate.setOverrideGroupName( groupName );
+ }
+
+ @Override
+ public int getOverrideGid()
+ {
+ return delegate.getOverrideGid();
+ }
+
+ @Override
+ public String getOverrideGroupName()
+ {
+ return delegate.getOverrideGroupName();
+ }
+
}