Bump ECJ so that sources can be compiled with Java 8 target

querydsl · Dec 28, 2020 · 276efe4 · 276efe4
1 parent 67c27d2
commit 276efe4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
   <properties>
     <commons.collections.version>4.01</commons.collections.version>
     <commons.lang.version>3.0.1</commons.lang.version>
-    <ecj.version>4.3.1</ecj.version>
+    <ecj.version>4.6.1</ecj.version>
   </properties>
 
   <dependencies>

diff --git a/src/main/java/com/querydsl/codegen/utils/ECJEvaluatorFactory.java b/src/main/java/com/querydsl/codegen/utils/ECJEvaluatorFactory.java
@@ -61,10 +61,7 @@ public class ECJEvaluatorFactory extends AbstractEvaluatorFactory {
 
     public static CompilerOptions getDefaultCompilerOptions() {
         String javaSpecVersion = System.getProperty("java.specification.version");
-        if (javaSpecVersion.equals("1.8") || (javaSpecVersion.matches("\\d+") && Integer.parseInt(javaSpecVersion) >= 9)) {
-            javaSpecVersion = "1.7";
-        }
-        Map<String, Object> settings = new HashMap<>();
+        Map<String, String> settings = new HashMap<>();
         settings.put(CompilerOptions.OPTION_Source, javaSpecVersion);
         settings.put(CompilerOptions.OPTION_TargetPlatform, javaSpecVersion);
         settings.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.IGNORE);