Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid setting null compiler option

Browse Source 
See gh-36971
This commit is contained in:
omaryaya 2023-08-14 16:26:40 +03:00 committed by Stephane Nicoll
parent fe12e75955
commit a0ad00c542
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ import org.springframework.boot.maven.CommandLineBuilder.ClasspathBuilder;
*
* @author Phillip Webb
* @author Scott Frederick
* @author Omar YAYA
* @since 3.0.0
*/
public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
@ -152,10 +153,7 @@ public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
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);
@ -167,6 +165,19 @@ public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
}
}
}
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 {