Skip to content

Commit eb307b9

Browse files
committed
Merge branch '3.5.x'
Closes gh-47359
2 parents 474c9cd + 14791f0 commit eb307b9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

core/spring-boot/src/main/java/org/springframework/boot/context/config/Profiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private Collection<String> getProfiles(Environment environment, Binder binder, P
106106
? Collections.emptySet()
107107
: StringUtils.commaDelimitedListToSet(StringUtils.trimAllWhitespace(environmentPropertyValue));
108108
validator.validate(environmentPropertyProfiles,
109-
() -> "Invalid profile property value found in Envronment under '%s'".formatted(type.getName()));
109+
() -> "Invalid profile property value found in Environment under '%s'".formatted(type.getName()));
110110
Set<String> environmentProfiles = new LinkedHashSet<>(Arrays.asList(type.get(environment)));
111111
BindResult<Set<String>> boundProfiles = binder.bind(type.getName(), STRING_SET, validator);
112112
if (hasProgrammaticallySetProfiles(type, environmentPropertyValue, environmentPropertyProfiles,

core/spring-boot/src/test/java/org/springframework/boot/context/config/ProfilesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ void invalidNameInEnvironment() {
453453
environment.setProperty("spring.profiles.active", "fa!l");
454454
Binder binder = new Binder();
455455
assertThatIllegalStateException().isThrownBy(() -> new Profiles(environment, binder, null))
456-
.withMessage("Invalid profile property value found in Envronment under 'spring.profiles.active'");
456+
.withMessage("Invalid profile property value found in Environment under 'spring.profiles.active'");
457457
}
458458

459459
@Test

0 commit comments

Comments
 (0)