Merge branch '2.7.x'

Closes gh-31825
2022-07-20 15:11:30 -05:00
parent de672f4330 09c7ce6dab
commit 36d6106bb0
14 changed files with 43 additions and 68 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle
@@ -7,11 +7,6 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'

 bootBuildImage {
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	publish = true
-	docker {
-		publishRegistry {
-			username = "user"
-			password = "secret"
-		}
-	}
 }