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

Merge branch '2.4.x' 

Closes gh-26330
This commit is contained in:
Andy Wilkinson 2021-04-30 16:56:46 +01:00
parent 6df3a8291e c0fe23181c
commit b976483852
2 changed files with 2 additions and 1 deletions
Show Stats 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/GradleCompatibilityExtension.java
View File

@ -51,7 +51,7 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
GRADLE_VERSIONS = Arrays.asList("7.0"); GRADLE_VERSIONS = Arrays.asList("7.0");
} }
else { else {
GRADLE_VERSIONS = Arrays.asList("current", "7.0"); GRADLE_VERSIONS = Arrays.asList("current", "6.9-rc-1", "7.0");
} }
} }

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java
View File

@ -175,6 +175,7 @@ public class GradleBuild {
scriptContent = scriptContent.replace("{" + property.getKey() + "}", property.getValue()); scriptContent = scriptContent.replace("{" + property.getKey() + "}", property.getValue());
} }
FileCopyUtils.copy(scriptContent, new FileWriter(new File(this.projectDir, "build" + this.dsl.getExtension()))); 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"), FileSystemUtils.copyRecursively(new File("src/test/resources/repository"),
new File(this.projectDir, "repository")); new File(this.projectDir, "repository"));
GradleRunner gradleRunner = GradleRunner.create().withProjectDir(this.projectDir) GradleRunner gradleRunner = GradleRunner.create().withProjectDir(this.projectDir)