Merge branch '3.4.x'

Closes gh-44346

Author: philwebb

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java

@@ -147,7 +147,7 @@ protected final void compileSourceFiles(URL[] classPath, File sourcesDirectory,
 			JavaCompilerPluginConfiguration compilerConfiguration = new JavaCompilerPluginConfiguration(this.project);
 			List<String> options = new ArrayList<>();
 			options.add("-cp");
-			options.add(ClasspathBuilder.forURLs(classPath).build().argument());
+			options.add(ClasspathBuilder.forURLs(classPath).build().toString());
 			options.add("-d");
 			options.add(outputDirectory.toPath().toAbsolutePath().toString());
 			String releaseVersion = compilerConfiguration.getReleaseVersion();

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java

@@ -335,8 +335,7 @@ private void addClasspath(List<String> args) throws MojoExecutionException {
 		try {
 			Classpath classpath = ClasspathBuilder.forURLs(getClassPathUrls()).build();
 			if (getLog().isDebugEnabled()) {
-				getLog().debug("Classpath for forked process: "
-						+ classpath.elements().map(Object::toString).collect(Collectors.joining(File.separator)));
+				getLog().debug("Classpath for forked process: " + classpath);
 			}
 			args.add("-cp");
 			args.add(classpath.argument());

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ClasspathBuilder.java

@@ -186,6 +186,11 @@ Stream<Path> elements() {
 			return this.elements.stream();
 		}
 
+		@Override
+		public String toString() {
+			return elements().map(Path::toString).collect(Collectors.joining(File.pathSeparator));
+		}
+
 	}
 
 }