Changeset b374b11


Ignore:
Timestamp:
Apr 11, 2018 6:24:37 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2f53f255
Parents:
57e21e90
Message:

Jetty 9.2.24-v201801015, Tomcat 8.5.30

Files:
7 added
7 deleted
4 edited
19 moved

Legend:

Unmodified
Added
Removed

  • apps/jetty/apache-tomcat-8.5.30/NOTICE

    r57e21e90 rb374b11  
    11Apache Tomcat
    2 Copyright 1999-2017 The Apache Software Foundation
     2Copyright 1999-2018 The Apache Software Foundation
    33
    44This product includes software developed at

  • apps/jetty/build.xml

    r57e21e90 rb374b11  
    1818    <!-- jetty.branch unused until we go to 9.3 -->
    1919    <property name="jetty.branch" value="stable-9" />
    20     <property name="jetty.ver" value="9.2.22.v20170606" />
     20    <property name="jetty.ver" value="9.2.24.v20180105" />
    2121    <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
    22     <property name="jetty.sha1" value="7f0b10d69b214337622e3c0565f94417828ba13e" />
     22    <property name="jetty.sha1" value="a8af3941385d43eece329b09ae4a261e0cb3579c" />
    2323    <property name="jetty.filename" value="${jetty.base}.zip" />
    2424    <!-- change jetty.ver to jetty.branch for 9.3 -->
    … …  
    2929
    3030    <!-- Note: Please change all references in top-level build.xml if you update to a new Tomcat! -->
    31     <property name="tomcat.ver" value="8.5.23" />
     31    <property name="tomcat.ver" value="8.5.30" />
    3232    <!-- everything we need is in the deployer package, except for tomcat-api.jar in the full package,
    3333         so we just use the full package instead.
    … …  
    303303            <!-- Apache package version -->
    304304            <!-- we match what was bundled in the Jetty package version -->
     305            <!-- except we need compat/ as of 8.5.29 or JspC fails in the jar scan -->
    305306            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar"/>
    306307            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-api.jar"/>
    307308            <zipfileset includes="org/apache/juli/logging/**/*" src="${tomcat.bin}/tomcat-juli.jar"/>
    308             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE org/apache/tomcat/util/codec/ org/apache/tomcat/util/compat/ org/apache/tomcat/util/threads/" src="${tomcat.lib}/tomcat-util.jar"/>
     309            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE org/apache/tomcat/util/codec/ org/apache/tomcat/util/threads/" src="${tomcat.lib}/tomcat-util.jar"/>
    309310            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-util-scan.jar"/>
    310311        </jar>

  • build.xml

    r57e21e90 rb374b11  
    13741374
    13751375    <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
    1376         <copy file="apps/jetty/apache-tomcat-8.5.23/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
     1376        <copy file="apps/jetty/apache-tomcat-8.5.30/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    13771377    </target>
    13781378
    … …  
    23632363            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    23642364            <!-- libjetty9-java -->
    2365             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
     2365            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
    23662366            <!-- libtomcat8-java -->
    2367             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
     2367            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
    23682368            <!-- libjstl1.1-java or glassfish-javaee or libtaglibs-standard -->
    23692369            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    … …  
    24402440            <!-- libjetty9-java -->
    24412441          <!--
    2442             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
    2443             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
     2442            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
     2443            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
    24442444           -->
    24452445            <!-- libjstl1.1-java or glassfish-javaee -->
    … …  
    25192519            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    25202520            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2521             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
    2522             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
     2521            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
     2522            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
    25232523          <!--
    25242524            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    … …  
    25892589            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    25902590            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2591             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
    2592             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
     2591            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
     2592            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
    25932593            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    25942594            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />

  • history.txt

    r57e21e90 rb374b11  
     12018-04-11 zzz
     2 * Jetty 9.2.24-v201801015
     3 * Tomcat 8.5.30
     4
    15* 2018-04-10 0.9.34 released
    26

  • router/java/src/net/i2p/router/RouterVersion.java

    r57e21e90 rb374b11  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 0;
     21    public final static long BUILD = 1;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.