Merge branch '3.3.x'

Closes gh-41271

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/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[]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/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"
 	))

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/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[]