Merge branch '2.7.x' into 3.0.x

Closes gh-37026
spring-projects · Aug 18, 2023 · 1f6d060 · 1f6d060
2 parents f3450fd + 6efd9ed
commit 1f6d060
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.../test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java b/.../test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java
@@ -85,9 +85,14 @@ void taskConfigurationIsAvoided() throws IOException {
 		if (GradleVersion.version(this.gradleBuild.getGradleVersion()).compareTo(GradleVersion.version("7.3.3")) < 0) {
 			assertThat(configured).containsExactly("help");
 		}
-		else {
+		else if (GradleVersion.version(this.gradleBuild.getGradleVersion())
+			.compareTo(GradleVersion.version("8.3")) < 0) {
 			assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileKotlin", "compileTestKotlin");
 		}
+		else {
+			assertThat(configured).containsExactlyInAnyOrder("help", "clean", "compileJava", "compileKotlin",
+					"compileTestKotlin");
+		}
 	}
 
 }
diff --git a/...ort/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java b/...ort/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
@@ -35,9 +35,9 @@ private GradleVersions() {
 	@SuppressWarnings("UnstableApiUsage")
 	public static List<String> allCompatible() {
 		if (isJavaVersion(JavaVersion.VERSION_20)) {
-			return Arrays.asList("8.1.1", "8.2.1");
+			return Arrays.asList("8.1.1", "8.3");
 		}
-		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.2.1");
+		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.3");
 	}
 
 	public static String minimumCompatible() {