From edf5ef588d3c5c36ff22f31f403bbb25a6edf19e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 10 Jan 2012 20:17:35 +0000
Subject: [PATCH] remove dup docs from tomcat jars
---
apps/jetty/build.xml | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index bde8e56c81..e0327770b1 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -112,18 +112,23 @@
servlet-api.jar + jsp-api.jar : javax.servlet.jar
tomcat-juli.jar : commons-logging.jar
empty jar : jasper-compiler.jar
+ Also, take NOTICE and LICENSE out of each one, we bundle those separately.
-->
<target name="copyTomcatLib" >
- <copy file="${tomcat.lib}/jasper.jar" tofile="jettylib/jasper-runtime.jar" />
- <copy file="${tomcat.lib}/jasper-el.jar" tofile="jettylib/commons-el.jar" />
- <jar destfile="jettylib/commons-el.jar" duplicate="preserve" update="true" >
+ <jar destfile="jettylib/jasper-runtime.jar" >
+ <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
+ </jar>
+ <jar destfile="jettylib/commons-el.jar" duplicate="preserve" >
+ <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
<zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
</jar>
- <copy file="${tomcat.lib}/servlet-api.jar" tofile="jettylib/javax.servlet.jar" />
- <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" update="true" >
+ <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" >
+ <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/servlet-api.jar" />
<zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/jsp-api.jar" />
</jar>
- <copy file="${tomcat.lib}/tomcat-juli.jar" tofile="jettylib/commons-logging.jar" />
+ <jar destfile="jettylib/commons-logging.jar" >
+ <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
+ </jar>
<jar destfile="jettylib/jasper-compiler.jar" />
</target>
--
GitLab