Bug 553050 - Support maven.compiler.release

Support setting maven.compilere.release property. Change-Id: Ibb6eb2f518d09c8b53f87b32941db4893622d4f3 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
eclipse-tycho · Dec 2, 2019 · 9556b00 · 9556b00
1 parent 2df89d8
commit 9556b00
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java b/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
@@ -234,6 +234,11 @@ public String[] buildCompilerArguments(CompilerConfiguration config, CustomCompi
             args.add(config.getSourceVersion());
         }
 
+        if (!StringUtils.isEmpty(config.getReleaseVersion())) {
+            args.add("--release");
+            args.add(config.getReleaseVersion());
+        }
+
         if (!suppressEncoding(config) && !StringUtils.isEmpty(config.getSourceEncoding())) {
             args.add("-encoding");
             args.add(config.getSourceEncoding());

diff --git a/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java b/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java
@@ -114,6 +114,12 @@ public abstract class AbstractCompilerMojo extends AbstractMojo {
     @Parameter(property = "maven.compiler.target")
     protected String target;
 
+    /**
+     * The -release argument for the Java compiler
+     */
+    @Parameter(property = "maven.compiler.release")
+    protected String release;
+
     /**
      * The -encoding argument for the Java compiler (kept for backwards compatibility)
      * 
@@ -455,6 +461,9 @@ protected CompilerConfiguration getCompilerConfiguration(List<String> compileSou
         compilerConfiguration.setSourceVersion(source != null ? source : DEFAULT_SOURCE_VERSION);
 
         compilerConfiguration.setTargetVersion(target != null ? target : DEFAULT_TARGET_VERSION);
+        if (release != null) {
+            compilerConfiguration.setReleaseVersion(release);
+        }
 
         compilerConfiguration.setSourceEncoding(getEncoding());