ZCS-11505: update library com.sun.org.apache.xml.internal to org.apac…

…he.santuario for JDK 17 support
Zimbra · Jun 9, 2022 · 1536368 · 1536368
1 parent 2ac2540
commit 1536368
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ivy.xml b/ivy.xml
@@ -147,7 +147,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
@@ -241,6 +241,7 @@ ($)
 
        cpy_file("build/dist/bcpkix-jdk15on-1.64.jar",                               "$stage_base_dir/opt/zimbra/jetty_base/common/lib/bcpkix-jdk15on-1.64.jar");
        cpy_file("build/dist/bcmail-jdk15on-1.64.jar",                               "$stage_base_dir/opt/zimbra/lib/ext-common/bcmail-jdk15on-1.64.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");