From 5958d805a5cfd4b2fd7396527b4710443d7e19ba Mon Sep 17 00:00:00 2001
From: Yogesh Dasi <yogesh.dasi@synacor.com>
Date: Wed, 8 Jun 2022 19:22:45 +0530
Subject: [PATCH] ZCS-11505: update library com.sun.org.apache.xml.internal to
 org.apache.santuario for JDK 17 support

---
 ivy.xml        | 2 +-
 pkg-builder.pl | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ivy.xml b/ivy.xml
index 26eadbc..a0fb017 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -152,7 +152,7 @@
     <dependency org="javax.xml.ws" name="jaxws-api" rev="2.3.1"/>
     <dependency org="com.sun.istack" name="istack-commons-runtime" rev="3.0.8"/>
     <dependency org="com.sun.xml.messaging.saaj" name="saaj-impl" rev="1.5.1"/>
-    <dependency org="com.sun.org.apache.xml.internal" name="resolver" rev="20050927"/>
+    <dependency org="org.apache.santuario" name="xmlsec" rev="3.0.0"/>
     <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"/>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index 0a3a266..06cb4e1 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -245,6 +245,7 @@ ($)
 
        cpy_file("build/dist/bcpkix-jdk15on-1.55.jar",                               "$stage_base_dir/opt/zimbra/jetty_base/common/lib/bcpkix-jdk15on-1.55.jar");
        cpy_file("build/dist/bcmail-jdk15on-1.55.jar",                               "$stage_base_dir/opt/zimbra/lib/ext-common/bcmail-jdk15on-1.55.jar");
+       cpy_file("build/dist/xmlsec-3.0.0.jar",                                      "$stage_base_dir/opt/zimbra/lib/ext-common/xmlsec-3.0.0.jar");
        cpy_file("build/dist/jcharset-2.0.jar",                                      "$stage_base_dir/opt/zimbra/jetty_base/common/endorsed/jcharset.jar");
        cpy_file("build/dist/zimbra-charset.jar",                                    "$stage_base_dir/opt/zimbra/jetty_base/common/endorsed/zimbra-charset.jar");
        cpy_file("build/dist/apache-log4j-extras-1.0.jar",                           "$stage_base_dir/opt/zimbra/jetty_base/common/lib/apache-log4j-extras-1.0.jar");