Jetty 9.2.29.v20191105, Tomcat 8.5.50

LICENSE.txt

@@ -257,7 +257,7 @@ Applications:
      Zxing 3.3.0:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 9.2.25.v20180606 (jetty-*.jar, org.mortbay.*.jar):
+   Jetty 9.2.29.v20191105 (jetty-*.jar, org.mortbay.*.jar):
    (not included in most distribution packages, except for jetty-i2p.jar)
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
@@ -332,7 +332,7 @@ Applications:
    Systray (systray.jar):
    Public domain.
 
-   Tomcat 8.5.46 (jasper-runtime.jar):
+   Tomcat 8.5.50 (jasper-runtime.jar):
    (not included in most distribution packages)
    Copyright 1999-2019 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt

apps/jetty/build.xml

@@ -18,7 +18,7 @@
     <!-- jetty.branch unused until we go to 9.3 -->
     <property name="jetty.branch" value="stable-9" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="086212b8536faa9a584777ebd59618fa4d7176a0" />
+    <property name="jetty.sha1" value="cc68beca7e11dd6c0067750499d9dea86ee6d2f0" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
     <!-- change jetty.ver to jetty.branch for 9.3 -->
     <property name="jetty.url" value="http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />

build.xml

@@ -8,8 +8,8 @@
     <property file="override.properties"/>
     <property file="build.properties"/>
     <!--  When changing, also change javadoc URL in build.properties, and checksum in apps/jetty/build.xml -->
-    <property name="jetty.ver" value="9.2.25.v20180606" />
-    <property name="tomcat.ver" value="8.5.46" />
+    <property name="jetty.ver" value="9.2.29.v20191105" />
+    <property name="tomcat.ver" value="8.5.50" />
 
     <!-- You probably don't want to change anything from here down -->
     <target name="help" depends="all" />

history.txt

@@ -1,9 +1,53 @@
+2020-01-08 zzz
+ * Jetty 9.2.29.v20191105
+ * Tomcat 8.5.50
+
+2020-01-03 zzz
+ * Console:
+   - Don't refresh bw graph unless enclosing sidebar refresh\is longer
+   - Remove scroll-in-scroll for wrapper logs
+   - Refactor the configstats js
+ * i2psnark:
+   - CSS tweaks so the refresh isn't as glitchy
+   - Reduce default refresh to 15 sec
+ * Tests: Drop empty unit test files
+
 2020-01-02 idk
  * Dark Theme: Colors, borders, icons were simplified across the board
  * Images: Checked in icons from Feather icons, which are under the MIT License
   - https://github.com/feathericons/feather/blob/master/LICENSE
 
+2020-01-02 zzz
+ * Util:
+   - Add https redirect support to EepGet and SSLEepGet
+   - Add https support to EepGet CLI
+
+2019-12-25 zzz
+ * Console, webapps: CSP improvements
+ * Console: Remove onload and use nonce for inline scripts where able
+
+2019-12-24 zzz
+ * Console: Don't show a temporary IP ban if it's permanently banned also
+ * i2ptunnel: Double default conn. and POST limits
+
+2019-12-21 zzz
+ * Console:
+   - Don't show 'Unresolved TCP address' error
+   - Fix displayed name when installing new plugin
+ * i2psnark: Fix autostart for torrent files copied into the dir
+
+2019-12-20 zzz
+ * I2CP: Don't throw exception on early internalConnect()
+ * SSU:
+   - Reduce log level on packet size error (ticket #2675)
+   - Move statement affecting debug stats (ticket #2676)
+
+2019-12-18 zzz
+ * Proxy: Clean up links in error pages
+ * Router: Prep for a new router bundle
+
 2019-12-17 zzz
+ * Util: Move some from console to new core bundle
  * NetDB: Fixes for hidden routers losing peers (ticket #2673)
 
 2019-12-16 zzz

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 = 3;
+    public final static long BUILD = 4;
 
     /** for example "-test" */
     public final static String EXTRA = "";