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

Author: wilkinsona

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

@@ -35,12 +35,12 @@ private GradleVersions() {
 
 	public static List<String> allCompatible() {
 		if (isJava17()) {
-			return Collections.singletonList("7.2");
+			return Arrays.asList("7.2", "7.3");
 		}
 		if (isJava16()) {
-			return Arrays.asList("7.0.2", "7.1", "7.2");
+			return Arrays.asList("7.0.2", "7.1", "7.2", "7.3");
 		}
-		return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2");
+		return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3");
 	}
 
 	public static String currentOrMinimumCompatible() {