Merge branch '3.3.x' into 3.4.x

Closes gh-45153

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java

@@ -216,6 +216,7 @@ class ManagementWebSecurityAutoConfigurationTests {
 	static class CustomSecurityConfiguration {
 
 		@Bean
+		@SuppressWarnings("removal")
 		SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 			http.authorizeHttpRequests((requests) -> {
 				requests.requestMatchers(new AntPathRequestMatcher("/foo")).permitAll();
@@ -245,6 +246,7 @@ class ManagementWebSecurityAutoConfigurationTests {
 
 		@Bean
 		@Order(SecurityProperties.BASIC_AUTH_ORDER - 1)
+		@SuppressWarnings("removal")
 		SecurityFilterChain testRemoteDevToolsSecurityFilterChain(HttpSecurity http) throws Exception {
 			http.securityMatcher(new AntPathRequestMatcher("/**"));
 			http.authorizeHttpRequests((requests) -> requests.anyRequest().anonymous());

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java

@@ -26,6 +26,7 @@ import java.util.List;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import org.springframework.boot.buildpack.platform.json.MappedObject;
+import org.springframework.util.StringUtils;
 
 /**
  * Image details as returned from {@code Docker inspect}.
@@ -97,7 +98,7 @@ public class Image extends MappedObject {
 	 * @return the image OS
 	 */
 	public String getOs() {
-		return (this.os != null) ? this.os : "linux";
+		return (!StringUtils.hasText(this.os)) ? this.os : "linux";
 	}
 
 	/**