Skip to content

Commit 5595bea

Browse files
committed
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
1 parent 36a6288 commit 5595bea

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

build.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,18 @@
584584
</fileset>
585585

586586
<zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
587-
<zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
587+
<zipfileset src="${basedir}/ideaSDK/core/annotations.jar"/>
588+
<zipfileset src="${basedir}/ideaSDK/core/asm-all.jar"/>
589+
<zipfileset src="${basedir}/ideaSDK/core/guava-19.0.jar"/>
590+
<zipfileset src="${basedir}/ideaSDK/core/intellij-core.jar"/>
591+
<zipfileset src="${basedir}/ideaSDK/core/jdom.jar"/>
592+
<zipfileset src="${basedir}/ideaSDK/core/jna.jar"/>
593+
<zipfileset src="${basedir}/ideaSDK/core/log4j.jar"/>
594+
<zipfileset src="${basedir}/ideaSDK/core/picocontainer.jar"/>
595+
<zipfileset src="${basedir}/ideaSDK/core/snappy-in-java-0.5.1.jar"/>
596+
<zipfileset src="${basedir}/ideaSDK/core/trove4j.jar"/>
597+
<zipfileset src="${basedir}/ideaSDK/core/xpp3-1.1.4-min.jar"/>
598+
<zipfileset src="${basedir}/ideaSDK/core/xstream-1.4.8.jar"/>
588599
<zipfileset src="${idea.sdk}/lib/jna-platform.jar"/>
589600
<zipfileset src="${idea.sdk}/lib/oromatcher.jar"/>
590601
<zipfileset src="${idea.sdk}/jps/jps-model.jar"/>

update_dependencies.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,8 +663,6 @@
663663
<file file="@{idea.dir}/lib/asm-all.jar"/>
664664
<file file="@{idea.dir}/lib/snappy-in-java-0.5.1.jar"/>
665665

666-
<file file="@{idea.dir}/lib/xercesImpl.jar"/>
667-
668666
<!-- TODO temporary workaround since util-rt is not packaged into intellij-core.jar -->
669667
<file file="@{idea.dir}/lib/util.jar"/>
670668
</resources>

0 commit comments

Comments
 (0)