Merge branch '2.5.x'

Closes gh-27758

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/SpyBeanSampleDataJpaApplicationTests.java

@@ -40,7 +40,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  */
 @SpringBootTest
 @AutoConfigureTestDatabase
-public class SpyBeanSampleDataJpaApplicationTests {
+class SpyBeanSampleDataJpaApplicationTests {
 
 	@Autowired
 	private WebApplicationContext context;

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterManagementPortTests.java

@@ -25,6 +25,6 @@ import org.springframework.test.context.TestPropertySource;
  * @author Andy Wilkinson
  */
 @TestPropertySource(properties = { "spring.jersey.type=filter", "server.servlet.register-default-servlet=true" })
-public class JerseyFilterManagementPortTests extends AbstractJerseyManagementPortTests {
+class JerseyFilterManagementPortTests extends AbstractJerseyManagementPortTests {
 
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyServletManagementPortTests.java

@@ -22,6 +22,6 @@ package smoketest.jersey;
  *
  * @author Andy Wilkinson
  */
-public class JerseyServletManagementPortTests extends AbstractJerseyManagementPortTests {
+class JerseyServletManagementPortTests extends AbstractJerseyManagementPortTests {
 
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/test/java/smoketest/quartz/SampleQuartzApplicationWebTests.java

@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.entry;
  * @author Stephane Nicoll
  */
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-public class SampleQuartzApplicationWebTests {
+class SampleQuartzApplicationWebTests {
 
 	@Autowired
 	private TestRestTemplate restTemplate;

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-rsocket/src/test/java/smoketest/rsocket/SampleRSocketApplicationTests.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.
@@ -31,7 +31,7 @@ import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
 import org.springframework.util.MimeTypeUtils;
 
 @SpringBootTest(properties = "spring.rsocket.server.port=0")
-public class SampleRSocketApplicationTests {
+class SampleRSocketApplicationTests {
 
 	@LocalRSocketServerPort
 	private int port;