Browse Source

Merge branch '3.3.x' into 3.4.x

Closes gh-44729
pull/44789/head
Stéphane Nicoll 11 months ago
parent
commit
0ca4be2d52
  1. 4
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java
  2. 4
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java
  3. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 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.
@ -33,7 +33,7 @@ import org.springframework.util.StringUtils; @@ -33,7 +33,7 @@ import org.springframework.util.StringUtils;
* @since 2.0.0
* @see ServerProperties
*/
@ConfigurationProperties(prefix = "management.server", ignoreUnknownFields = true)
@ConfigurationProperties("management.server")
public class ManagementServerProperties {
/**

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 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.
@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Marten Deinum
* @since 1.1.0
*/
@ConfigurationProperties(prefix = "spring.groovy.template", ignoreUnknownFields = true)
@ConfigurationProperties("spring.groovy.template")
public class GroovyTemplateProperties extends AbstractTemplateViewResolverProperties {
public static final String DEFAULT_RESOURCE_LOADER_PATH = "classpath:/templates/";

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

@ -76,7 +76,7 @@ import org.springframework.util.unit.DataSize; @@ -76,7 +76,7 @@ import org.springframework.util.unit.DataSize;
* @author Lasse Wulff
* @since 1.0.0
*/
@ConfigurationProperties(prefix = "server", ignoreUnknownFields = true)
@ConfigurationProperties("server")
public class ServerProperties {
/**

Loading…
Cancel
Save