* Jetty 8.1.15.v20140411

* Tomcat 6.0.41

LICENSE.txt

@@ -182,7 +182,7 @@ Applications:
    By welterde.
    See licenses/LICENSE-GPLv2.txt
 
-   Jetty 8.1.14.v20131031:
+   Jetty 8.1.15.v20140411:
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
    See licenses/LICENSE-Apache2.0.txt
@@ -248,8 +248,8 @@ Applications:
       Bundles systray4j-2.4.1:
       See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 6.0.37:
-   Copyright 1999-2013 The Apache Software Foundation
+   Tomcat 6.0.41:
+   Copyright 1999-2014 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 

apps/jetty/apache-tomcat-deployer/NOTICE

@@ -1,7 +1,7 @@
 Apache Tomcat
-Copyright 1999-2013 The Apache Software Foundation
+Copyright 1999-2014 The Apache Software Foundation
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 The Windows Installer is built with the Nullsoft
@@ -14,3 +14,9 @@ Java compilation software for JSP pages is provided by Eclipse,
 which is open source software.  The original software and 
 related information is available at
 http://www.eclipse.org.
+
+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
+may be obtained from http://java.sun.com/xml/ns/javaee/

apps/jetty/apache-tomcat-deployer/README-i2p.txt

@@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
 The Glassfish JSP 2.1 bundled in Jetty 6 is way too old.
 
 Retrieved from the file
-	apache-tomcat-6.0.37-deployer.tar.gz
+	apache-tomcat-6.0.41-deployer.tar.gz
 
 minus the following files and directores:
 

apps/jetty/build.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="jetty">
 
-    <property name="jetty.ver" value="8.1.14.v20131031" />
+    <property name="jetty.ver" value="8.1.15.v20140411" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="a6690261a822157c82fcc6327d05ac8c7dfed0a3" />
+    <property name="jetty.sha1" value="41ec2b5e5605c038fb28d1f118669f06b4479e71" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
     <property name="jetty.url" value="http://download.eclipse.org/jetty/${jetty.ver}/dist/${jetty.filename}" />
     <property name="verified.filename" value="verified.txt" />

history.txt

@@ -1,3 +1,11 @@
+2014-06-09 zzz
+ * i2psnark:
+   - Show client version if available
+   - Linkify all announce URLs on details page
+   - Sanitize announce URLs
+ * Jetty 8.1.15.v20140411
+ * Tomcat 6.0.41
+
 2014-06-07 zzz
  * Console: Fix NPE in summary bar
  * Eepsite: Updated French help page (thx hummingbird)

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