Merge branch '2.7.x'

Closes gh-33880

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java

@@ -88,9 +88,9 @@ class JacksonTesterIntegrationTests {
 	void parseSpecialCharactersTest() throws Exception {
 		JacksonTester.initFields(this, new ObjectMapper());
 		// Confirms that the handling of special characters is symmetrical between
-		// the serialization (via the JacksonTester) and the parsing (via json-path). By
-		// default json-path uses SimpleJson as its parser, which has a slightly different
-		// behavior to Jackson and breaks the symmetry. JacksonTester
+		// the serialization (through the JacksonTester) and the parsing (through
+		// json-path). By default json-path uses SimpleJson as its parser, which has a
+		// slightly different behavior to Jackson and breaks the symmetry. JacksonTester
 		// configures json-path to use Jackson for evaluating the path expressions and
 		// restores the symmetry. See gh-15727
 		String stringWithSpecialCharacters = "\u0006\u007F";

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/system/OutputExtensionExtendWithTests.java

@@ -25,7 +25,8 @@ import org.junit.jupiter.api.extension.ExtensionContext;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link OutputCaptureExtension} when used via {@link ExtendWith @ExtendWith}.
+ * Tests for {@link OutputCaptureExtension} when used through
+ * {@link ExtendWith @ExtendWith}.
  *
  * @author Madhura Bhave
  */