Merge branch '3.5.x' into 4.0.x

Closes gh-48977

core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java

@@ -428,7 +428,7 @@ public class ApplicationContextAssert<C extends ApplicationContext>
 	 * becoming the object under test.
 	 * <p>
 	 * Example: <pre class="code">
-	 * assertThat(context).getFailure().containsMessage("missing bean");
+	 * assertThat(context).getFailure().hasMessageContaining("missing bean");
 	 * </pre>
 	 * @return assertions on the cause of the failure
 	 * @throws AssertionError if the application context started without a failure