Merge branch '3.3.x' into 3.4.x

philwebb · philwebb · commit 96899e08d483 · 2025-04-10T16:30:04.000-07:00
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ public List<LayerId> getLayers() {
 	 * @return the image OS
 	 */
 	public String getOs() {
-		return (!StringUtils.hasText(this.os)) ? this.os : "linux";
+		return (!StringUtils.hasText(this.os)) ? "linux" : this.os;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2024 the original author or authors.`
	`2`	`+ * Copyright 2012-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -98,7 +98,7 @@ public List<LayerId> getLayers() {`
`98`	`98`	`* @return the image OS`
`99`	`99`	`*/`
`100`	`100`	`public String getOs() {`
`101`		`- return (!StringUtils.hasText(this.os)) ? this.os : "linux";`
	`101`	`+ return (!StringUtils.hasText(this.os)) ? "linux" : this.os;`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`