Merge branch '2.5.x'

Closes gh-27758

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
  */
 @DirtiesContext
 @SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT, properties = { "server.port=0", "value=123" })
-public class SpringBootTestWebEnvironmentDefinedPortTests extends AbstractSpringBootTestWebServerWebEnvironmentTests {
+class SpringBootTestWebEnvironmentDefinedPortTests extends AbstractSpringBootTestWebServerWebEnvironmentTests {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableWebMvc

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithActiveProfilesAndEnvironmentPropertyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @SpringBootTest
 @ActiveProfiles({ "test1", "test2" })
 @ContextConfiguration(loader = SpringBootTestWithActiveProfilesAndEnvironmentPropertyTests.Loader.class)
-public class SpringBootTestWithActiveProfilesAndEnvironmentPropertyTests {
+class SpringBootTestWithActiveProfilesAndEnvironmentPropertyTests {
 
 	@Autowired
 	private Environment environment;

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithActiveProfilesAndSystemEnvironmentPropertyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @SpringBootTest
 @ActiveProfiles({ "test1", "test2" })
 @ContextConfiguration(loader = SpringBootTestWithActiveProfilesAndSystemEnvironmentPropertyTests.Loader.class)
-public class SpringBootTestWithActiveProfilesAndSystemEnvironmentPropertyTests {
+class SpringBootTestWithActiveProfilesAndSystemEnvironmentPropertyTests {
 
 	@Autowired
 	private Environment environment;

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithJdkProxyTests.java

@@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify;
  * @author Andy Wilkinson
  */
 @ExtendWith(SpringExtension.class)
-public class SpyBeanWithJdkProxyTests {
+class SpyBeanWithJdkProxyTests {
 
 	@Autowired
 	private ExampleService service;

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithoutSupportedHttpClientTests.java

@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Andy Wilkinson
  */
 @ClassPathExclusions({ "reactor-netty*.jar", "jetty-client*.jar" })
-public class WebTestClientContextCustomizerWithoutSupportedHttpClientTests {
+class WebTestClientContextCustomizerWithoutSupportedHttpClientTests {
 
 	@Test
 	void createContextCustomizerWhenNoSupportedHttpClientIsAvailableShouldReturnNull() {

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithoutWebfluxIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Stephane Nicoll
  */
 @ClassPathExclusions("spring-webflux*.jar")
-public class WebTestClientContextCustomizerWithoutWebfluxIntegrationTests {
+class WebTestClientContextCustomizerWithoutWebfluxIntegrationTests {
 
 	@Test
 	void customizerIsNotCreatedWithoutWebClient() {