Merge branch '2.5.x' into 2.6.x

Closes gh-29980
3 years ago · acd1ba0eca
parent 894860c177 67b13ee4c7
commit acd1ba0eca
1 changed files with 3 additions and 0 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DefaultValue.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DefaultValue.java
@ -32,6 +32,9 @@ import java.lang.annotation.Target;
 * {@link org.springframework.boot.context.properties.ConfigurationProperties @ConfigurationProperties},
 * the default value for the property will not be used even if the property value is
 * empty.
+ * <p>
+ * NOTE: This annotation does not support property placeholder resolution and the value
+ * must be constant.
 *
 * @author Madhura Bhave
 * @since 2.2.0