root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '3.4.x' 

Closes gh-45154
This commit is contained in:
Phillip Webb 2025-04-10 16:09:07 -07:00
parent 9ced85978e 5a3fc4a48b
commit 14f46f374a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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