Merge branch '2.7.x'

Closes gh-33880

spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java

@@ -40,8 +40,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.StreamUtils;
 
 /**
- * Utility to invoke the command line in the same way as a user would, i.e. via the shell
- * script in the package's bin directory.
+ * Utility to invoke the command line in the same way as a user would, i.e. through the
+ * shell script in the package's bin directory.
  *
  * @author Andy Wilkinson
  * @author Phillip Webb

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java

@@ -507,7 +507,7 @@ public class JSONObject {
 	/**
 	 * Returns the value mapped by {@code name} if it exists and is a long or can be
 	 * coerced to a long. Note that JSON represents numbers as doubles, so this is
-	 * <a href="#lossy">lossy</a>; use strings to transfer numbers via JSON.
+	 * <a href="#lossy">lossy</a>; use strings to transfer numbers over JSON.
 	 * @param name the name of the property
 	 * @return the value
 	 * @throws JSONException if the mapping doesn't exist or cannot be coerced to a long.
@@ -537,7 +537,7 @@ public class JSONObject {
 	 * Returns the value mapped by {@code name} if it exists and is a long or can be
 	 * coerced to a long. Returns {@code fallback} otherwise. Note that JSON represents
 	 * numbers as doubles, so this is <a href="#lossy">lossy</a>; use strings to transfer
-	 * numbers via JSON.
+	 * numbers over JSON.
 	 * @param name the name of the property
 	 * @param fallback a fallback value
 	 * @return the value or {@code fallback}

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java

@@ -43,8 +43,8 @@ public class ImmutableSimpleProperties {
 	// An interface can still be injected because it might have a converter
 	private final Comparator<?> comparator;
 
-	// Even if it is not exposed, we're still offering a way to bind the value via the
-	// constructor so it should be present in the metadata
+	// Even if it is not exposed, we're still offering a way to bind the value through the
+	// constructor, so it should be present in the metadata
 	@SuppressWarnings("unused")
 	private final Long counter;
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/integrating-with-actuator.adoc

@@ -7,7 +7,7 @@
 == Generating Build Information
 Spring Boot Actuator's `info` endpoint automatically publishes information about your build in the presence of a `META-INF/build-info.properties` file.
 A {build-info-javadoc}[`BuildInfo`] task is provided to generate this file.
-The easiest way to use the task is via the plugin's DSL:
+The easiest way to use the task is through the plugin's DSL:
 
 [source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
 .Groovy

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java

@@ -46,7 +46,7 @@ import org.springframework.boot.loader.archive.JarFileArchive;
 import org.springframework.boot.loader.util.SystemPropertyUtils;
 
 /**
- * {@link Launcher} for archives with user-configured classpath and main class via a
+ * {@link Launcher} for archives with user-configured classpath and main class through a
  * properties file. This model is often more flexible and more amenable to creating
  * well-behaved OS-level services than a model based on executable jars.
  * <p>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/running.adoc

@@ -99,7 +99,7 @@ include::../maven/running/system-properties-pom.xml[tags=system-properties]
 ----
 
 If the value is empty or not defined (that is `<my-property/`>), the system property is set with an empty String as the value.
-Maven trims values specified in the pom so it is not possible to specify a System property which needs to start or end with a space via this mechanism: consider using `jvmArguments` instead.
+Maven trims values specified in the pom, so it is not possible to specify a System property which needs to start or end with a space through this mechanism: consider using `jvmArguments` instead.
 
 Any String typed Maven variable can be passed as system properties.
 Any attempt to pass any other Maven variable type (for example a `List` or a `URL` variable) will cause the variable expression to be passed literally (unevaluated).

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java

@@ -102,21 +102,23 @@ public abstract class BuildImageMojo extends AbstractPackagerMojo {
 	private Image image;
 
 	/**
-	 * Alias for {@link Image#name} to support configuration via command-line property.
+	 * Alias for {@link Image#name} to support configuration through command-line
+	 * property.
 	 * @since 2.3.0
 	 */
 	@Parameter(property = "spring-boot.build-image.imageName", readonly = true)
 	String imageName;
 
 	/**
-	 * Alias for {@link Image#builder} to support configuration via command-line property.
+	 * Alias for {@link Image#builder} to support configuration through command-line
+	 * property.
 	 * @since 2.3.0
 	 */
 	@Parameter(property = "spring-boot.build-image.builder", readonly = true)
 	String imageBuilder;
 
 	/**
-	 * Alias for {@link Image#runImage} to support configuration via command-line
+	 * Alias for {@link Image#runImage} to support configuration through command-line
 	 * property.
 	 * @since 2.3.1
 	 */
@@ -124,7 +126,7 @@ public abstract class BuildImageMojo extends AbstractPackagerMojo {
 	String runImage;
 
 	/**
-	 * Alias for {@link Image#cleanCache} to support configuration via command-line
+	 * Alias for {@link Image#cleanCache} to support configuration through command-line
 	 * property.
 	 * @since 2.4.0
 	 */
@@ -132,20 +134,22 @@ public abstract class BuildImageMojo extends AbstractPackagerMojo {
 	Boolean cleanCache;
 
 	/**
-	 * Alias for {@link Image#pullPolicy} to support configuration via command-line
+	 * Alias for {@link Image#pullPolicy} to support configuration through command-line
 	 * property.
 	 */
 	@Parameter(property = "spring-boot.build-image.pullPolicy", readonly = true)
 	PullPolicy pullPolicy;
 
 	/**
-	 * Alias for {@link Image#publish} to support configuration via command-line property.
+	 * Alias for {@link Image#publish} to support configuration through command-line
+	 * property.
 	 */
 	@Parameter(property = "spring-boot.build-image.publish", readonly = true)
 	Boolean publish;
 
 	/**
-	 * Alias for {@link Image#network} to support configuration via command-line property.
+	 * Alias for {@link Image#network} to support configuration through command-line
+	 * property.
 	 * @since 2.6.0
 	 */
 	@Parameter(property = "spring-boot.build-image.network", readonly = true)

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java

@@ -31,7 +31,7 @@ import org.junit.jupiter.api.extension.ParameterResolver;
 /**
  * JUnit Jupiter {@code @Extension} to capture {@link System#out System.out} and
  * {@link System#err System.err}. Can be registered for an entire test class or for an
- * individual test method via {@link ExtendWith @ExtendWith}. This extension provides
+ * individual test method through {@link ExtendWith @ExtendWith}. This extension provides
  * {@linkplain ParameterResolver parameter resolution} for a {@link CapturedOutput}
  * instance which can be used to assert that the correct output was written.
  * <p>