Merge branch '3.5.x'

Closes gh-48109

Author: snicoll

buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ImagePlatform.java

@@ -19,8 +19,10 @@
 import java.util.Objects;
 
 import org.jspecify.annotations.Nullable;
+import tools.jackson.databind.node.ObjectNode;
 
 import org.springframework.boot.buildpack.platform.docker.type.Image;
+import org.springframework.boot.buildpack.platform.json.SharedJsonMapper;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -108,19 +110,15 @@ public static ImagePlatform from(Image image) {
 	 * @return the JSON string
 	 */
 	public String toJson() {
-		StringBuilder json = new StringBuilder("{");
-		json.append(jsonPair("os", this.os));
+		ObjectNode json = SharedJsonMapper.get().createObjectNode();
+		json.put("os", this.os);
 		if (StringUtils.hasText(this.architecture)) {
-			json.append(",").append(jsonPair("architecture", this.architecture));
+			json.put("architecture", this.architecture);
 		}
 		if (StringUtils.hasText(this.variant)) {
-			json.append(",").append(jsonPair("variant", this.variant));
+			json.put("variant", this.variant);
 		}
-		return json.append("}").toString();
-	}
-
-	private String jsonPair(String name, String value) {
-		return "\"%s\":\"%s\"".formatted(name, value);
+		return json.toString();
 	}
 
 }