Merge branch '2.5.x' into 2.6.x

Closes gh-30087
This commit is contained in:
Andy Wilkinson 2022-03-07 14:57:20 +00:00
commit 344f71c75a

View File

@ -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 {