Ignore:
Timestamp:
Nov 22, 2015 4:00:16 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
302ec77
Parents:
9a9832c (diff), ce96234 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.test2' (head 8fa44268a1dd2b7baaf01806e6994281ab031870)

to branch 'i2p.i2p' (head 44afdaa15ce8a95c112c7d58a5908f401c1a0145)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r9a9832c r1215a70  
    150150             needed for old plugins and things. We add tomcat-juli below.
    151151          -->
     152      <!--
     153        * Removed in 0.9.24, see ticket #1679
     154        * Jetty now uses tomcat-juli (added below to commons-logging.jar), not commons-logging proper,
     155        * and no known plugins use it either.
    152156        <jar destfile="jettylib/commons-logging.jar" filesetmanifest="mergewithoutmain" >
    153157            <zipfileset excludes="META-INF/LICENSE.txt META-INF/NOTICE.txt" src="../../installer/lib/launch4j/lib/commons-logging.jar" />
    154158        </jar>
     159      -->
    155160        <ant target="copyTomcatLib" />
    156161    </target>
Note: See TracChangeset for help on using the changeset viewer.