Merge branch '3.2.x' into 3.3.x

wilkinsona · wilkinsona · commit a00304de2873 · 2024-07-24T19:22:49.000+01:00
Closes gh-41607
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java
@@ -150,11 +150,11 @@ CopyAction createCopyAction(Jar jar, ResolvedDependencies resolvedDependencies,
 	}
 
 	private Integer getDirMode(CopySpec copySpec) {
-		return getMode(copySpec, "getDirPermissions", copySpec::getDirMode);
+		return getMode(copySpec, "getDirPermissions", () -> copySpec.getDirMode());
 	}
 
 	private Integer getFileMode(CopySpec copySpec) {
-		return getMode(copySpec, "getFilePermissions", copySpec::getFileMode);
+		return getMode(copySpec, "getFilePermissions", () -> copySpec.getFileMode());
 	}
 
 	@SuppressWarnings("unchecked")

Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,11 @@ CopyAction createCopyAction(Jar jar, ResolvedDependencies resolvedDependencies,`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`private Integer getDirMode(CopySpec copySpec) {`
`153`		`- return getMode(copySpec, "getDirPermissions", copySpec::getDirMode);`
	`153`	`+ return getMode(copySpec, "getDirPermissions", () -> copySpec.getDirMode());`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`private Integer getFileMode(CopySpec copySpec) {`
`157`		`- return getMode(copySpec, "getFilePermissions", copySpec::getFileMode);`
	`157`	`+ return getMode(copySpec, "getFilePermissions", () -> copySpec.getFileMode());`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`@SuppressWarnings("unchecked")`