Merge branch '2.4.x' into 2.5.x

Closes gh-27757

Author: wilkinsona

buildSrc/src/test/java/org/springframework/boot/build/artifactory/ArtifactoryRepositoryTests.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.
@@ -27,7 +27,7 @@
  *
  * @author Andy Wilkinson
  */
-public class ArtifactoryRepositoryTests {
+class ArtifactoryRepositoryTests {
 
 	@Test
 	void whenProjectVersionIsMilestoneThenRepositoryIsMilestone() {

buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java

@@ -38,14 +38,14 @@
  *
  * @author Andy Wilkinson
  */
-public class BomPluginIntegrationTests {
+class BomPluginIntegrationTests {
 
 	private File projectDir;
 
 	private File buildFile;
 
 	@BeforeEach
-	public void setup(@TempDir File projectDir) throws IOException {
+	void setup(@TempDir File projectDir) throws IOException {
 		this.projectDir = projectDir;
 		this.buildFile = new File(this.projectDir, "build.gradle");
 	}

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/ArtifactVersionDependencyVersionTests.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.
@@ -25,7 +25,7 @@
  *
  * @author Andy Wilkinson
  */
-public class ArtifactVersionDependencyVersionTests {
+class ArtifactVersionDependencyVersionTests {
 
 	@Test
 	void parseWhenVersionIsNotAMavenVersionShouldReturnNull() {

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/CalendarVersionDependencyVersionTests.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.
@@ -25,7 +25,7 @@
  *
  * @author Andy Wilkinson
  */
-public class CalendarVersionDependencyVersionTests {
+class CalendarVersionDependencyVersionTests {
 
 	@Test
 	void parseWhenVersionIsNotACalendarVersionShouldReturnNull() {

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionTests.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.
@@ -25,7 +25,7 @@
  *
  * @author Andy Wilkinson
  */
-public class DependencyVersionTests {
+class DependencyVersionTests {
 
 	@Test
 	void parseWhenValidMavenVersionShouldReturnArtifactVersionDependencyVersion() {

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/NumericQualifierDependencyVersionTests.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.
@@ -25,7 +25,7 @@
  *
  * @author Andy Wilkinson
  */
-public class NumericQualifierDependencyVersionTests {
+class NumericQualifierDependencyVersionTests {
 
 	@Test
 	void isNewerThanOnVersionWithNumericQualifierWhenInputHasNoQualifierShouldReturnTrue() {

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/ReleaseTrainDependencyVersionTests.java

@@ -25,7 +25,7 @@
  *
  * @author Andy Wilkinson
  */
-public class ReleaseTrainDependencyVersionTests {
+class ReleaseTrainDependencyVersionTests {
 
 	@Test
 	void parsingOfANonReleaseTrainVersionReturnsNull() {

buildSrc/src/test/java/org/springframework/boot/build/context/properties/CompoundRowTests.java

@@ -25,7 +25,7 @@
  *
  * @author Brian Clozel
  */
-public class CompoundRowTests {
+class CompoundRowTests {
 
 	private static final String NEWLINE = System.lineSeparator();
 

buildSrc/src/test/java/org/springframework/boot/build/context/properties/SingleRowTests.java

@@ -25,7 +25,7 @@
  *
  * @author Brian Clozel
  */
-public class SingleRowTests {
+class SingleRowTests {
 
 	private static final String NEWLINE = System.lineSeparator();
 

buildSrc/src/test/java/org/springframework/boot/build/context/properties/TableTests.java

@@ -25,7 +25,7 @@
  *
  * @author Brian Clozel
  */
-public class TableTests {
+class TableTests {
 
 	private static final String NEWLINE = System.lineSeparator();