File tree Expand file tree Collapse file tree 3 files changed +18
-2
lines changed
main/java/org/apache/maven/plugins/assembly/archive/archiver Expand file tree Collapse file tree 3 files changed +18
-2
lines changed Original file line number Diff line number Diff line change @@ -168,7 +168,7 @@ under the License.
168168 <dependency >
169169 <groupId >org.codehaus.plexus</groupId >
170170 <artifactId >plexus-archiver</artifactId >
171- <version >4.6.3 </version >
171+ <version >4.7.0 </version >
172172 </dependency >
173173 <dependency >
174174 <groupId >org.apache.maven</groupId >
Original file line number Diff line number Diff line change @@ -73,14 +73,20 @@ effective = sb.toString()
7373// 2. on *nix, based on umask system configuration, group write mode differs:
7474// - umask == 002: many Linux distro and MacOS create group writable files/directories:
7575// => reference result is zip-content-775.txt: directory=40775, file=100664, executable=100775
76- // - umask == 022: some Linux distros like Fedora is create group read-only files/directories:
76+ // - umask == 022: some Linux distros like recent Fedora create group read-only files/directories:
7777// => reference result is zip-content-755.txt: directory=40755, file=100644, executable=100755
78+ // with MASSEMBLY-989, umask 022 is forced: 775 is not happening any more, even if the IT check could detect it...
7879reference = " zip-content-" + ( effective. contains( " 644 executable" ) ? " win" : effective. contains( " 0775" ) ? " 775" : " 755" ) + " .txt"
7980content = new File ( basedir, reference ). text. replace( " \r\n " , " \n " )
8081
8182println ( ' effective content:' )
8283println ( effective )
8384println ( ' comparing against reference ' + reference )
85+ if ( reference. contains( " 775" ) )
86+ {
87+ println ( ' 775 reference is not supposed to happen since MASSEMBLY-989' )
88+ return -1
89+ }
8490
8591index = content. indexOf( ' resulting sha1:' )
8692contentMode = content. substring( 0 , index )
Original file line number Diff line number Diff line change @@ -909,6 +909,16 @@ public FileTime getLastModifiedTime() {
909909 return delegate .getLastModifiedTime ();
910910 }
911911
912+ @ Override
913+ public void setUmask (int umask ) {
914+ delegate .setUmask (umask );
915+ }
916+
917+ @ Override
918+ public int getUmask () {
919+ return delegate .getUmask ();
920+ }
921+
912922 @ Override
913923 public void configureReproducibleBuild (FileTime fileTime ) {
914924 delegate .configureReproducibleBuild (fileTime );
You can’t perform that action at this time.
0 commit comments