Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Closes gh-38665
This commit is contained in:
Andy Wilkinson
2023-12-05 20:31:17 +00:00
parent de70b4fb4c b424254587
commit 16c2ddb02c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,6 +650,9 @@ abstract class AbstractBootArchiveIntegrationTests {
try (PrintWriter writer = new PrintWriter(
new FileWriter(new File(this.gradleBuild.getProjectDir(), "settings.gradle")))) {
writer.println("include 'alpha', 'bravo', 'charlie'");
new File(this.gradleBuild.getProjectDir(), "alpha").mkdirs();
new File(this.gradleBuild.getProjectDir(), "bravo").mkdirs();
new File(this.gradleBuild.getProjectDir(), "charlie").mkdirs();
}
catch (IOException ex) {
throw new RuntimeException(ex);

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

@@ -35,9 +35,9 @@ public final class GradleVersions {
@SuppressWarnings("UnstableApiUsage")
public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_20)) {
return Arrays.asList("8.1.1", "8.3", "8.4");
return Arrays.asList("8.1.1", "8.5");
}
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.3", "8.4");
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.5");
}
public static String minimumCompatible() {