eclipse compiler 4.2 bundled

.idea/libraries/Eclipse.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Eclipse">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/org.eclipse.jdt.core_3.5.2.v_981_R35x.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/ecj-4.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/org.eclipse.jdt.core.source_3.5.2.v_981_R35x.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/ecjsrc-4.2.jar!/" />
     </SOURCES>
   </library>
 </component>

build/scripts/layouts.gant

@@ -159,7 +159,6 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
 
       fileset(dir: "$home/jps/lib") {
         include(name: "optimizedFileManager.jar")
-        include(name: "ecj-*.jar")
       }
 
       fileset(dir: "$home/lib", includesfile: "${home}/lib/required_for_dist.txt")

build/scripts/libLicenses.gant

@@ -209,7 +209,7 @@ libraryLicense(name: "Microba", libraryName: "microba", version: "0.4.2", licens
 libraryLicense(name: "MigLayout", libraryName: "miglayout-swing", version: "3.7.1", license: "BSD", url: "http://www.miglayout.com/", licenseUrl: "http://www.miglayout.com/mavensite/license.html")
 libraryLicense(name: "NanoXML", version: "2.2.3", license: "zlib/libpng", url: "http://nanoxml.cyberelf.be/", licenseUrl: "http://devkix.com/nanoxml.php")
 libraryLicense(name: "nekohtml", libraryName: "nekohtml", version: "1.9.14", license: "Apache 2.0", url: "http://nekohtml.sourceforge.net/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0.txt")
-libraryLicense(name: "Eclipse JDT Core", libraryName: "Eclipse", version: "3.3", license: "CPL 1.0", url: "http://www.eclipse.org/jdt/core/index.php")
+libraryLicense(name: "Eclipse JDT Core", libraryName: "Eclipse", version: "4.2", license: "CPL 1.0", url: "http://www.eclipse.org/jdt/core/index.php")
 libraryLicense(name: "Jakarta ORO", libraryName: "OroMatcher", version: "2.0.8", license: "Apache", url: "http://jakarta.apache.org/oro/", licenseUrl: "http://svn.apache.org/repos/asf/jakarta/oro/trunk/LICENSE")
 libraryLicense(name: "PicoContainer", libraryName: "picocontainer", version: "1.2", license: "BSD", url: "http://www.picocontainer.org/", licenseUrl: "http://docs.codehaus.org/display/PICO/License")
 libraryLicense(name: "Plexus Utils", libraryName: "plexus-utils-1.5.5.jar", version: "1.5.5", license: "Apache 2.0", url: "http://plexus.codehaus.org/plexus-utils")
@@ -239,7 +239,6 @@ libraryLicense(name: "protobuf", version: "2.3.0", license: "New BSD", url: "htt
 libraryLicense(name: "Netty", libraryName: "Netty", version: "3.3.1", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Kryo", libraryName: "Kryo", version: "1.04", license: "New BSD License", url: "http://code.google.com/p/kryo/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php")
 libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "1.0.4.1", license: "Apache 2.0", url: "http://code.google.com/p/snappy-java/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
-libraryLicense(name: "ecj-4.2.jar", libraryName: "ecj-4.2.jar", version: "4.2", license: "CPL 1.0", url: "http://www.eclipse.org/jdt/core/index.php")
 jetbrainsLibrary("JPS")
 jetbrainsLibrary("Maven Embedder")
 jetbrainsLibrary("tcServiceMessages")

java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompiler.java

@@ -67,10 +67,10 @@ public class EclipseCompiler extends ExternalCompiler {
     File dir = new File(PathManager.getLibPath());
     File[] jars = dir.listFiles(new FilenameFilter() {
       public boolean accept(File dir, String name) {
-        return name.startsWith("org.eclipse.jdt.core") && name.endsWith(".jar");
+        return name.startsWith("ecj-") && name.endsWith(".jar");
       }
     });
-    return jars.length == 0 ? dir + "/org.eclipse.jdt.core*.jar" : jars[0].getPath();
+    return jars.length == 0 ? dir + "/ecj-*.jar" : jars[0].getPath();
   }
 
   public EclipseCompiler(Project project) {

jps/jps-builders/jps-builders.iml

@@ -41,15 +41,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module-library" scope="RUNTIME">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/ecj-4.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" scope="RUNTIME" name="Eclipse" level="project" />
   </component>
 </module>
 

lib/required_for_dist.txt

@@ -31,7 +31,7 @@ microba.jar
 miglayout-swing.jar
 nanoxml-2.2.3.jar
 nekohtml-1.9.14.jar
-org.eclipse.jdt.core_3.5.2.v_981_R35x.jar
+ecj-4.2.jar
 oromatcher.jar
 picocontainer.jar
 resolver.jar