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

Merge branch '3.3.x'

Browse Source 
Closes gh-42736
This commit is contained in:
Moritz Halbritter
2024-10-17 13:38:45 +02:00
parent 12c1d70738 8efe6e02d9
commit c018c43886
37 changed files with 229 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java
View File

@@ -20,6 +20,7 @@ import java.io.File;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.function.Predicate;
import org.assertj.core.api.Condition;
@@ -115,7 +116,7 @@ abstract class AbstractLaunchScriptIntegrationTests {
private static ImageFromDockerfile createImage(String os, String version) {
ImageFromDockerfile image = new ImageFromDockerfile(
"spring-boot-launch-script/" + os.toLowerCase() + "-" + version);
"spring-boot-launch-script/" + os.toLowerCase(Locale.ROOT) + "-" + version);
image.withFileFromFile("Dockerfile",
new File("src/dockerTest/resources/conf/" + os + "/" + version + "/Dockerfile"));
for (File file : new File("build/downloads/jdk/bellsoft").listFiles()) {