Merge pull request OpenLiberty#1849 from arunvenmany-ibm/release_flag…

…_issue_fix Fixing option --source cannot be used together with --release error
cherylking · Dec 3, 2024 · 0f90be0 · 0f90be0
2 parents a9279a2 + 9ed33f8
commit 0f90be0
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java
@@ -1705,22 +1705,28 @@ private JavaCompilerOptions getMavenCompilerOptions(MavenProject currentProject)
             compilerOptions.setShowWarnings(showWarningsBoolean);
         }
 
+        String release = getCompilerOption(configuration, "release", "maven.compiler.release", currentProject);
         String source = getCompilerOption(configuration, "source", "maven.compiler.source", currentProject);
-        if (source != null) {
-            getLog().debug("Setting compiler source to " + source);
-            compilerOptions.setSource(source);
-        }
-
         String target = getCompilerOption(configuration, "target", "maven.compiler.target", currentProject);
-        if (target != null) {
-            getLog().debug("Setting compiler target to " + target);
-            compilerOptions.setTarget(target);
-        }
-
-        String release = getCompilerOption(configuration, "release", "maven.compiler.release", currentProject);
         if (release != null) {
             getLog().debug("Setting compiler release to " + release);
+            if (source != null) {
+                getLog().debug("Compiler option source will be ignored since release is specified");
+            }
+            if (target != null) {
+                getLog().debug("Compiler option target will be ignored since release is specified");
+            }
             compilerOptions.setRelease(release);
+        } else {
+            // add source and target only if release is not set
+            if (source != null) {
+                getLog().debug("Setting compiler source to " + source);
+                compilerOptions.setSource(source);
+            }
+            if (target != null) {
+                getLog().debug("Setting compiler target to " + target);
+                compilerOptions.setTarget(target);
+            }
         }
 
         String encoding = getCompilerOption(configuration, "encoding", "project.build.sourceEncoding", currentProject);