Merge branch '3.5.x'

Author: snicoll

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

@@ -127,7 +127,7 @@ void writeReportWithNoProblemsFound(@TempDir File tempDir) throws IOException {
 		report.registerAnalysis(first, new Analysis("Check for things:"));
 		File second = new File(tempDir, "metadata-2.json");
 		report.registerAnalysis(second, new Analysis("Check for other things:"));
-		assertThat(writeToFile(tempDir, report)).content().isEqualTo("""
+		assertThat(writeToFile(tempDir, report)).content().isEqualToIgnoringNewLines("""
 				metadata-1.json
 				No problems found.
 
@@ -144,7 +144,7 @@ void writeReportWithOneProblem(@TempDir File tempDir) throws IOException {
 		analysis.addItem("Should not be deprecated");
 		report.registerAnalysis(metadata, analysis);
 		report.registerAnalysis(metadata, new Analysis("Check for other things:"));
-		assertThat(writeToFile(tempDir, report)).content().isEqualTo("""
+		assertThat(writeToFile(tempDir, report)).content().isEqualToIgnoringNewLines("""
 				metadata-1.json
 				Check for things:
 					- Should not be deprecated
@@ -165,7 +165,7 @@ void writeReportWithSeveralProblems(@TempDir File tempDir) throws IOException {
 		Analysis secondAnalysis = new Analysis("Check for other things:");
 		secondAnalysis.addItem("Field 'this' not expected");
 		report.registerAnalysis(metadata, secondAnalysis);
-		assertThat(writeToFile(tempDir, report)).content().isEqualTo("""
+		assertThat(writeToFile(tempDir, report)).content().isEqualToIgnoringNewLines("""
 				metadata-1.json
 				Check for things:
 					- Should not be deprecated