Skip to content

Commit a0ad00c

Browse files
omaryayasnicoll
authored andcommitted
Avoid setting null compiler option
See gh-36971
1 parent fe12e75 commit a0ad00c

File tree

1 file changed

+15
-4
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven

1 file changed

+15
-4
lines changed

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
*
5454
* @author Phillip Webb
5555
* @author Scott Frederick
56+
* @author Omar YAYA
5657
* @since 3.0.0
5758
*/
5859
public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
@@ -152,10 +153,7 @@ protected final void compileSourceFiles(URL[] classPath, File sourcesDirectory,
152153
options.add(releaseVersion);
153154
}
154155
else {
155-
options.add("--source");
156-
options.add(compilerConfiguration.getSourceMajorVersion());
157-
options.add("--target");
158-
options.add(compilerConfiguration.getTargetMajorVersion());
156+
setSourceAndTargetVersions(compilerConfiguration, options);
159157
}
160158
options.addAll(new RunArguments(this.compilerArguments).getArgs());
161159
Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromPaths(sourceFiles);
@@ -167,6 +165,19 @@ protected final void compileSourceFiles(URL[] classPath, File sourcesDirectory,
167165
}
168166
}
169167
}
168+
private static void setSourceAndTargetVersions(JavaCompilerPluginConfiguration compilerConfiguration,
169+
List<String> options) {
170+
String sourceMajorVersion = compilerConfiguration.getSourceMajorVersion();
171+
if (sourceMajorVersion != null && !sourceMajorVersion.isEmpty()) {
172+
options.add("--source");
173+
options.add(sourceMajorVersion);
174+
}
175+
String targetMajorVersion = compilerConfiguration.getTargetMajorVersion();
176+
if (targetMajorVersion != null && !targetMajorVersion.isEmpty()) {
177+
options.add("--target");
178+
options.add(targetMajorVersion);
179+
}
180+
}
170181

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

0 commit comments

Comments
 (0)