Merge branch '3.1.x' into 3.2.x

Closes gh-40804

Author: wilkinsona

spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java

@@ -32,6 +32,7 @@
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
@@ -150,6 +151,7 @@ void executableJarAppBuiltTwiceWithCaching() throws Exception {
 	}
 
 	@Test
+	@Disabled("0.4.292 of the builder launches an unpacked jar rather than the script in bin")
 	void bootDistZipJarApp() throws Exception {
 		writeMainClass();
 		String projectName = this.gradleBuild.getProjectDir().getName();