diff --git a/LICENSE.txt b/LICENSE.txt index 62c9612afb27917bef07a393312d15d17f6545c8..c22677c950e5c171d0759b6efc58e89b3bb6241a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -346,9 +346,9 @@ Applications: Systray (systray.jar): Public domain. - Tomcat 9.0.62 (jasper-runtime.jar): + Tomcat 9.0.88 (jasper-runtime.jar): (not included in most distribution packages) - Copyright 1999-2022 The Apache Software Foundation + Copyright 1999-2024 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt See licenses/NOTICE-Tomcat.txt 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 deleted file mode 100644 index 8a4c0e2c9b6a013d39ffa34b60a48b49c0cc2057..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.62/bin/tomcat-juli.jar and /dev/null 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 deleted file mode 100644 index ab40227e970439f38c13a81a7388efa2cc5f9a99..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.62/lib/el-api.jar and /dev/null 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 deleted file mode 100644 index 8c28b4f5f69db1a29a9b7ed84ee2c9b183e18b7f..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.62/lib/jasper-el.jar and /dev/null 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 deleted file mode 100644 index 74b54eb582eef34bb147352f81c93c3c5006d0fb..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.62/lib/jasper.jar and /dev/null differ diff --git a/apps/jetty/apache-tomcat-9.0.62/lib/jsp-api.jar b/apps/jetty/apache-tomcat-9.0.62/lib/jsp-api.jar deleted file mode 100644 index 4310764f0495dcc1351c354b3f56b5413b3b9a85..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.62/lib/jsp-api.jar and /dev/null differ diff --git a/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-api.jar deleted file mode 100644 index 116d94edc36d14acc2b66b82605d9e28888f1f49..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-api.jar and /dev/null 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 deleted file mode 100644 index ddcda3475c2df083d2f6e81de17fa8f249608de2..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-util-scan.jar and /dev/null 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 deleted file mode 100644 index 4b87fe251cee143c9ed5bda2b9c6b8286de1b50d..0000000000000000000000000000000000000000 Binary files a/apps/jetty/apache-tomcat-9.0.62/lib/tomcat-util.jar and /dev/null differ diff --git a/apps/jetty/apache-tomcat-9.0.62/NOTICE b/apps/jetty/apache-tomcat-9.0.88/NOTICE similarity index 97% rename from apps/jetty/apache-tomcat-9.0.62/NOTICE rename to apps/jetty/apache-tomcat-9.0.88/NOTICE index 74fd3c4580d89bfe0520c21ca95a97dfd26e7f8c..dc7f59d9b79bc34c6e6dff5f468917ccc2997df6 100644 --- a/apps/jetty/apache-tomcat-9.0.62/NOTICE +++ b/apps/jetty/apache-tomcat-9.0.88/NOTICE @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2022 The Apache Software Foundation +Copyright 1999-2024 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.88/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-9.0.88/bin/tomcat-juli.jar new file mode 100644 index 0000000000000000000000000000000000000000..2823255c84842857b583c45169a5f3f8b40906ac Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.88/bin/tomcat-juli.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.88/lib/el-api.jar b/apps/jetty/apache-tomcat-9.0.88/lib/el-api.jar new file mode 100644 index 0000000000000000000000000000000000000000..875415759c97cb8a1feddbf120d242dd4ad8c211 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.88/lib/el-api.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.88/lib/jasper-el.jar b/apps/jetty/apache-tomcat-9.0.88/lib/jasper-el.jar new file mode 100644 index 0000000000000000000000000000000000000000..bf5b89eb6118eab0f96dd42ec6177c80d31cfe79 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.88/lib/jasper-el.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.88/lib/jasper.jar b/apps/jetty/apache-tomcat-9.0.88/lib/jasper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2964e642643130d0f0ed6de3b77f07bfd253d6d1 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.88/lib/jasper.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.88/lib/jsp-api.jar b/apps/jetty/apache-tomcat-9.0.88/lib/jsp-api.jar new file mode 100644 index 0000000000000000000000000000000000000000..6d395c486ebcfc1105d1335f2774dd6605f8bc16 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.88/lib/jsp-api.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.62/lib/servlet-api.jar b/apps/jetty/apache-tomcat-9.0.88/lib/servlet-api.jar similarity index 71% rename from apps/jetty/apache-tomcat-9.0.62/lib/servlet-api.jar rename to apps/jetty/apache-tomcat-9.0.88/lib/servlet-api.jar index e2e0a2dfb9471e8bd4956663a703938a95887ebb..5a5ca18c897875be766cb9508b970c7f0388030a 100644 Binary files a/apps/jetty/apache-tomcat-9.0.62/lib/servlet-api.jar and b/apps/jetty/apache-tomcat-9.0.88/lib/servlet-api.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.88/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-9.0.88/lib/tomcat-api.jar new file mode 100644 index 0000000000000000000000000000000000000000..fbdcf395f9b8d0d94d9d00594f0f9fa406e413c0 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.88/lib/tomcat-api.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.88/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-9.0.88/lib/tomcat-util-scan.jar new file mode 100644 index 0000000000000000000000000000000000000000..d2d7b96b74a789e1143c9936919e9a4b77d189d0 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.88/lib/tomcat-util-scan.jar differ diff --git a/apps/jetty/apache-tomcat-9.0.88/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-9.0.88/lib/tomcat-util.jar new file mode 100644 index 0000000000000000000000000000000000000000..74fa706e89e879ce0c39208d9fe33fa12ecf9919 Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.88/lib/tomcat-util.jar differ diff --git a/build.xml b/build.xml index 3458e5f81e8c66fee88dd76085e1dd0d09fbc8fe..bb94e1070280513e1a7bb31e0ad8ec9732ff4916 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.62" /> + <property name="tomcat.ver" value="9.0.88" /> <!-- You probably don't want to change anything from here down --> <target name="help" depends="all" />