root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Test against Gradle 9.0.0-rc-1 

See gh-43573
This commit is contained in:
Andy Wilkinson 2025-06-19 17:21:28 +01:00
parent 07eaf82f29
commit a06ce997a1
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests.java
View File

@ -66,10 +66,18 @@ class BootJarIntegrationTests extends AbstractBootArchiveIntegrationTests {
copyClasspathApplication(); copyClasspathApplication();
BuildResult result = this.gradleBuild.build("launch"); BuildResult result = this.gradleBuild.build("launch");
String output = result.getOutput(); String output = result.getOutput();
assertThat(output).containsPattern("1\\. .*classes"); if (this.gradleBuild.gradleVersionIsLessThan("9.0.0-rc-1")) {
assertThat(output).containsPattern("2\\. .*library-1.0-SNAPSHOT.jar"); assertThat(output).containsPattern("1\\. .*classes");
assertThat(output).containsPattern("3\\. .*commons-lang3-3.9.jar"); assertThat(output).containsPattern("2\\. .*library-1.0-SNAPSHOT.jar");
assertThat(output).containsPattern("4\\. .*spring-boot-jarmode-tools.*.jar"); assertThat(output).containsPattern("3\\. .*commons-lang3-3.9.jar");
assertThat(output).containsPattern("4\\. .*spring-boot-jarmode-tools.*.jar");
}
else {
assertThat(output).containsPattern("1\\. .*classes");
assertThat(output).containsPattern("2\\. .*commons-lang3-3.9.jar");
assertThat(output).containsPattern("3\\. .*library-1.0-SNAPSHOT.jar");
assertThat(output).containsPattern("4\\. .*spring-boot-jarmode-tools.*.jar");
}
assertThat(output).doesNotContain("5. "); assertThat(output).doesNotContain("5. ");
} }
@ -78,10 +86,18 @@ class BootJarIntegrationTests extends AbstractBootArchiveIntegrationTests {
copyClasspathApplication(); copyClasspathApplication();
BuildResult result = this.gradleBuild.build("launch"); BuildResult result = this.gradleBuild.build("launch");
String output = result.getOutput(); String output = result.getOutput();
assertThat(output).containsPattern("1\\. .*classes"); if (this.gradleBuild.gradleVersionIsLessThan("9.0.0-rc-1")) {
assertThat(output).containsPattern("2\\. .*spring-boot-jarmode-tools.*.jar"); assertThat(output).containsPattern("1\\. .*classes");
assertThat(output).containsPattern("3\\. .*library-1.0-SNAPSHOT.jar"); assertThat(output).containsPattern("2\\. .*spring-boot-jarmode-tools.*.jar");
assertThat(output).containsPattern("4\\. .*commons-lang3-3.9.jar"); assertThat(output).containsPattern("3\\. .*library-1.0-SNAPSHOT.jar");
assertThat(output).containsPattern("4\\. .*commons-lang3-3.9.jar");
}
else {
assertThat(output).containsPattern("1\\. .*classes");
assertThat(output).containsPattern("2\\. .*spring-boot-jarmode-tools.*.jar");
assertThat(output).containsPattern("3\\. .*commons-lang3-3.9.jar");
assertThat(output).containsPattern("4\\. .*library-1.0-SNAPSHOT.jar");
}
assertThat(output).doesNotContain("5. "); assertThat(output).doesNotContain("5. ");
} }

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

@ -34,18 +34,18 @@ public final class GradleVersions {
public static List<String> allCompatible() { public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_24)) { if (isJavaVersion(JavaVersion.VERSION_24)) {
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-milestone-9"); return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-rc-1");
} }
if (isJavaVersion(JavaVersion.VERSION_23)) { if (isJavaVersion(JavaVersion.VERSION_23)) {
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-milestone-9"); return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0-rc-1");
} }
if (isJavaVersion(JavaVersion.VERSION_22)) { if (isJavaVersion(JavaVersion.VERSION_22)) {
return Arrays.asList("8.8", GradleVersion.current().getVersion(), "9.0.0-milestone-9"); return Arrays.asList("8.8", GradleVersion.current().getVersion(), "9.0.0-rc-1");
} }
if (isJavaVersion(JavaVersion.VERSION_21)) { if (isJavaVersion(JavaVersion.VERSION_21)) {
return Arrays.asList("8.5", GradleVersion.current().getVersion(), "9.0.0-milestone-9"); return Arrays.asList("8.5", GradleVersion.current().getVersion(), "9.0.0-rc-1");
} }
return Arrays.asList("7.6.5", "8.4", GradleVersion.current().getVersion(), "9.0.0-milestone-9"); return Arrays.asList("7.6.5", "8.4", GradleVersion.current().getVersion(), "9.0.0-rc-1");
} }
public static String minimumCompatible() { public static String minimumCompatible() {