Merge branch '2.2.x'

This commit is contained in:
Stephane Nicoll
2019-11-12 14:05:05 +01:00

View File

@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
public final class ConfigurationPropertySources { public final class ConfigurationPropertySources {
/** /**
* The name of the {@link PropertySource} {@link #adapt adapter}. * The name of the {@link PropertySource} {@link #attach(Environment) adapter}.
*/ */
private static final String ATTACHED_PROPERTY_SOURCE_NAME = "configurationProperties"; private static final String ATTACHED_PROPERTY_SOURCE_NAME = "configurationProperties";