Merge branch '2.5.x' into 2.6.x

Closes gh-30850

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -83,7 +83,7 @@ class RunningDocumentationTests {
 	}
 
 	@TestTemplate
-	void bootRunSystemPropetry() {
+	void bootRunSystemProperty() {
 		assertThat(this.gradleBuild.script("src/docs/gradle/running/boot-run-system-property")
 				.build("-Pexample=custom", "configuredSystemProperties").getOutput())
 						.contains("com.example.property = custom");

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleProjectBuilder.java

@@ -29,8 +29,8 @@ import org.springframework.util.StringUtils;
 
 /**
  * Helper class to build Gradle {@link Project Projects} for test fixtures. Wraps
- * functionality of Gradle's own {@link ProjectBuilder} in order to workaround an issue on
- * JDK 17 and 18.
+ * functionality of Gradle's own {@link ProjectBuilder} in order to work around an issue
+ * on JDK 17 and 18.
  *
  * @author Christoph Dreis
  * @see <a href="https://github.com/gradle/gradle/issues/16857">Gradle Support JDK 17</a>