Merge branch '3.4.x' into 3.5.x

Closes gh-46194

Author: wilkinsona

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java

@@ -256,7 +256,7 @@ private boolean skipProcessing(FileCopyDetails details) {
 		private void processDirectory(FileCopyDetails details) throws IOException {
 			String name = details.getRelativePath().getPathString();
 			ZipArchiveEntry entry = new ZipArchiveEntry(name + '/');
-			prepareEntry(entry, name, getTime(details), getFileMode(details));
+			prepareEntry(entry, name, getTime(details), getDirMode(details));
 			this.out.putArchiveEntry(entry);
 			this.out.closeArchiveEntry();
 			this.writtenDirectories.add(name);
@@ -476,17 +476,21 @@ private Long getTime(FileCopyDetails details) {
 
 		private int getDirMode() {
 			return (BootZipCopyAction.this.dirMode != null) ? BootZipCopyAction.this.dirMode
-					: UnixStat.DIR_FLAG | UnixStat.DEFAULT_DIR_PERM;
+					: UnixStat.DEFAULT_DIR_PERM;
 		}
 
 		private int getFileMode() {
 			return (BootZipCopyAction.this.fileMode != null) ? BootZipCopyAction.this.fileMode
-					: UnixStat.FILE_FLAG | UnixStat.DEFAULT_FILE_PERM;
+					: UnixStat.DEFAULT_FILE_PERM;
+		}
+
+		private int getDirMode(FileCopyDetails details) {
+			return (BootZipCopyAction.this.fileMode != null) ? BootZipCopyAction.this.dirMode : getPermissions(details);
 		}
 
 		private int getFileMode(FileCopyDetails details) {
 			return (BootZipCopyAction.this.fileMode != null) ? BootZipCopyAction.this.fileMode
-					: UnixStat.FILE_FLAG | getPermissions(details);
+					: getPermissions(details);
 		}
 
 		private int getPermissions(FileCopyDetails details) {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java

@@ -589,10 +589,10 @@ void defaultDirAndFileModesAreUsed() throws IOException {
 					continue;
 				}
 				if (entry.isDirectory()) {
-					assertEntryMode(entry, UnixStat.DIR_FLAG | UnixStat.DEFAULT_DIR_PERM);
+					assertEntryMode(entry, UnixStat.DEFAULT_DIR_PERM);
 				}
 				else {
-					assertEntryMode(entry, UnixStat.FILE_FLAG | UnixStat.DEFAULT_FILE_PERM);
+					assertEntryMode(entry, UnixStat.DEFAULT_FILE_PERM);
 				}
 			}
 		}