From e0934fc430d721ea5ba549fa37822088bf7dc1fd Mon Sep 17 00:00:00 2001
From: UmaShankar Avagadda <umagmrit@gmail.com>
Date: Thu, 12 May 2022 08:54:54 +0000
Subject: [PATCH] ZBUG-2633:Upgraded jetty to 9.4.46.v20220331

---
 ivy.xml        | 22 ++++++++++------------
 pkg-builder.pl |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 31e90a8..6a8c4b8 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -96,18 +96,16 @@
     <dependency org="com.fasterxml.jackson.module" name="jackson-module-jaxb-annotations" rev="2.8.9"/>
     <dependency org="org.codehaus.woodstox" name="stax2-api" rev="3.1.1"/>
     <dependency org="org.codehaus.woodstox" name="woodstox-core-asl" rev="4.2.0"/>
-    <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-http" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-io" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-rewrite" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-security" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-servlets" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-util" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="apache-jsp" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-servlets" rev="9.4.18.v20190429"/>
-    <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.4.18.v20190429"/>
+    <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="9.4.46.v20220331"/>
+    <dependency org="org.eclipse.jetty" name="jetty-http" rev="9.4.46.v20220331"/>
+    <dependency org="org.eclipse.jetty" name="jetty-io" rev="9.4.46.v20220331"/>
+    <dependency org="org.eclipse.jetty" name="jetty-rewrite" rev="9.4.46.v20220331"/>
+    <dependency org="org.eclipse.jetty" name="jetty-security" rev="9.4.46.v20220331"/>
+    <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.46.v20220331"/>
+    <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.4.46.v20220331"/>
+    <dependency org="org.eclipse.jetty" name="jetty-servlets" rev="9.4.46.v20220331"/>
+    <dependency org="org.eclipse.jetty" name="jetty-util" rev="9.4.46.v20220331"/>
+    <dependency org="org.eclipse.jetty" name="apache-jsp" rev="9.4.46.v20220331"/>
     <dependency org="org.ehcache" name="ehcache" rev="3.1.2"/>
     <dependency org="org.freemarker" name="freemarker" rev="2.3.19"/>
     <dependency org="org.glassfish.gmbal" name="gmbal-api-only" rev="2.2.6"/>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index 071e18e..613a64c 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -229,7 +229,7 @@ ($)
         cpy_file("build/dist/istack-commons-runtime-3.0.8.jar",                     "$stage_base_dir/opt/zimbra/lib/jars/istack-commons-runtime-3.0.8.jar");
         cpy_file("build/dist/resolver-20050927.jar",                                "$stage_base_dir/opt/zimbra/lib/jars/resolver-20050927.jar");
         cpy_file("build/dist/javax.annotation-api-1.2.jar",                         "$stage_base_dir/opt/zimbra/lib/jars/javax.annotation-api-1.2.jar");
-        cpy_file("build/dist/apache-jsp-9.4.18.v20190429.jar",                      "$stage_base_dir/opt/zimbra/lib/jars/apache-jsp-9.4.18.v20190429.jar");
+        cpy_file("build/dist/apache-jsp-9.4.46.v20220331.jar",                      "$stage_base_dir/opt/zimbra/lib/jars/9.4.46.v20220331.jar");
         cpy_file("build/dist/UserAgentUtils-1.21.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/UserAgentUtils-1.21.jar");
         return ["."];
 }