Merge branch '2.4.x'

Closes gh-26165

Merge branch '2.4.x'
Closes gh-26165
55b9fc12 · Stephane Nicoll · cf5334da · 52543b84 · 55b9fc12
Commit 55b9fc12 authored Apr 20, 2021 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

additional-spring-configuration-metadata.json ...es/META-INF/additional-spring-configuration-metadata.json +1 -1

No files found.
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -914,7 +914,7 @@
    {
      "name": "spring.profiles.include",
      "type": "java.util.List<java.lang.String>",
-      "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
+      "sourceType": "org.springframework.boot.context.config.Profiles",
      "description": "Unconditionally activate the specified comma-separated list of profiles (or list of profiles if using YAML)."
    },
    {