diff --git a/LICENSE.txt b/LICENSE.txt index 62c9612af..c22677c95 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 8a4c0e2c9..000000000 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 ab40227e9..000000000 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 8c28b4f5f..000000000 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 74b54eb58..000000000 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 4310764f0..000000000 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 116d94edc..000000000 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 ddcda3475..000000000 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 4b87fe251..000000000 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 74fd3c458..dc7f59d9b 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 000000000..2823255c8 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 000000000..875415759 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 000000000..bf5b89eb6 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 000000000..2964e6426 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 000000000..6d395c486 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 e2e0a2dfb..5a5ca18c8 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 000000000..fbdcf395f 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 000000000..d2d7b96b7 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 000000000..74fa706e8 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 3458e5f81..bb94e1070 100644 --- a/build.xml +++ b/build.xml @@ -15,7 +15,7 @@ and versions in gradle.properties and apps/jetty/build.gradle --> - +