From 34687af5106bd5d1f31c9167875f2d893b8ada65 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 15 Dec 2022 08:58:35 -0500 Subject: [PATCH] Use spring.config.activate.on-profile instead of spring.profiles for Boot 3 compatibility. Fixes #1177 (#1182) Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> --- .../cloud/bootstrap/BootstrapConfigFileApplicationListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java index 9ab18217..323643ac 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java @@ -635,7 +635,7 @@ public class BootstrapConfigFileApplicationListener return loaded.stream().map((propertySource) -> { Binder binder = new Binder(ConfigurationPropertySources.from(propertySource), this.placeholdersResolver); - String[] profiles = binder.bind("spring.profiles", STRING_ARRAY).orElse(null); + String[] profiles = binder.bind("spring.config.activate.on-profile", STRING_ARRAY).orElse(null); Set activeProfiles = getProfiles(binder, ACTIVE_PROFILES_PROPERTY); Set includeProfiles = getProfiles(binder, INCLUDE_PROFILES_PROPERTY); return new Document(propertySource, profiles, activeProfiles, includeProfiles);