Merge branch '2.6.x' into 2.7.x

Closes gh-30088
2022-03-07 14:57:32 +00:00 · 2022-03-07 14:57:32 +00:00 · a3cdc4e799
parent d95dc75de9 344f71c75a
commit a3cdc4e799
1 changed files with 2 additions and 1 deletions
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/test/java/smoketest/profile/ActiveProfilesTests.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/test/java/smoketest/profile/ActiveProfilesTests.java
@ -33,7 +33,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 *
 * @author Madhura Bhave
 */
-@SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = "enableEnvironmentPostProcessor=true") // gh-28530
+@SpringBootTest(webEnvironment = WebEnvironment.NONE,
+		properties = { "enableEnvironmentPostProcessor=true", "server.port=0" }) // gh-28530
@ActiveProfiles("hello")
 class ActiveProfilesTests {