spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4.x' into 3.5.x

Browse Source 
Closes gh-46263
This commit is contained in:
Stéphane Nicoll
2025-07-03 20:10:54 +02:00
parent 573ad34e7a 67de3211e7
commit 25dd5f1f33
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/java/org/springframework/boot/build/antora/GenerateAntoraPlaybook.java
+1 -1
View File
@@ -111,7 +111,7 @@ public abstract class GenerateAntoraPlaybook extends DefaultTask {
return project.provider(() -> {
Path playbookDir = toRealPath(getOutputFile().get().getAsFile().toPath()).getParent();
Path outputDir = toRealPath(siteDirectory);
return "." + File.separator + playbookDir.relativize(outputDir).toString();
return "." + File.separator + playbookDir.relativize(outputDir);
});
}
spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseDockerComposeIntegrationTests.java
+1 -1
View File
@@ -83,7 +83,7 @@ class AutoConfigureTestDatabaseDockerComposeIntegrationTests {
Files.writeString(composeFile, composeFileContent);
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(applicationContext,
"spring.docker.compose.skip.in-tests=false", "spring.docker.compose.stop.command=down",
"spring.docker.compose.file=" + composeFile.toAbsolutePath().toString());
"spring.docker.compose.file=" + composeFile.toAbsolutePath());
}
catch (IOException ex) {
throw new UncheckedIOException(ex);