From f558e1d8e50d552d378f01b547b71701a8124e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 20 Jul 2026 13:13:10 +0200 Subject: [PATCH] Disable Spring Cloud bindings Spring Cloud Bindings still rely on the EnvironmentPostProcessor interface that was deprecated in Spring Boot 4.0. This commit disables this feature and adapts to new deprecation warnings. See gh-50955 --- .../boot/image/paketo/PaketoBuilderTests.java | 1 + .../paketo/PaketoBuilderTests-executableWarApp.gradle | 6 ++++++ .../image/paketo/PaketoBuilderTests-plainWarApp.gradle | 3 ++- .../boot/image/paketo/PaketoBuilderTests.gradle | 8 +++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/system-test/spring-boot-image-system-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java b/system-test/spring-boot-image-system-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java index d2e7d5259ed..37054f2da82 100644 --- a/system-test/spring-boot-image-system-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java +++ b/system-test/spring-boot-image-system-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java @@ -75,6 +75,7 @@ class PaketoBuilderTests { this.gradleBuild.expectDeprecationMessages("BPL_SPRING_CLOUD_BINDINGS_ENABLED.*true.*Deprecated"); this.gradleBuild.expectDeprecationMessages("Command \"packages\" is deprecated, use `syft scan` instead"); this.gradleBuild.expectDeprecationMessages("BP_ENABLE_RUNTIME_CERT_BINDING.*true.*Deprecated"); + this.gradleBuild.expectDeprecationMessages("Warning: BOM table is deprecated in this buildpack api version"); this.gradleBuild.gradleVersion(GradleVersions.maximumCompatible()); } diff --git a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle index e6b2bccdbca..6044cbaf9ba 100644 --- a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle +++ b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle @@ -49,3 +49,9 @@ bootWar { ) } } + +tasks.named('bootBuildImage') { + environment = [ + 'BP_SPRING_CLOUD_BINDINGS_DISABLED': 'true' + ] +} diff --git a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle index 5b1a4eef9a9..c47e47d828a 100644 --- a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle +++ b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle @@ -51,6 +51,7 @@ bootBuildImage { environment = [ 'BP_JVM_VERSION': java.targetCompatibility.getMajorVersion(), 'BP_TOMCAT_VERSION': '11.*', - 'BP_DEPENDENCY_MIRROR_DOWNLOADS_APACHE_ORG': 'https://archive.apache.org/dist' + 'BP_DEPENDENCY_MIRROR_DOWNLOADS_APACHE_ORG': 'https://archive.apache.org/dist', + 'BP_SPRING_CLOUD_BINDINGS_DISABLED': 'true' ] } diff --git a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle index 81b8c7f174e..5ec46859278 100644 --- a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle +++ b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle @@ -46,4 +46,10 @@ bootJar { 'Implementation-Title': "Paketo Test" ) } -} \ No newline at end of file +} + +tasks.named('bootBuildImage') { + environment = [ + 'BP_SPRING_CLOUD_BINDINGS_DISABLED': 'true' + ] +}