Merge branch '3.4.x' into 3.5.x

Closes gh-46263

Author: snicoll

buildSrc/src/main/java/org/springframework/boot/build/antora/GenerateAntoraPlaybook.java

@@ -111,7 +111,7 @@ private Provider<String> configurePlaybookOutputDir(Project project) {
 		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

@@ -83,7 +83,7 @@ public void initialize(ConfigurableApplicationContext applicationContext) {
 				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);