From ba550047a3f7f58cdecbde0af16933db98a3ad12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Wed, 9 Oct 2024 15:15:40 +0300 Subject: [PATCH] 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/compiler/jdt/JDTCompiler.java | 14 +++----------- .../apache/maven/plugin/AbstractCompilerMojo.java | 2 -- 2 files changed, 3 insertions(+), 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 index 5fc0b9cef3..3e7596be40 100644 --- 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,7 +325,7 @@ 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()); } @@ -333,14 +333,6 @@ public String[] buildCompilerArguments(CompilerConfiguration config, CustomCompi 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 index 3c13ff8498..269ee93f6e 100644 --- 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 compileSou compilerConfiguration.setWorkingDirectory(basedir); - compilerConfiguration.setCompilerVersion(compilerVersion); - compilerConfiguration.setBuildDirectory(buildDirectory); compilerConfiguration.setOutputFileName(outputFileName);