Skip to content

Commit 0ca4be2

Browse files
committed
Merge branch '3.3.x' into 3.4.x
Closes gh-44729
2 parents 01719c4 + 15efbd6 commit 0ca4be2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
3333
* @since 2.0.0
3434
* @see ServerProperties
3535
*/
36-
@ConfigurationProperties(prefix = "management.server", ignoreUnknownFields = true)
36+
@ConfigurationProperties("management.server")
3737
public class ManagementServerProperties {
3838

3939
/**

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
2727
* @author Marten Deinum
2828
* @since 1.1.0
2929
*/
30-
@ConfigurationProperties(prefix = "spring.groovy.template", ignoreUnknownFields = true)
30+
@ConfigurationProperties("spring.groovy.template")
3131
public class GroovyTemplateProperties extends AbstractTemplateViewResolverProperties {
3232

3333
public static final String DEFAULT_RESOURCE_LOADER_PATH = "classpath:/templates/";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
* @author Lasse Wulff
7777
* @since 1.0.0
7878
*/
79-
@ConfigurationProperties(prefix = "server", ignoreUnknownFields = true)
79+
@ConfigurationProperties("server")
8080
public class ServerProperties {
8181

8282
/**

0 commit comments

Comments
 (0)