Changeset d28220c


Ignore:
Timestamp:
Nov 22, 2017 2:49:22 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
700c843
Parents:
ad056bc
Message:

Tomcat 8.5.23
Prior to Jetty 9, we used the Tomcat 6 distribution.
As of Jetty 9, we used Tomcat 8.0.33 that was included in the Jetty 9 distribution,
but that is old and doesn't get updated.
Now use the latest Tomcat 8 distribution, and pick the same packages
as Jetty 9 did in their distribution.

Files:
9 added
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    rad056bc rd28220c  
    284284      See licenses/LICENSE-LGPLv2.1.txt
    285285
    286    Tomcat 8.0.33:
    287    Copyright 1999-2016 The Apache Software Foundation
     286   Tomcat 8.5.23:
     287   Copyright 1999-2017 The Apache Software Foundation
    288288   See licenses/LICENSE-Apache2.0.txt
    289289   See licenses/NOTICE-Tomcat.txt
  • apps/jetty/build.xml

    rad056bc rd28220c  
    1515
    1616    <!-- Note: Please change all references in top-level build.xml if you update to a new Jetty! -->
    17     <!-- unused until we go to 9.3 -->
     17    <!--       Also change javadoc URL in top-level build.properties.                            -->
     18    <!-- jetty.branch unused until we go to 9.3 -->
    1819    <property name="jetty.branch" value="stable-9" />
    1920    <property name="jetty.ver" value="9.2.22.v20170606" />
     
    2627    <property name="javac.compilerargs" value="" />
    2728    <property name="javac.version" value="1.7" />
     29
     30    <!-- 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" />
     32    <!-- everything we need is in the deployer package, except for tomcat-api.jar in the full package,
     33         so we just use the full package instead.
     34      <property name="tomcat.lib" value="apache-tomcat-${tomcat.ver}-deployer/lib" />
     35     -->
     36    <property name="tomcat.lib" value="apache-tomcat-${tomcat.ver}/lib" />
     37    <property name="tomcat.bin" value="apache-tomcat-${tomcat.ver}/bin" />
    2838
    2939    <target name="all" depends="build" />
     
    181191    </target>
    182192
     193    <!-- Make javax.servlet.jar -->
    183194    <!-- If with-libtomcat8-java but not with-libjetty9-java, we don't do this -->
    184195    <target name="copyJettylib2" depends="extractJettylib" unless="${with-libtomcat8-java}" >
    185196        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
     197            <!-- all versions - Servlet API -->
    186198            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/servlet-api-3.1.jar" />
     199
    187200          <!--
    188201            Jetty version - see below for why we don't use this one
    189202            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-api-2.3.1.jar" />
    190203           -->
    191             <!-- Apache version -->
     204
     205            <!-- Apache in Jetty package version -->
    192206            <!-- Also includes org.apache.*, this is copied into jasper-runtime.jar below -->
    193             <zipfileset includes="javax/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
    194207            <!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
    195208            <!-- javax/servlet/jsp/resources are dups of those in apache-jsp jar -->
     209          <!--
     210            <zipfileset includes="javax/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
    196211            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties javax/servlet/jsp/resources/*" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
     212           -->
     213
     214            <!-- Apache package version -->
     215            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jsp-api.jar"/>
     216            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
    197217        </jar>
    198218      <!--
     
    231251
    232252
     253    <!-- Make commons-el.jar and jasper-runtime.jar -->
    233254    <target name="copyTomcatLib2" unless="${with-libtomcat-java}" >
    234255        <!-- EL API and compiler libs.
     
    241262        <!-- the javax.el API, AND the com.sun.el parser -->
    242263        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
    243         <jar destfile="jettylib/commons-el.jar" >
     264        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="mergewithoutmain">
    244265          <!--
    245266            Jetty version
    246267            <zipfileset src="${jetty.base}/lib/jsp/javax.el-3.0.0.jar"/>
    247268           -->
    248             <!-- Apache version -->
    249             <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar"/>
     269
     270            <!-- Apache in Jetty package version -->
     271          <!--
     272            <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-${tomcat.ver}.jar"/>
     273           -->
     274
     275            <!-- Apache package version -->
     276            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/el-api.jar"/>
     277            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar"/>
    250278        </jar>
    251279
    252280        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
    253         <jar destfile="jettylib/jasper-runtime.jar" >
     281        <jar destfile="jettylib/jasper-runtime.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    254282          <!--
    255283            Jetty version
     
    262290            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/jetty-jsp-${jetty.ver}.jar" />
    263291           -->
    264             <!-- Apache version -->
    265             <!-- Also includes javax.servlet.jsp.*, this is copied into javax.servlet.jar above -->
    266             <zipfileset includes="org/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
     292
     293            <!-- For both Apache in Jetty package and Apache package versions -->
    267294            <!-- required Jetty initializer (see RouterConsoleRunner) -->
    268295            <zipfileset src="${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.ver}.jar"/>
     296
     297            <!-- Apache in Jetty package version -->
     298            <!-- Also includes javax.servlet.jsp.*, this is copied into javax.servlet.jar above -->
     299          <!--
     300            <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-${jetty.ver}.jar"/>
     301           -->
     302
     303            <!-- Apache package version -->
     304            <!-- we match what was bundled in the Jetty package version -->
     305            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar"/>
     306            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-api.jar"/>
     307            <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" src="${tomcat.lib}/tomcat-util-scan.jar"/>
    269310        </jar>
    270311
  • build.xml

    rad056bc rd28220c  
    12981298
    12991299    <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
    1300 <!--  replacement?
    1301         <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    1302 -->
     1300        <copy file="apps/jetty/apache-tomcat-8.5.23/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    13031301    </target>
    13041302
     
    22682266            <!-- libjetty9-java -->
    22692267            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
     2268            <!-- libtomcat8-java -->
     2269            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    22702270            <!-- libjstl1.1-java or glassfish-javaee -->
    22712271          <!--
     
    22852285                <exclude name="installer/resources/geoipv6.dat.gz"/>
    22862286                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2287                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    22872288          <!--
    22882289                <exclude name="apps/susidns/src/lib/jstl.jar" />
     
    23422343          <!--
    23432344            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
     2345            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    23442346           -->
    23452347            <!-- libjstl1.1-java or glassfish-javaee -->
     
    23612363          <!--
    23622364                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2365                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    23632366           -->
    23642367          <!--
     
    24102413            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    24112414            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
     2415            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    24122416          <!--
    24132417            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     
    24252429                <exclude name="installer/resources/geoipv6.dat.gz"/>
    24262430                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2431                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    24272432          <!--
    24282433                <exclude name="apps/susidns/src/lib/jstl.jar" />
  • history.txt

    rad056bc rd28220c  
    22 * Streaming: Fix bug causing loopback hangs and
    33   preventing desired ack behavior (ticket #1939)
     4 * Tomcat 8.5.23
    45
    562017-11-21 zzz
  • router/java/src/net/i2p/router/RouterVersion.java

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