diff --git a/build.properties b/build.properties
index e15cb8a2c34f..121037941cc3 100644
--- a/build.properties
+++ b/build.properties
@@ -293,8 +293,8 @@
     ant.build.javac.target=1.6
 
     #javac.compiler=com.google.errorprone.ErrorProneAntCompilerAdapter
-    #javac.compiler=modern
-    javac.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
+    javac.compiler=modern
+    #javac.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
 
     javac.debug=on
     javac.deprecation=off
diff --git a/ivy.xml b/ivy.xml
index e6a53387a435..2fafa5d9e27a 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -29,7 +29,7 @@
 		<dependency name="bsf" org="bsf" rev="2.4.0" />
 		<dependency name="ccpp" org="javax.ccpp" rev="1.0" />
 		<dependency name="commons-logging" org="commons-logging" rev="1.1.1" />
-		<dependency name="ecj" org="org.eclipse.jdt.core.compiler" rev="3.7.2" />
+		<dependency name="ecj" org="org.eclipse.jdt.core.compiler" rev="4.4" />
 		<dependency name="error_prone_ant" org="com.google.errorprone" rev="1.0.8" />
 		<dependency name="jalopy" org="jalopy" rev="1.5rc3" />
 		<dependency name="javax.servlet-api" org="javax.servlet" rev="3.0.1" />
diff --git a/ivy.xml.MD5 b/ivy.xml.MD5
index f02d135120d9..a3e8f0e46a65 100644
--- a/ivy.xml.MD5
+++ b/ivy.xml.MD5
@@ -1 +1 @@
-b37e8f869b86301274acd71980d094b3
+40d44e154ec091aa1bcbc5cd16b798a3
diff --git a/lib/ecj.jar b/lib/ecj.jar
index 92f9909b06ad..98f82dc592c4 100644
Binary files a/lib/ecj.jar and b/lib/ecj.jar differ