Skip to content

AbstractAotMojo should not add source or target if they are null #36971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

AbstractAotMojo should not add source or target if they are null #36971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions ...pring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
*
* @author Phillip Webb
* @author Scott Frederick
* @author Omar YAYA
* @since 3.0.0
*/
public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
Expand Down Expand Up @@ -152,10 +153,7 @@ protected final void compileSourceFiles(URL[] classPath, File sourcesDirectory,
options.add(releaseVersion);
}
else {
options.add("--source");
options.add(compilerConfiguration.getSourceMajorVersion());
options.add("--target");
options.add(compilerConfiguration.getTargetMajorVersion());
setSourceAndTargetVersions(compilerConfiguration, options);
}
options.addAll(new RunArguments(this.compilerArguments).getArgs());
Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromPaths(sourceFiles);
Expand All @@ -167,6 +165,19 @@ protected final void compileSourceFiles(URL[] classPath, File sourcesDirectory,
}
}
}
private static void setSourceAndTargetVersions(JavaCompilerPluginConfiguration compilerConfiguration,
List<String> options) {
String sourceMajorVersion = compilerConfiguration.getSourceMajorVersion();
if (sourceMajorVersion != null && !sourceMajorVersion.isEmpty()) {
options.add("--source");
options.add(sourceMajorVersion);
}
String targetMajorVersion = compilerConfiguration.getTargetMajorVersion();
if (targetMajorVersion != null && !targetMajorVersion.isEmpty()) {
options.add("--target");
options.add(targetMajorVersion);
}
}

protected final URL[] getClassPath(File[] directories, ArtifactsFilter... artifactFilters)
throws MojoExecutionException {
Expand Down