diff --git a/LICENSE.txt b/LICENSE.txt index c50be236b1d15fcdcf90eba1b73f764477d0a6e5..1e94e57b2b7320e099d72a3911c5270ae196d878 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -335,9 +335,9 @@ Applications: Systray (systray.jar): Public domain. - Tomcat 9.0.54 (jasper-runtime.jar): + Tomcat 9.0.62 (jasper-runtime.jar): (not included in most distribution packages) - Copyright 1999-2021 The Apache Software Foundation + Copyright 1999-2022 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt See licenses/NOTICE-Tomcat.txt diff --git a/apps/jetty/apache-tomcat-9.0.54/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-9.0.54/bin/tomcat-juli.jar deleted file mode 100644 index 163abbf8e55d8cc33ba28ba9fedd680caf85d470..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.54/bin/tomcat-juli.jar and /dev/null differ diff --git a/apps/jetty/apache-tomcat-9.0.54/lib/el-api.jar b/apps/jetty/apache-tomcat-9.0.54/lib/el-api.jar deleted file mode 100644 index 64c934a91bb958bcc8c88804cbfbb85426ab628f..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.54/lib/el-api.jar and /dev/null differ diff --git a/apps/jetty/apache-tomcat-9.0.54/lib/jasper-el.jar b/apps/jetty/apache-tomcat-9.0.54/lib/jasper-el.jar deleted file mode 100644 index 0f218778ffdbdb8a8609416c45201c586e4ddeee..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.54/lib/jasper-el.jar and /dev/null differ diff --git a/apps/jetty/apache-tomcat-9.0.54/lib/jasper.jar b/apps/jetty/apache-tomcat-9.0.54/lib/jasper.jar deleted file mode 100644 index ba06f1afce586092cf4d2ebc4df5e5f7bc6e7a3a..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.54/lib/jasper.jar and /dev/null differ diff --git a/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util-scan.jar deleted file mode 100644 index 016e32cf45ed5bfabd18322b90529d529767bbc4..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util-scan.jar and /dev/null differ diff --git a/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util.jar deleted file mode 100644 index e9de7463b1432dee10c520c3ef3e85ab657eb8ac..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util.jar and /dev/null differ diff --git a/apps/jetty/apache-tomcat-9.0.54/NOTICE b/apps/jetty/apache-tomcat-9.0.62/NOTICE similarity index 97% rename from apps/jetty/apache-tomcat-9.0.54/NOTICE rename to apps/jetty/apache-tomcat-9.0.62/NOTICE index 43bc6be649023680265d68d6be4c4b1139ece192..74fd3c4580d89bfe0520c21ca95a97dfd26e7f8c 100644 --- a/apps/jetty/apache-tomcat-9.0.54/NOTICE +++ b/apps/jetty/apache-tomcat-9.0.62/NOTICE @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2021 The Apache Software Foundation +Copyright 1999-2022 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-9.0.62/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-9.0.62/bin/tomcat-juli.jar new file mode 100644 index 0000000000000000000000000000000000000000..8a4c0e2c9b6a013d39ffa34b60a48b49c0cc2057 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.62/bin/tomcat-juli.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.62/lib/el-api.jar b/apps/jetty/apache-tomcat-9.0.62/lib/el-api.jar new file mode 100644 index 0000000000000000000000000000000000000000..ab40227e970439f38c13a81a7388efa2cc5f9a99 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.62/lib/el-api.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.62/lib/jasper-el.jar b/apps/jetty/apache-tomcat-9.0.62/lib/jasper-el.jar new file mode 100644 index 0000000000000000000000000000000000000000..8c28b4f5f69db1a29a9b7ed84ee2c9b183e18b7f Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.62/lib/jasper-el.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.62/lib/jasper.jar b/apps/jetty/apache-tomcat-9.0.62/lib/jasper.jar new file mode 100644 index 0000000000000000000000000000000000000000..74b54eb582eef34bb147352f81c93c3c5006d0fb Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.62/lib/jasper.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.54/lib/jsp-api.jar b/apps/jetty/apache-tomcat-9.0.62/lib/jsp-api.jar similarity index 54% rename from apps/jetty/apache-tomcat-9.0.54/lib/jsp-api.jar rename to apps/jetty/apache-tomcat-9.0.62/lib/jsp-api.jar index 2c93bec057a8fbc3c244a780698a1f116eb074ff..4310764f0495dcc1351c354b3f56b5413b3b9a85 100644 Binary files a/apps/jetty/apache-tomcat-9.0.54/lib/jsp-api.jar and b/apps/jetty/apache-tomcat-9.0.62/lib/jsp-api.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.54/lib/servlet-api.jar b/apps/jetty/apache-tomcat-9.0.62/lib/servlet-api.jar similarity index 84% rename from apps/jetty/apache-tomcat-9.0.54/lib/servlet-api.jar rename to apps/jetty/apache-tomcat-9.0.62/lib/servlet-api.jar index 1be9670723eb3907b4858d0d3e31af0feca690b8..e2e0a2dfb9471e8bd4956663a703938a95887ebb 100644 Binary files a/apps/jetty/apache-tomcat-9.0.54/lib/servlet-api.jar and b/apps/jetty/apache-tomcat-9.0.62/lib/servlet-api.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-api.jar similarity index 86% rename from apps/jetty/apache-tomcat-9.0.54/lib/tomcat-api.jar rename to apps/jetty/apache-tomcat-9.0.62/lib/tomcat-api.jar index 2b1bac70dabca73ebb7b61f2a86521426935afeb..116d94edc36d14acc2b66b82605d9e28888f1f49 100644 Binary files a/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-api.jar and b/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-api.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-util-scan.jar new file mode 100644 index 0000000000000000000000000000000000000000..ddcda3475c2df083d2f6e81de17fa8f249608de2 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-util-scan.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-util.jar new file mode 100644 index 0000000000000000000000000000000000000000..4b87fe251cee143c9ed5bda2b9c6b8286de1b50d Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-util.jar differ diff --git a/build.xml b/build.xml index 39e10549fd1c50db49f2de24c010e68535cd9587..06ae6b5144417b27bb4ab9089bd2334d3b06dc6e 100644 --- a/build.xml +++ b/build.xml @@ -15,7 +15,7 @@ and versions in gradle.properties and apps/jetty/build.gradle --> <property name="jetty.ver" value="9.3.30.v20211001" /> - <property name="tomcat.ver" value="9.0.54" /> + <property name="tomcat.ver" value="9.0.62" /> <!-- You probably don't want to change anything from here down --> <target name="help" depends="all" />