diff --git a/LICENSE.txt b/LICENSE.txt index fe5b52bd78..c1d2ecff40 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -327,7 +327,7 @@ Applications: Systray (systray.jar): Public domain. - Tomcat 8.5.40 (jasper-runtime.jar): + Tomcat 8.5.46 (jasper-runtime.jar): (not included in most distribution packages) Copyright 1999-2019 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt diff --git a/apps/jetty/apache-tomcat-8.5.40/NOTICE b/apps/jetty/apache-tomcat-8.5.46/NOTICE similarity index 100% rename from apps/jetty/apache-tomcat-8.5.40/NOTICE rename to apps/jetty/apache-tomcat-8.5.46/NOTICE diff --git a/apps/jetty/apache-tomcat-8.5.40/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-8.5.46/bin/tomcat-juli.jar similarity index 61% rename from apps/jetty/apache-tomcat-8.5.40/bin/tomcat-juli.jar rename to apps/jetty/apache-tomcat-8.5.46/bin/tomcat-juli.jar index bbcc10b23a..13c458dd9e 100644 Binary files a/apps/jetty/apache-tomcat-8.5.40/bin/tomcat-juli.jar and b/apps/jetty/apache-tomcat-8.5.46/bin/tomcat-juli.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.40/lib/el-api.jar b/apps/jetty/apache-tomcat-8.5.46/lib/el-api.jar similarity index 76% rename from apps/jetty/apache-tomcat-8.5.40/lib/el-api.jar rename to apps/jetty/apache-tomcat-8.5.46/lib/el-api.jar index ac2d205290..ff94cd5f5b 100644 Binary files a/apps/jetty/apache-tomcat-8.5.40/lib/el-api.jar and b/apps/jetty/apache-tomcat-8.5.46/lib/el-api.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.40/lib/jasper-el.jar b/apps/jetty/apache-tomcat-8.5.46/lib/jasper-el.jar similarity index 89% rename from apps/jetty/apache-tomcat-8.5.40/lib/jasper-el.jar rename to apps/jetty/apache-tomcat-8.5.46/lib/jasper-el.jar index a1c7e62aa0..ca374ce11b 100644 Binary files a/apps/jetty/apache-tomcat-8.5.40/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-8.5.46/lib/jasper-el.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.40/lib/jasper.jar b/apps/jetty/apache-tomcat-8.5.46/lib/jasper.jar similarity index 68% rename from apps/jetty/apache-tomcat-8.5.40/lib/jasper.jar rename to apps/jetty/apache-tomcat-8.5.46/lib/jasper.jar index e05c241ca3..596d2a6de4 100644 Binary files a/apps/jetty/apache-tomcat-8.5.40/lib/jasper.jar and b/apps/jetty/apache-tomcat-8.5.46/lib/jasper.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.40/lib/jsp-api.jar b/apps/jetty/apache-tomcat-8.5.46/lib/jsp-api.jar similarity index 85% rename from apps/jetty/apache-tomcat-8.5.40/lib/jsp-api.jar rename to apps/jetty/apache-tomcat-8.5.46/lib/jsp-api.jar index 4d0a2f0ea5..046bd308cc 100644 Binary files a/apps/jetty/apache-tomcat-8.5.40/lib/jsp-api.jar and b/apps/jetty/apache-tomcat-8.5.46/lib/jsp-api.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-api.jar similarity index 77% rename from apps/jetty/apache-tomcat-8.5.40/lib/tomcat-api.jar rename to apps/jetty/apache-tomcat-8.5.46/lib/tomcat-api.jar index a34faeef73..d5dfe9842f 100644 Binary files a/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-api.jar and b/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-api.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util-scan.jar similarity index 68% rename from apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util-scan.jar rename to apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util-scan.jar index d1476d72a8..c80f5fd634 100644 Binary files a/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util-scan.jar and b/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util-scan.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util.jar similarity index 74% rename from apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util.jar rename to apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util.jar index 58b8f33fe9..bc1090fdc0 100644 Binary files a/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util.jar and b/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util.jar differ diff --git a/build.xml b/build.xml index 69f3b7a099..a40fdb76a0 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ - +