Merge branch '2.5.x'

Closes gh-27758

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildRequestTests.java

@@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.entry;
  * @author Scott Frederick
  * @author Jeroen Meijer
  */
-public class BuildRequestTests {
+class BuildRequestTests {
 
 	@TempDir
 	File tempDir;

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationTests.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.
@@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Wei Jiang
  * @author Scott Frederick
  */
-public class DockerConfigurationTests {
+class DockerConfigurationTests {
 
 	@Test
 	void createDockerConfigurationWithDefaults() {