Merge branch '2.5.x' into 2.6.x

Closes gh-29980
spring-projects · Feb 23, 2022 · acd1ba0 · acd1ba0
2 parents 894860c + 67b13ee
commit acd1ba0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...ing-boot/src/main/java/org/springframework/boot/context/properties/bind/DefaultValue.java b/...ing-boot/src/main/java/org/springframework/boot/context/properties/bind/DefaultValue.java
@@ -32,6 +32,9 @@
  * {@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