From a6f1bb9590a2126a44c7d9a08e3d6994b46fc77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sebastien.deleuze@broadcom.com>
Date: Thu, 20 Jun 2024 09:03:50 +0200
Subject: [PATCH] Update Kotlin DSL examples of bootBuildImage to be additive

See gh-41173
---
 .../docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts | 2 +-
 .../gradle/packaging/boot-build-image-env-runtime.gradle.kts    | 2 +-
 .../src/docs/gradle/packaging/boot-build-image-env.gradle.kts   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts
index 26f62d6b78e..daeafa87128 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 // tag::env[]
 tasks.named<BootBuildImage>("bootBuildImage") {
-	environment.set(mapOf("HTTP_PROXY" to "http://proxy.example.com",
+	environment.putAll(mapOf("HTTP_PROXY" to "http://proxy.example.com",
 						"HTTPS_PROXY" to "https://proxy.example.com"))
 }
 // end::env[]
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle.kts
index f4ebbe4e2cd..6f80be75c9b 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle.kts
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 // tag::env-runtime[]
 tasks.named<BootBuildImage>("bootBuildImage") {
-	environment.set(mapOf(
+	environment.putAll(mapOf(
 		"BPE_DELIM_JAVA_TOOL_OPTIONS" to " ",
 		"BPE_APPEND_JAVA_TOOL_OPTIONS" to "-XX:+HeapDumpOnOutOfMemoryError"
 	))
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts
index 976f502344c..0fd108ea19a 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 // tag::env[]
 tasks.named<BootBuildImage>("bootBuildImage") {
-	environment.set(environment.get() + mapOf("BP_JVM_VERSION" to "17"))
+	environment.put("BP_JVM_VERSION", "17")
 }
 // end::env[]