Jetty 9.2.25.v20180606

i2p · Aug 20, 2018 · 68feb08 · 68feb08
1 parent f4cab09
commit 68feb08
Show file tree

Hide file tree

Showing 22 changed files with 8 additions and 4 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -233,7 +233,7 @@ Applications:
      Zxing 3.3.0:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 9.2.24.v20180105 (jetty-*.jar, org.mortbay.*.jar):
+   Jetty 9.2.25.v20180606 (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

diff --git a/apps/jetty/build.xml b/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="a8af3941385d43eece329b09ae4a261e0cb3579c" />
+    <property name="jetty.sha1" value="086212b8536faa9a584777ebd59618fa4d7176a0" />
     <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}" />

diff --git a/...pse.jetty.apache-jsp-9.2.24.v20180105.jar → ...pse.jetty.apache-jsp-9.2.25.v20180606.jar b/...pse.jetty.apache-jsp-9.2.24.v20180105.jar → ...pse.jetty.apache-jsp-9.2.25.v20180606.jar
diff --git a/...b/jetty-continuation-9.2.24.v20180105.jar → ...b/jetty-continuation-9.2.25.v20180606.jar b/...b/jetty-continuation-9.2.24.v20180105.jar → ...b/jetty-continuation-9.2.25.v20180606.jar
diff --git a/...105/lib/jetty-deploy-9.2.24.v20180105.jar → ...606/lib/jetty-deploy-9.2.25.v20180606.jar b/...105/lib/jetty-deploy-9.2.24.v20180105.jar → ...606/lib/jetty-deploy-9.2.25.v20180606.jar
diff --git a/...80105/lib/jetty-http-9.2.24.v20180105.jar → ...80606/lib/jetty-http-9.2.25.v20180606.jar b/...80105/lib/jetty-http-9.2.24.v20180105.jar → ...80606/lib/jetty-http-9.2.25.v20180606.jar
diff --git a/...0180105/lib/jetty-io-9.2.24.v20180105.jar → ...0180606/lib/jetty-io-9.2.25.v20180606.jar b/...0180105/lib/jetty-io-9.2.24.v20180105.jar → ...0180606/lib/jetty-io-9.2.25.v20180606.jar
diff --git a/...180105/lib/jetty-jmx-9.2.24.v20180105.jar → ...180606/lib/jetty-jmx-9.2.25.v20180606.jar b/...180105/lib/jetty-jmx-9.2.24.v20180105.jar → ...180606/lib/jetty-jmx-9.2.25.v20180606.jar
diff --git a/...05/lib/jetty-rewrite-9.2.24.v20180105.jar → ...06/lib/jetty-rewrite-9.2.25.v20180606.jar b/...05/lib/jetty-rewrite-9.2.24.v20180105.jar → ...06/lib/jetty-rewrite-9.2.25.v20180606.jar
diff --git a/....2.24.v20180105/lib/jetty-schemas-3.1.jar → ....2.25.v20180606/lib/jetty-schemas-3.1.jar b/....2.24.v20180105/lib/jetty-schemas-3.1.jar → ....2.25.v20180606/lib/jetty-schemas-3.1.jar
diff --git a/...5/lib/jetty-security-9.2.24.v20180105.jar → ...6/lib/jetty-security-9.2.25.v20180606.jar b/...5/lib/jetty-security-9.2.24.v20180105.jar → ...6/lib/jetty-security-9.2.25.v20180606.jar
diff --git a/...105/lib/jetty-server-9.2.24.v20180105.jar → ...606/lib/jetty-server-9.2.25.v20180606.jar b/...105/lib/jetty-server-9.2.24.v20180105.jar → ...606/lib/jetty-server-9.2.25.v20180606.jar
diff --git a/...05/lib/jetty-servlet-9.2.24.v20180105.jar → ...06/lib/jetty-servlet-9.2.25.v20180606.jar b/...05/lib/jetty-servlet-9.2.24.v20180105.jar → ...06/lib/jetty-servlet-9.2.25.v20180606.jar
diff --git a/...5/lib/jetty-servlets-9.2.24.v20180105.jar → ...6/lib/jetty-servlets-9.2.25.v20180606.jar b/...5/lib/jetty-servlets-9.2.24.v20180105.jar → ...6/lib/jetty-servlets-9.2.25.v20180606.jar
diff --git a/...80105/lib/jetty-util-9.2.24.v20180105.jar → ...80606/lib/jetty-util-9.2.25.v20180606.jar b/...80105/lib/jetty-util-9.2.24.v20180105.jar → ...80606/lib/jetty-util-9.2.25.v20180606.jar
diff --git a/...105/lib/jetty-webapp-9.2.24.v20180105.jar → ...606/lib/jetty-webapp-9.2.25.v20180606.jar b/...105/lib/jetty-webapp-9.2.24.v20180105.jar → ...606/lib/jetty-webapp-9.2.25.v20180606.jar
diff --git a/...180105/lib/jetty-xml-9.2.24.v20180105.jar → ...180606/lib/jetty-xml-9.2.25.v20180606.jar b/...180105/lib/jetty-xml-9.2.24.v20180105.jar → ...180606/lib/jetty-xml-9.2.25.v20180606.jar
diff --git a/...-9.2.24.v20180105/lib/servlet-api-3.1.jar → ...-9.2.25.v20180606/lib/servlet-api-3.1.jar b/...-9.2.24.v20180105/lib/servlet-api-3.1.jar → ...-9.2.25.v20180606/lib/servlet-api-3.1.jar
diff --git a/...y-distribution-9.2.24.v20180105/start.jar → ...y-distribution-9.2.25.v20180606/start.jar b/...y-distribution-9.2.24.v20180105/start.jar → ...y-distribution-9.2.25.v20180606/start.jar
diff --git a/build.xml b/build.xml
@@ -8,7 +8,7 @@
     <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.24.v20180105" />
+    <property name="jetty.ver" value="9.2.25.v20180606" />
     <property name="tomcat.ver" value="8.5.30" />
 
     <!-- You probably don't want to change anything from here down -->

diff --git a/history.txt b/history.txt
@@ -1,5 +1,9 @@
+2018-08-20 zzz
+ * Jetty 9.2.25.v20180606
+
 2018-08-19 zzz
  * NTCP2: Catch bad IV exception
+ * Update translations
 
 2018-08-16 zzz
  * i2ptunnel: Change read timeout defaults now that streaming timeout works

diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/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 = 26;
+    public final static long BUILD = 27;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";