Jetty 9.3.30.v20211001

Remove patched SslConnection.java for Jetty #6072, fix included in this release

LICENSE.txt

@@ -264,7 +264,7 @@ Applications:
      Zxing 3.4.1:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 9.3.29.v20201019 (jetty-*.jar, org.mortbay.*.jar):
+   Jetty 9.3.30.v20211001 (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

apps/jetty/build.xml

@@ -17,7 +17,7 @@
 
     <property name="jetty.branch" value="stable-9" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="acf3118a5cbfb3a6dfe218d3f20ecff09974d921" />
+    <property name="jetty.sha1" value="e9f176730aea36a69c24eeba77dd0880a30492dc" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
     <property name="jetty.url" value="https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />
     <property name="verified.filename" value="verified.txt" />
@@ -169,14 +169,14 @@
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-continuation-${jetty.ver}.jar" tofile="jettylib/jetty-continuation.jar" />
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-deploy-${jetty.ver}.jar" tofile="jettylib/jetty-deploy.jar" />
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-http-${jetty.ver}.jar" tofile="jettylib/jetty-http.jar" />
-<!--
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-io-${jetty.ver}.jar" tofile="jettylib/jetty-io.jar" />
--->
       <!-- comment out above line and uncomment below and the patches section further down if we need patches -->
+<!--
         <jar destfile="jettylib/jetty-io.jar"  manifest="${jetty.base}/lib/jetty-io-${jetty.ver}.jar" filesetmanifest="mergewithoutmain" >
             <zipfileset excludes="**/SslConnection*.class" src="${jetty.base}/lib/jetty-io-${jetty.ver}.jar" />
             <zipfileset src="build/jetty-io-patch.jar" />
         </jar>
+-->
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-jmx-${jetty.ver}.jar" tofile="jettylib/org.mortbay.jmx.jar" />
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-rewrite-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-security-${jetty.ver}.jar" tofile="jettylib/jetty-security.jar" />
@@ -494,6 +494,7 @@
             classpath="" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
+<!--
         <mkdir dir="./build/objPatches2" />
         <javac 
             srcdir="./patches/jetty-io/src/main/java" 
@@ -508,11 +509,14 @@
                 <pathelement location="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" />
             </classpath>
         </javac>
+-->
     </target>
 
     <target name="jarPatches" depends="compilePatches, jarPatchesUpToDate" unless="jarPatches.uptodate" >
         <jar destfile="./build/jetty-util-patch.jar" basedir="./build/objPatches" includes="**/*.class" />
+<!--
         <jar destfile="./build/jetty-io-patch.jar" basedir="./build/objPatches2" includes="**/*.class" />
+-->
     </target>    
 
     <target name="jarPatchesUpToDate" >
@@ -521,7 +525,9 @@
                 <equals arg1="${with-libjetty9-java}" arg2="true" />
                 <uptodate property="jarPatches.uptodate" targetfile="jettylib/jetty-i2p.jar" >
                     <srcfiles dir= "build/objPatches" includes="**/*.class" />
+<!--
                     <srcfiles dir= "build/objPatches2" includes="**/*.class" />
+-->
                 </uptodate>
             </or>
         </condition>

build.xml

@@ -14,7 +14,7 @@
           and checksum in apps/jetty/build.xml
           and versions in gradle.properties and apps/jetty/build.gradle
      -->
-    <property name="jetty.ver" value="9.3.29.v20201019" />
+    <property name="jetty.ver" value="9.3.30.v20211001" />
     <property name="tomcat.ver" value="9.0.45" />
 
     <!-- You probably don't want to change anything from here down -->

history.txt

@@ -1,3 +1,21 @@
+2021-10-10 zzz
+ * Jetty 9.3.30.v20211001
+
+2021-10-05 zzz
+ * NetDB: Reduce ban time for routers without netId
+
+2021-10-03 zzz
+ * Console: Add theme selection to wizard
+
+2021-10-01 zzz
+ * i2ptunnel: Fix enc type configuration logic
+
+2021-09-30 zzz
+ * Console: Add js to /configui to preview themes
+
+2021-09-27 zzz
+ * Router: Rekey all Android/ARM routers
+
 2021-09-25 zzz
  * Tunnels:
    - Implement Bloom filter for short TBM

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

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Git";
     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 = "";