From d1a0b8d53f92ec410d51bdd89aee979107541bd4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 28 Mar 2018 11:03:53 +0200 Subject: [PATCH] Clarify the format supported by @PropertySource Issue: SPR-16563 --- .../springframework/context/annotation/PropertySource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java b/spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java index 51ca200ebe..e2bf4129e7 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java @@ -173,8 +173,9 @@ public @interface PropertySource { /** * Indicate the resource location(s) of the properties file to be loaded. - * For example, {@code "classpath:/com/myco/app.properties"} or - * {@code "file:/path/to/file"}. + *

Both traditional and XML-based properties file formats are supported + * — for example, {@code "classpath:/com/myco/app.properties"} + * or {@code "file:/path/to/file.xml"}. *

Resource location wildcards (e.g. **/*.properties) are not permitted; * each location must evaluate to exactly one {@code .properties} resource. *

${...} placeholders will be resolved against any/all property sources already