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

Merge branch '2.3.x' into 2.4.x 

Closes gh-26396
This commit is contained in:
Andy Wilkinson 2021-05-06 20:11:59 +01:00
parent 3a596ed130 ef9e3bafff
commit fe696ee22a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,10 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
JavaVersion javaVersion = JavaVersion.current(); JavaVersion javaVersion = JavaVersion.current();
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_14) if (javaVersion.isCompatibleWith(JavaVersion.VERSION_14)
|| javaVersion.isCompatibleWith(JavaVersion.VERSION_13)) { || javaVersion.isCompatibleWith(JavaVersion.VERSION_13)) {
GRADLE_VERSIONS = Arrays.asList("6.3", "6.4.1", "6.5.1", "6.6.1", "6.7.1", "current", "6.9-rc-1"); GRADLE_VERSIONS = Arrays.asList("6.3", "6.4.1", "6.5.1", "6.6.1", "6.7.1", "current", "6.9-rc-2");
} }
else { else {
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"); 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-2");
} }
} }

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

@ -172,7 +172,6 @@ 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)