Author: markt
Date: Tue Oct 4 12:35:48 2016
New Revision: 1763271
URL: http://svn.apache.org/viewvc?rev=1763271&view=rev
Log:
Exclude files from catalina.jar that are already provided in
bootstrap.jar
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1763271&r1=1763270&r2=1763271&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Oct 4 12:35:48 2016
@@ -375,9 +375,14 @@
<include name="org/apache/tomcat/util/scan/**" />
</patternset>
+ <!-- Avoid duplication of files in bootstrap.jar -->
<patternset id="files.catalina">
<include name="org/apache/catalina/**" />
<include name="org/apache/naming/**" />
+ <!-- Exclude classes included in bootstrap.jar -->
+ <invert>
+ <patternset refid="files.bootstrap"/>
+ </invert>
<!-- Modules -->
<exclude name="org/apache/catalina/ant/**" />
<exclude name="org/apache/catalina/ha/**" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
