Merge branch '3.0.x' into 3.1.x

Closes gh-36972
spring-projects · Aug 14, 2023 · 5f2432a · 5f2432a
2 parents 5764525 + cf27e3e
commit 5f2432a
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...pring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java b/...pring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java
@@ -53,6 +53,7 @@
  *
  * @author Phillip Webb
  * @author Scott Frederick
+ * @author Omar YAYA
  * @since 3.0.0
  */
 public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
@@ -152,10 +153,16 @@ 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());
+				String source = compilerConfiguration.getSourceMajorVersion();
+				if (source != null) {
+					options.add("--source");
+					options.add(source);
+				}
+				String target = compilerConfiguration.getTargetMajorVersion();
+				if (target != null) {
+					options.add("--target");
+					options.add(target);
+				}
 			}
 			options.addAll(new RunArguments(this.compilerArguments).getArgs());
 			Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromPaths(sourceFiles);