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

Merge branch '2.7.x'

Browse Source 
Closes gh-33403
This commit is contained in:
Andy Wilkinson
2022-11-28 20:20:24 +00:00
parent bb1efe636c e23c92802f
commit d88f968d22
7 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
View File

@@ -61,7 +61,7 @@ public class GradleMultiDslExtension implements TestTemplateInvocationContextPro
@Override
public List<Extension> getAdditionalExtensions() {
GradleBuild gradleBuild = new GradleBuild(this.dsl);
gradleBuild.gradleVersion(GradleVersions.currentOrMinimumCompatible());
gradleBuild.gradleVersion(GradleVersions.minimumCompatible());
return Arrays.asList(new GradleBuildFieldSetter(gradleBuild), new GradleBuildExtension());
}

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

@@ -32,11 +32,11 @@ public final class GradleVersions {
}
public static List<String> allCompatible() {
return Arrays.asList(GradleVersion.current().getVersion(), "7.6-rc-3");
return Arrays.asList("7.5.1", GradleVersion.current().getVersion());
}
public static String currentOrMinimumCompatible() {
return GradleVersion.current().getVersion();
public static String minimumCompatible() {
return allCompatible().get(0);
}
}