diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index 2fad37dfafe9fe236bea7bb9125e3506bd78aa35..b1fdbcd461996716c13d2e4277b6bf07d2c1c9b6 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -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> diff --git a/build.xml b/build.xml index aefc60d52d7d423a78af970632f807bc7fdc3654..f6a8a54517a8861077b0c949d44f94ac400ae8b3 100644 --- a/build.xml +++ b/build.xml @@ -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" >