File tree 3 files changed +18
-2
lines changed
main/java/org/apache/maven/plugins/assembly/archive/archiver
3 files changed +18
-2
lines changed Original file line number Diff line number Diff line change @@ -168,7 +168,7 @@ under the License.
168
168
<dependency >
169
169
<groupId >org.codehaus.plexus</groupId >
170
170
<artifactId >plexus-archiver</artifactId >
171
- <version >4.6.3 </version >
171
+ <version >4.7.0 </version >
172
172
</dependency >
173
173
<dependency >
174
174
<groupId >org.apache.maven</groupId >
Original file line number Diff line number Diff line change @@ -73,14 +73,20 @@ effective = sb.toString()
73
73
// 2. on *nix, based on umask system configuration, group write mode differs:
74
74
// - umask == 002: many Linux distro and MacOS create group writable files/directories:
75
75
// => 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:
77
77
// => 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...
78
79
reference = " zip-content-" + ( effective. contains( " 644 executable" ) ? " win" : effective. contains( " 0775" ) ? " 775" : " 755" ) + " .txt"
79
80
content = new File ( basedir, reference ). text. replace( " \r\n " , " \n " )
80
81
81
82
println ( ' effective content:' )
82
83
println ( effective )
83
84
println ( ' 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
+ }
84
90
85
91
index = content. indexOf( ' resulting sha1:' )
86
92
contentMode = content. substring( 0 , index )
Original file line number Diff line number Diff line change @@ -909,6 +909,16 @@ public FileTime getLastModifiedTime() {
909
909
return delegate .getLastModifiedTime ();
910
910
}
911
911
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
+
912
922
@ Override
913
923
public void configureReproducibleBuild (FileTime fileTime ) {
914
924
delegate .configureReproducibleBuild (fileTime );
You can’t perform that action at this time.
0 commit comments