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.

LICENSE.txt

@@ -283,8 +283,8 @@ Applications:
       Bundles systray4j-2.4.1:
       See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 8.0.33:
-   Copyright 1999-2016 The Apache Software Foundation
+   Tomcat 8.5.23:
+   Copyright 1999-2017 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 

apps/jetty/apache-tomcat-8.5.23/NOTICE

@@ -0,0 +1,51 @@
+Apache Tomcat
+Copyright 1999-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This software contains code derived from netty-native
+developed by the Netty project
+(http://netty.io, https://github.com/netty/netty-tcnative/)
+and from finagle-native developed at Twitter
+(https://github.com/twitter/finagle).
+
+The Windows Installer is built with the Nullsoft
+Scriptable Install System (NSIS), which is
+open source software.  The original software and
+related information is available at
+http://nsis.sourceforge.net.
+
+Java compilation software for JSP pages is provided by the Eclipse
+JDT Core Batch Compiler component, which is open source software.
+The original software and related information is available at
+http://www.eclipse.org/jdt/core/.
+
+For portions of the Tomcat JNI OpenSSL API and the OpenSSL JSSE integration
+The org.apache.tomcat.jni and the org.apache.tomcat.net.openssl packages
+are derivative work originating from the Netty project and the finagle-native
+project developed at Twitter
+* Copyright 2014 The Netty Project
+* Copyright 2014 Twitter
+
+The original XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+ - javaee_6.xsd
+ - javaee_web_services_1_3.xsd
+ - javaee_web_services_client_1_3.xsd
+ - jsp_2_2.xsd
+ - web-app_3_0.xsd
+ - web-common_3_0.xsd
+ - web-fragment_3_0.xsd
+ - javaee_7.xsd
+ - javaee_web_services_1_4.xsd
+ - javaee_web_services_client_1_4.xsd
+ - jsp_2_3.xsd
+ - web-app_3_1.xsd
+ - web-common_3_1.xsd
+ - web-fragment_3_1.xsd
+
+may be obtained from:
+http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html

apps/jetty/build.xml

@@ -14,7 +14,8 @@
      -->
 
     <!-- Note: Please change all references in top-level build.xml if you update to a new Jetty! -->
-    <!-- unused until we go to 9.3 -->
+    <!--       Also change javadoc URL in top-level build.properties.                            -->
+    <!-- jetty.branch unused until we go to 9.3 -->
     <property name="jetty.branch" value="stable-9" />
     <property name="jetty.ver" value="9.2.22.v20170606" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
@@ -26,6 +27,15 @@
     <property name="javac.compilerargs" value="" />
     <property name="javac.version" value="1.7" />
 
+    <!-- Note: Please change all references in top-level build.xml if you update to a new Tomcat! -->
+    <property name="tomcat.ver" value="8.5.23" />
+    <!-- everything we need is in the deployer package, except for tomcat-api.jar in the full package,
+         so we just use the full package instead.
+      <property name="tomcat.lib" value="apache-tomcat-${tomcat.ver}-deployer/lib" />
+     -->
+    <property name="tomcat.lib" value="apache-tomcat-${tomcat.ver}/lib" />
+    <property name="tomcat.bin" value="apache-tomcat-${tomcat.ver}/bin" />
+
     <target name="all" depends="build" />
 
     <!--
@@ -180,20 +190,30 @@
         </jar>
     </target>
 
+    <!-- Make javax.servlet.jar -->
     <!-- If with-libtomcat8-java but not with-libjetty9-java, we don't do this -->
     <target name="copyJettylib2" depends="extractJettylib" unless="${with-libtomcat8-java}" >
         <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
+            <!-- all versions - Servlet API -->
             <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" />
+
           <!--
             Jetty version - see below for why we don't use this one
             <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" />
            -->
-            <!-- Apache version -->
+
+            <!-- Apache in Jetty package version -->
             <!-- Also includes org.apache.*, this is copied into jasper-runtime.jar below -->
-            <zipfileset includes="javax/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
             <!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
             <!-- javax/servlet/jsp/resources are dups of those in apache-jsp jar -->
+          <!--
+            <zipfileset includes="javax/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
             <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" />
+           -->
+
+            <!-- Apache package version -->
+            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jsp-api.jar"/>
+            <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" />
         </jar>
       <!--
         <delete file="jetty.tar" />
@@ -230,6 +250,7 @@
     </target>
 
 
+    <!-- Make commons-el.jar and jasper-runtime.jar -->
     <target name="copyTomcatLib2" unless="${with-libtomcat-java}" >
         <!-- EL API and compiler libs.
              Tomcat 6 has EL 2.1.
@@ -240,17 +261,24 @@
          -->
         <!-- the javax.el API, AND the com.sun.el parser -->
         <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
-        <jar destfile="jettylib/commons-el.jar" >
+        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="mergewithoutmain">
           <!--
             Jetty version
             <zipfileset src="${jetty.base}/lib/jsp/javax.el-3.0.0.jar"/>
            -->
-            <!-- Apache version -->
-            <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar"/>
+
+            <!-- Apache in Jetty package version -->
+          <!--
+            <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-${tomcat.ver}.jar"/>
+           -->
+
+            <!-- Apache package version -->
+            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/el-api.jar"/>
+            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar"/>
         </jar>
 
         <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
-        <jar destfile="jettylib/jasper-runtime.jar" >
+        <jar destfile="jettylib/jasper-runtime.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
           <!--
             Jetty version
             <zipfileset src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar"/>
@@ -261,11 +289,24 @@
             must use Apache (aka libtomcat8).
             <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" />
            -->
-            <!-- Apache version -->
-            <!-- Also includes javax.servlet.jsp.*, this is copied into javax.servlet.jar above -->
-            <zipfileset includes="org/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
+
+            <!-- For both Apache in Jetty package and Apache package versions -->
             <!-- required Jetty initializer (see RouterConsoleRunner) -->
             <zipfileset src="${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.ver}.jar"/>
+
+            <!-- Apache in Jetty package version -->
+            <!-- Also includes javax.servlet.jsp.*, this is copied into javax.servlet.jar above -->
+          <!--
+            <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-${jetty.ver}.jar"/>
+           -->
+
+            <!-- Apache package version -->
+            <!-- we match what was bundled in the Jetty package version -->
+            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar"/>
+            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-api.jar"/>
+            <zipfileset includes="org/apache/juli/logging/**/*" src="${tomcat.bin}/tomcat-juli.jar"/>
+            <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"/>
+            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-util-scan.jar"/>
         </jar>
 
         <jar destfile="jettylib/commons-logging.jar" update="true" >

build.xml

@@ -1297,9 +1297,7 @@
     </target>
 
     <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
-<!--  replacement?
-        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
--->
+        <copy file="apps/jetty/apache-tomcat-8.5.23/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
     </target>
 
     <!-- DOES include launch4j licenses for Windows builds -->
@@ -2267,6 +2265,8 @@
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
             <!-- libjetty9-java -->
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
+            <!-- libtomcat8-java -->
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
             <!-- libjstl1.1-java or glassfish-javaee -->
           <!--
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
@@ -2284,6 +2284,7 @@
                 <exclude name="installer/resources/geoip.txt"/>
                 <exclude name="installer/resources/geoipv6.dat.gz"/>
                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
+                <exclude name="apps/jetty/apache-tomcat-*/**"/>
           <!--
                 <exclude name="apps/susidns/src/lib/jstl.jar" />
            -->
@@ -2341,6 +2342,7 @@
             <!-- libjetty9-java -->
           <!--
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
            -->
             <!-- libjstl1.1-java or glassfish-javaee -->
           <!--
@@ -2360,6 +2362,7 @@
                 <exclude name="installer/resources/geoipv6.dat.gz"/>
           <!--
                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
+                <exclude name="apps/jetty/apache-tomcat-*/**"/>
            -->
           <!--
                 <exclude name="apps/susidns/src/lib/jstl.jar" />
@@ -2409,6 +2412,7 @@
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
           <!--
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
            -->
@@ -2424,6 +2428,7 @@
                 <exclude name="installer/resources/geoip.txt"/>
                 <exclude name="installer/resources/geoipv6.dat.gz"/>
                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
+                <exclude name="apps/jetty/apache-tomcat-*/**"/>
           <!--
                 <exclude name="apps/susidns/src/lib/jstl.jar" />
            -->

history.txt

@@ -1,6 +1,7 @@
 2017-11-22 zzz
  * Streaming: Fix bug causing loopback hangs and
    preventing desired ack behavior (ticket #1939)
+ * Tomcat 8.5.23
 
 2017-11-21 zzz
  * EepGet: Refuse attempted redirect to HTTPS, won't work

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

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 7;
+    public final static long BUILD = 8;
 
     /** for example "-test" */
     public final static String EXTRA = "";