From 32d0d7a4d549b8de9dba57984aba2b1279874a02 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 30 Mar 2017 14:28:53 +0200
Subject: [PATCH] Remove xerces from compiler uberjar, pack compiler with
 explicit jar names

xercesImpl was unnecessarily added to the compiler uberjar during migration
to the idea platform 171. This caused NCDFE about classes from org.w3c
package.
And to simplify application of this commit and to ensure that only required
jars are packed into the uberjar, the build.xml was altered to use
explicit list of the jars from the ideaSdk/core directory, rather than
a mask.

Fixes #KT-17143 and #KT-17157

(cherry picked from commit 5595bea)
---
 build.xml               | 13 ++++++++++++-
 update_dependencies.xml |  2 --
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 37485f7a4fb..78370000557 100644
--- a/build.xml
+++ b/build.xml
@@ -584,7 +584,18 @@
                 </fileset>
 
                 <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
-                <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/annotations.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/asm-all.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/guava-19.0.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/intellij-core.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/jdom.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/jna.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/log4j.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/picocontainer.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/snappy-in-java-0.5.1.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/trove4j.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/xpp3-1.1.4-min.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/xstream-1.4.8.jar"/>
                 <zipfileset src="${idea.sdk}/lib/jna-platform.jar"/>
                 <zipfileset src="${idea.sdk}/lib/oromatcher.jar"/>
                 <zipfileset src="${idea.sdk}/jps/jps-model.jar"/>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 5d1a9597f11..53ddf3696d7 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -674,8 +674,6 @@
                         <file file="@{idea.dir}/lib/asm-all.jar"/>
                         <file file="@{idea.dir}/lib/snappy-in-java-0.5.1.jar"/>
 
-                        <file file="@{idea.dir}/lib/xercesImpl.jar"/>
-
                         <!-- TODO temporary workaround since util-rt is not packaged into intellij-core.jar -->
                         <file file="@{idea.dir}/lib/util.jar"/>
                     </resources>