From e94afe845d6eff9bac076e5196f66a8e89cc73d2 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 30 Nov 2022 11:18:58 -0500
Subject: [PATCH] Update instead of replace environment in bootBuildImage
 documentation

Closes gh-32886
---
 .../docs/gradle/packaging/boot-build-image-env-proxy.gradle | 6 ++----
 .../gradle/packaging/boot-build-image-env-runtime.gradle    | 6 ++----
 .../src/docs/gradle/packaging/boot-build-image-env.gradle   | 2 +-
 .../docs/gradle/packaging/boot-build-image-env.gradle.kts   | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle
index ca9f7be96bc1..8ad32e87a79c 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle
@@ -5,10 +5,8 @@ plugins {
 
 // tag::env[]
 tasks.named("bootBuildImage") {
-	environment = [
-			"HTTP_PROXY" : "http://proxy.example.com",
-			"HTTPS_PROXY": "https://proxy.example.com"
-	]
+	environment["HTTP_PROXY"] = "http://proxy.example.com"
+	environment["HTTPS_PROXY"] = "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 b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle
index 1027341e2d4e..b58a1089d956 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle
@@ -9,10 +9,8 @@ tasks.named("bootJar") {
 
 // tag::env-runtime[]
 tasks.named("bootBuildImage") {
-	environment = [
-			"BPE_DELIM_JAVA_TOOL_OPTIONS" : " ",
-			"BPE_APPEND_JAVA_TOOL_OPTIONS" : "-XX:+HeapDumpOnOutOfMemoryError"
-	]
+	environment["BPE_DELIM_JAVA_TOOL_OPTIONS"] = " "
+	environment["BPE_APPEND_JAVA_TOOL_OPTIONS"] = "-XX:+HeapDumpOnOutOfMemoryError"
 }
 // end::env-runtime[]
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle
index 92aab0f5a41d..4f6f6db2eb8a 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle
@@ -5,7 +5,7 @@ plugins {
 
 // tag::env[]
 tasks.named("bootBuildImage") {
-	environment = ["BP_JVM_VERSION" : "17"]
+	environment["BP_JVM_VERSION"] = "17"
 }
 // end::env[]
 
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 2e0afb7ecd7a..53338dd2e6ae 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(mapOf("BP_JVM_VERSION" to "17"))
+	environment.get().putAll(mapOf("BP_JVM_VERSION" to "17"))
 }
 // end::env[]