Andy Wilkinson 2d7e0314f3 Merge branch '2.5.x' ...

# Conflicts:
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java

2021-11-15 12:51:43 +00:00

..

src/main/java/org/springframework/boot/testsupport/gradle/testkit

Merge branch '2.5.x'

2021-11-15 12:51:43 +00:00

build.gradle

…