Jetty 9.2.24-v201801015, Tomcat 8.5.30

apps/jetty/apache-tomcat-8.5.30/NOTICE

@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2017 The Apache Software Foundation
+Copyright 1999-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

apps/jetty/build.xml

@@ -17,9 +17,9 @@
     <!--       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.ver" value="9.2.24.v20180105" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="7f0b10d69b214337622e3c0565f94417828ba13e" />
+    <property name="jetty.sha1" value="a8af3941385d43eece329b09ae4a261e0cb3579c" />
     <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}" />
@@ -28,7 +28,7 @@
     <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" />
+    <property name="tomcat.ver" value="8.5.30" />
     <!-- 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" />
@@ -302,10 +302,11 @@
 
             <!-- Apache package version -->
             <!-- we match what was bundled in the Jetty package version -->
+            <!-- except we need compat/ as of 8.5.29 or JspC fails in the jar scan -->
             <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 org/apache/tomcat/util/codec/ 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>