Merge branch '2.3.x' into 2.4.x

Closes gh-25385

Author: snicoll

buildSrc/src/test/resources/plugin.xml

@@ -14,7 +14,7 @@
   <mojos>
     <mojo>
       <goal>build-info</goal>
-      <description>Generate a {@code build-info.properties} file based the content of the current
+      <description>Generate a {@code build-info.properties} file based on the content of the current
 {@link MavenProject}.</description>
       <requiresDirectInvocation>false</requiresDirectInvocation>
       <requiresProject>true</requiresProject>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -37,7 +37,7 @@
 import org.springframework.boot.loader.tools.BuildPropertiesWriter.ProjectDetails;
 
 /**
- * Generate a {@code build-info.properties} file based the content of the current
+ * Generate a {@code build-info.properties} file based on the content of the current
  * {@link MavenProject}.
  *
  * @author Stephane Nicoll