Stop using deprecated plexus-compiler API

ECJ always supported --source and --encoding parameters so these checks were leftovers from copied code relevant for ancient javac versions.
eclipse-tycho · Oct 9, 2024 · d15a880 · d15a880
1 parent d564019
commit d15a880
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 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
@@ -305,11 +305,11 @@ public String[] buildCompilerArguments(CompilerConfiguration config, CustomCompi
             args.add(config.getTargetVersion());
         }
 
-        if (!suppressSource(config) && StringUtils.isEmpty(config.getSourceVersion())) {
+        if (StringUtils.isEmpty(config.getSourceVersion())) {
             // If omitted, later JDKs complain about a 1.1 target
             args.add("-source");
             args.add("1.3");
-        } else if (!suppressSource(config)) {
+        } else {
             args.add("-source");
             args.add(config.getSourceVersion());
         }
@@ -325,22 +325,14 @@ public String[] buildCompilerArguments(CompilerConfiguration config, CustomCompi
             }
         }
 
-        if (!suppressEncoding(config) && !StringUtils.isEmpty(config.getSourceEncoding())) {
+        if (!StringUtils.isEmpty(config.getSourceEncoding())) {
             args.add("-encoding");
             args.add(config.getSourceEncoding());
         }
 
         return args.toArray(new String[args.size()]);
     }
 
-    private static boolean suppressSource(CompilerConfiguration config) {
-        return "1.3".equals(config.getCompilerVersion());
-    }
-
-    private static boolean suppressEncoding(CompilerConfiguration config) {
-        return "1.3".equals(config.getCompilerVersion());
-    }
-
     /**
      * Compile the java sources in a external process, calling an external executable, like javac.
      *

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
@@ -527,8 +527,6 @@ protected CompilerConfiguration getCompilerConfiguration(List<String> compileSou
 
         compilerConfiguration.setWorkingDirectory(basedir);
 
-        compilerConfiguration.setCompilerVersion(compilerVersion);
-
         compilerConfiguration.setBuildDirectory(buildDirectory);
 
         compilerConfiguration.setOutputFileName(outputFileName);