From aada28b15b4a256c3f9c5f64cfa508b4a0f51f56 Mon Sep 17 00:00:00 2001
From: rcyarrapothu <chaitanya.yarrapothu@synacor.com>
Date: Wed, 2 Feb 2022 08:57:57 -0600
Subject: [PATCH] ZBUG-1932: Upgrading owasp-java-html-sanitizer version

---
 ivy.xml        | 4 ++--
 pkg-builder.pl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index d095aae..8fa3923 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -153,8 +153,8 @@
     <dependency org="javax.annotation" name="javax.annotation-api" rev="1.2"/>
     <dependency org="org.apache.xmlgraphics" name="batik-css" rev="1.7"/>
     <dependency org="org.w3c.css" name="sac" rev="1.3"/>
-    <dependency org="org.apache.xmlgraphics" name="batik-i18n" rev="1.9"/>
-    <dependency org="org.apache.xmlgraphics" name="batik-util" rev="1.8"/>
+    <dependency org="org.apache.xmlgraphics" name="batik-i18n" rev="1.14"/>
+    <dependency org="org.apache.xmlgraphics" name="batik-util" rev="1.14"/>
     <dependency org="org.apache.tika" name="tika-app" rev="1.24.1"/>
     <dependency org="org.apache.tika" name="tika-parsers" rev="1.24.1"/>
     <dependency org="org.apache.pdfbox" name="pdfbox" rev="2.0.24"/>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index f6aa783..9e4ea18 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -293,7 +293,7 @@ ($)
        cpy_file("build/dist/ant-1.7.0-ziputil-patched.jar",                         "$stage_base_dir/opt/zimbra/jetty_base/common/lib/ant-1.7.0-ziputil-patched.jar");
        cpy_file("build/dist/ical4j-0.9.16-patched.jar",                             "$stage_base_dir/opt/zimbra/jetty_base/common/lib/ical4j-0.9.16-patched.jar");
        cpy_file("build/dist/nekohtml-1.9.13.1z.jar",                                "$stage_base_dir/opt/zimbra/jetty_base/common/lib/nekohtml-1.9.13.1z.jar");
-       cpy_file("build/dist/owasp-java-html-sanitizer-20190610.3z.jar",             "$stage_base_dir/opt/zimbra/jetty_base/common/lib/owasp-java-html-sanitizer-20190610.3z.jar");
+       cpy_file("build/dist/owasp-java-html-sanitizer-20190610.4z.jar",             "$stage_base_dir/opt/zimbra/jetty_base/common/lib/owasp-java-html-sanitizer-20190610.4z.jar");
        cpy_file("build/dist/zmzimbratozimbramig-8.7.jar",                           "$stage_base_dir/opt/zimbra/lib/jars/zmzimbratozimbramig.jar");
        cpy_file("build/dist/jcharset-2.0.jar",                                      "$stage_base_dir/opt/zimbra/jetty_base/common/endorsed/jcharset.jar");
        cpy_file("build/dist/java-semver-0.9.0.jar",                                 "$stage_base_dir/opt/zimbra/jetty_base/common/lib/java-semver-0.9.0.jar");