Build: Remove commons-logging classes from commons-logging.jar (ticket #1679)

This commit is contained in:
zzz
2015-11-19 18:56:49 +00:00
parent 16549aa49a
commit a468b3e8b4
2 changed files with 5 additions and 2 deletions

View File

@@ -149,9 +149,14 @@
<!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over,
needed for old plugins and things. We add tomcat-juli below.
-->
<!--
* Removed in 0.9.24, see ticket #1679
* Jetty now uses tomcat-juli (added below to commons-logging.jar), not commons-logging proper,
* and no known plugins use it either.
<jar destfile="jettylib/commons-logging.jar" filesetmanifest="mergewithoutmain" >
<zipfileset excludes="META-INF/LICENSE.txt META-INF/NOTICE.txt" src="../../installer/lib/launch4j/lib/commons-logging.jar" />
</jar>
-->
<ant target="copyTomcatLib" />
</target>

View File

@@ -1465,9 +1465,7 @@
</target>
<!-- All jetty jars required for update.
We don't need commons-el or commons-logging, they haven't changed.
TODO do we need to bother updating jasper?
TODO where is JMX? We don't need it I hope.
-->
<target name="prepjupdate" depends="prepupdate, buildWEB">
<copy todir="pkg-temp/lib" >