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

Fix Maven-based AOT generation on Windows

Browse Source 
Closes gh-30525
This commit is contained in:
Andy Wilkinson
2022-05-18 10:33:12 +01:00
parent 3e0994fb53
commit c4beca3e01
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AotGenerateMojo.java
View File

@@ -23,11 +23,9 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
@@ -83,7 +81,7 @@ public class AotGenerateMojo extends AbstractRunMojo {
throws MojoExecutionException, MojoFailureException {
try {
generateAotAssets(workingDirectory, startClassName, environmentVariables);
compileSourceFiles(getClassPathUrls());
compileSourceFiles();
copyNativeConfiguration(this.generatedResources.toPath());
}
catch (Exception ex) {
@@ -139,16 +137,17 @@ public class AotGenerateMojo extends AbstractRunMojo {
}
}
private void compileSourceFiles(URL[] classpathUrls) throws IOException {
private void compileSourceFiles() throws IOException, MojoExecutionException {
List<Path> sourceFiles = Files.walk(this.generatedSources.toPath()).filter(Files::isRegularFile).toList();
if (sourceFiles.isEmpty()) {
return;
}
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
try (StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null)) {
List<String> options = List.of("-cp",
Arrays.stream(classpathUrls).map(URL::toString).collect(Collectors.joining(File.pathSeparator)),
"-d", this.classesDirectory.toPath().toAbsolutePath().toString());
List<String> options = new ArrayList<>();
addClasspath(options);
options.add("-d");
options.add(this.classesDirectory.toPath().toAbsolutePath().toString());
Iterable<? extends JavaFileObject> compilationUnits = fm.getJavaFileObjectsFromPaths(sourceFiles);
Errors errors = new Errors();
CompilationTask task = compiler.getTask(null, fm, errors, options, null, compilationUnits);