mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '2.3.x' into 2.4.x
Closes gh-26329
This commit is contained in:
commit
c0fe23181c
@ -48,10 +48,10 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
|
||||
JavaVersion javaVersion = JavaVersion.current();
|
||||
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_14)
|
||||
|| javaVersion.isCompatibleWith(JavaVersion.VERSION_13)) {
|
||||
GRADLE_VERSIONS = Arrays.asList("6.3", "6.4.1", "6.5.1", "6.6.1", "6.7.1", "current");
|
||||
GRADLE_VERSIONS = Arrays.asList("6.3", "6.4.1", "6.5.1", "6.6.1", "6.7.1", "current", "6.9-rc-1");
|
||||
}
|
||||
else {
|
||||
GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.3", "6.4.1", "6.5.1", "6.6.1", "6.7.1", "current");
|
||||
GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.3", "6.4.1", "6.5.1", "6.6.1", "6.7.1", "current", "6.9-rc-1");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -172,6 +172,7 @@ public class GradleBuild {
|
||||
scriptContent = scriptContent.replace("{" + property.getKey() + "}", property.getValue());
|
||||
}
|
||||
FileCopyUtils.copy(scriptContent, new FileWriter(new File(this.projectDir, "build" + this.dsl.getExtension())));
|
||||
new File(this.projectDir, "settings.gradle").createNewFile();
|
||||
FileSystemUtils.copyRecursively(new File("src/test/resources/repository"),
|
||||
new File(this.projectDir, "repository"));
|
||||
GradleRunner gradleRunner = GradleRunner.create().withProjectDir(this.projectDir)
|
||||
|
Loading…
Reference in New Issue
Block a user