Changeset d600a2d


Ignore:
Timestamp:
Apr 28, 2018 10:17:19 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
4d09e50
Parents:
e3105882
Message:

Build: Remove references to now-empty commons-logging.jar

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/build.xml

    re3105882 rd600a2d  
    203203        <zipfileset src="build/i2psnark.jar" />
    204204        <zipfileset src="../../../core/java/build/i2p.jar" />
    205         <zipfileset src="../../jetty/jettylib/commons-logging.jar"  />
    206205      <!-- without this we get a warning about 'no JSP support' but that's it
    207206        <zipfileset src="../../jetty/jettylib/jasper-runtime.jar"  />
  • apps/jetty/build.xml

    re3105882 rd600a2d  
    229229         jasper.jar : jasper-runtime.jar
    230230         jasper-el.jar + el-api.jar : commons-el.jar
    231          tomcat-juli.jar : Add to commons-logging.jar
     231         tomcat-juli.jar : Add to jasper-runtime.jar
    232232         empty jar : jasper-compiler.jar
    233233         Also, take NOTICE and LICENSE out of each one, we bundle those separately.
     
    341341            <classpath>
    342342                <pathelement location="../../../core/java/build/i2p.jar" />
    343                 <pathelement location="./jettylib/commons-logging.jar" />
    344343                <pathelement location="./jettylib/org.mortbay.jetty.jar" />
    345344                <pathelement location="./jettylib/javax.servlet.jar" />
     
    362361            destdir="./build/obj"
    363362            includeAntRuntime="false"
    364             classpath="../../core/java/build/i2p.jar:./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-servlet.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar" >
     363            classpath="../../core/java/build/i2p.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-servlet.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar" >
    365364            <compilerarg line="${javac.compilerargs}" />
    366365        </javac>
  • apps/routerconsole/java/build.xml

    re3105882 rd600a2d  
    397397                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
    398398
    399                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    400399                <pathelement location="../../jetty/jettylib/commons-el.jar" />
    401400                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
     
    436435                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
    437436
    438                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    439437                <pathelement location="../../jetty/jettylib/commons-el.jar" />
    440438                <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
  • apps/susidns/src/build.xml

    re3105882 rd600a2d  
    2929                <pathelement location="lib/standard.jar" />
    3030                <pathelement location="${lib}/jasper-runtime.jar" />
    31                 <pathelement location="${lib}/commons-logging.jar" />
    3231                <pathelement location="${lib}/jetty-util.jar" />
    3332                <pathelement location="${ant.home}/lib/ant.jar" />
  • build.xml

    re3105882 rd600a2d  
    589589            <manifest>
    590590                <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
    591                 <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-continuation.jar lib/jetty-deploy.jar lib/jetty-http.jar lib/jetty-i2p.jar lib/jetty-io.jar lib/jetty-rewrite-handler.jar lib/jetty-security.jar lib/jetty-servlet.jar lib/jetty-servlets.jar lib/jetty-start.jar lib/jetty-util.jar lib/jetty-webapp.jar lib/jetty-xml.jar" />
     591                <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-runtime.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-continuation.jar lib/jetty-deploy.jar lib/jetty-http.jar lib/jetty-i2p.jar lib/jetty-io.jar lib/jetty-rewrite-handler.jar lib/jetty-security.jar lib/jetty-servlet.jar lib/jetty-servlets.jar lib/jetty-start.jar lib/jetty-util.jar lib/jetty-webapp.jar lib/jetty-xml.jar" />
    592592                <attribute name="Built-By" value="${build.built-by}" />
    593593                <attribute name="Build-Date" value="${build.timestamp}" />
     
    20122012            <arg value="i2p.fba"/>
    20132013            <arg value="-auxclasspath"/>
    2014             <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/lib/standard.jar:apps/susidns/src/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
     2014            <arg value="build/commons-el.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/lib/standard.jar:apps/susidns/src/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
    20152015            <arg value="-sourcepath"/>
    20162016            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/:installer/java/src"/>
Note: See TracChangeset for help on using the changeset viewer.