diff --git a/LICENSE.txt b/LICENSE.txt index 89561a7cf6..e512039185 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -318,9 +318,9 @@ Applications: Systray (systray.jar): Public domain. - Tomcat 8.5.34 (jasper-runtime.jar): + Tomcat 8.5.38 (jasper-runtime.jar): (not included in most distribution packages) - Copyright 1999-2018 The Apache Software Foundation + Copyright 1999-2019 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt See licenses/NOTICE-Tomcat.txt diff --git a/apps/jetty/apache-tomcat-8.5.34/NOTICE b/apps/jetty/apache-tomcat-8.5.38/NOTICE similarity index 97% rename from apps/jetty/apache-tomcat-8.5.34/NOTICE rename to apps/jetty/apache-tomcat-8.5.38/NOTICE index d99a4bfc0e..5c82767568 100644 --- a/apps/jetty/apache-tomcat-8.5.34/NOTICE +++ b/apps/jetty/apache-tomcat-8.5.38/NOTICE @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2018 The Apache Software Foundation +Copyright 1999-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/apps/jetty/apache-tomcat-8.5.34/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-8.5.38/bin/tomcat-juli.jar similarity index 89% rename from apps/jetty/apache-tomcat-8.5.34/bin/tomcat-juli.jar rename to apps/jetty/apache-tomcat-8.5.38/bin/tomcat-juli.jar index d04d917e73..358145d5b1 100644 Binary files a/apps/jetty/apache-tomcat-8.5.34/bin/tomcat-juli.jar and b/apps/jetty/apache-tomcat-8.5.38/bin/tomcat-juli.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.34/lib/el-api.jar b/apps/jetty/apache-tomcat-8.5.38/lib/el-api.jar similarity index 82% rename from apps/jetty/apache-tomcat-8.5.34/lib/el-api.jar rename to apps/jetty/apache-tomcat-8.5.38/lib/el-api.jar index cf1a45ec1e..19331ad0ab 100644 Binary files a/apps/jetty/apache-tomcat-8.5.34/lib/el-api.jar and b/apps/jetty/apache-tomcat-8.5.38/lib/el-api.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.34/lib/jasper-el.jar b/apps/jetty/apache-tomcat-8.5.38/lib/jasper-el.jar similarity index 90% rename from apps/jetty/apache-tomcat-8.5.34/lib/jasper-el.jar rename to apps/jetty/apache-tomcat-8.5.38/lib/jasper-el.jar index 6f9fb958c6..9aa899a6d0 100644 Binary files a/apps/jetty/apache-tomcat-8.5.34/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-8.5.38/lib/jasper-el.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.34/lib/jasper.jar b/apps/jetty/apache-tomcat-8.5.38/lib/jasper.jar similarity index 80% rename from apps/jetty/apache-tomcat-8.5.34/lib/jasper.jar rename to apps/jetty/apache-tomcat-8.5.38/lib/jasper.jar index 0eefc1f291..8b7eb05e33 100644 Binary files a/apps/jetty/apache-tomcat-8.5.34/lib/jasper.jar and b/apps/jetty/apache-tomcat-8.5.38/lib/jasper.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.34/lib/jsp-api.jar b/apps/jetty/apache-tomcat-8.5.38/lib/jsp-api.jar similarity index 85% rename from apps/jetty/apache-tomcat-8.5.34/lib/jsp-api.jar rename to apps/jetty/apache-tomcat-8.5.38/lib/jsp-api.jar index c4ac4c5247..67735e5d45 100644 Binary files a/apps/jetty/apache-tomcat-8.5.34/lib/jsp-api.jar and b/apps/jetty/apache-tomcat-8.5.38/lib/jsp-api.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.34/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-api.jar similarity index 73% rename from apps/jetty/apache-tomcat-8.5.34/lib/tomcat-api.jar rename to apps/jetty/apache-tomcat-8.5.38/lib/tomcat-api.jar index e4f98a1bb5..afd9b7378a 100644 Binary files a/apps/jetty/apache-tomcat-8.5.34/lib/tomcat-api.jar and b/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-api.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.34/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util-scan.jar similarity index 73% rename from apps/jetty/apache-tomcat-8.5.34/lib/tomcat-util-scan.jar rename to apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util-scan.jar index 900995358f..904820c785 100644 Binary files a/apps/jetty/apache-tomcat-8.5.34/lib/tomcat-util-scan.jar and b/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util-scan.jar differ diff --git a/apps/jetty/apache-tomcat-8.5.34/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util.jar similarity index 87% rename from apps/jetty/apache-tomcat-8.5.34/lib/tomcat-util.jar rename to apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util.jar index 8d643e41ad..b4166d658c 100644 Binary files a/apps/jetty/apache-tomcat-8.5.34/lib/tomcat-util.jar and b/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util.jar differ diff --git a/build.xml b/build.xml index e87c54adf0..26179d59b3 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ - +