Merge branch '2.2.x' into 2.3.x

Closes gh-24338
2020-12-04 18:13:41 -08:00
parent f569d7616d d8a05090b3
commit 5f351a6983
83 changed files with 84 additions and 3 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/Dsl.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/Dsl.java
@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package org.springframework.boot.gradle.testkit;

 /**