Merge branch '3.1.x' into 3.2.x

scottfrederick · scottfrederick · commit 2ef6b4243243 · 2024-02-11T13:04:56.000-06:00
Closes gh-39511
diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java
@@ -73,6 +73,7 @@ void configureGradleBuild() {
 		this.gradleBuild.scriptPropertyFrom(new File("../../gradle.properties"), "nativeBuildToolsVersion");
 		this.gradleBuild.expectDeprecationMessages("BPL_SPRING_CLOUD_BINDINGS_ENABLED.*true.*Deprecated");
 		this.gradleBuild.expectDeprecationMessages("BOM table is deprecated");
+		this.gradleBuild.expectDeprecationMessages("Command \"packages\" is deprecated, use `syft scan` instead");
 		this.gradleBuild.gradleVersion(GradleVersions.maximumCompatible());
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ void configureGradleBuild() {`
`73`	`73`	`this.gradleBuild.scriptPropertyFrom(new File("../../gradle.properties"), "nativeBuildToolsVersion");`
`74`	`74`	`this.gradleBuild.expectDeprecationMessages("BPL_SPRING_CLOUD_BINDINGS_ENABLED.true.Deprecated");`
`75`	`75`	`this.gradleBuild.expectDeprecationMessages("BOM table is deprecated");`
	`76`	+ this.gradleBuild.expectDeprecationMessages("Command \"packages\" is deprecated, use `syft scan` instead");
`76`	`77`	`this.gradleBuild.gradleVersion(GradleVersions.maximumCompatible());`
`77`	`78`	`}`
`78`	`79`