Merge branch '2.6.x' into 2.7.x

Closes gh-30195

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java

@@ -80,7 +80,7 @@ public class GradleBuild {
 
 	private GradleVersion expectDeprecationWarnings;
 
-	private String[] expectedDeprecationMessages;
+	private List<String> expectedDeprecationMessages = new ArrayList<>();
 
 	private boolean configurationCache = false;
 
@@ -155,7 +155,7 @@ public class GradleBuild {
 	}
 
 	public GradleBuild expectDeprecationMessages(String... messages) {
-		this.expectedDeprecationMessages = messages;
+		this.expectedDeprecationMessages.addAll(Arrays.asList(messages));
 		return this;
 	}
 

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

@@ -68,6 +68,7 @@ class PaketoBuilderTests {
 	void configureGradleBuild() {
 		this.gradleBuild.scriptProperty("systemTestMavenRepository",
 				new File("build/system-test-maven-repository").getAbsoluteFile().toURI().toASCIIString());
+		this.gradleBuild.expectDeprecationMessages("BPL_SPRING_CLOUD_BINDINGS_ENABLED.*true.*Deprecated");
 	}
 
 	@Test
@@ -125,7 +126,7 @@ class PaketoBuilderTests {
 			container.waitingFor(Wait.forHttp("/test")).start();
 			container.stop();
 		}
-		this.gradleBuild.expectDeprecationMessages("BOM table is deprecated in this buildpack api version");
+		this.gradleBuild.expectDeprecationMessages("BOM table is deprecated");
 		result = buildImage(imageName);
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {