From e57905eb57c970137f1244ee86f5dff635a7db68 Mon Sep 17 00:00:00 2001
From: Swathy Shaji <swathy.shaji@telusinternational.com>
Date: Mon, 1 Apr 2024 19:21:56 +0530
Subject: [PATCH] ZCS-14885: Getting Exception in thread main
 java.lang.NoClassDefFoundError: while running utility zmmboxsearch

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

diff --git a/ivy.xml b/ivy.xml
index 06c9e03..d8e0384 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -177,6 +177,11 @@
     <dependency org="org.apache.james" name="apache-mime4j-core" rev="0.8.7"/>
     <dependency org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
     <dependency org="org.eclipse.parsson" name="jakarta.json" rev="1.1.5"/>
+    <!-- Required this jar in runtime. We are using the same jar since long time.
+    But we didn't encounter any issues. But after integrating some cache things with licensing,
+    we need this jar in the classpath at runtime
+     -->
+    <dependency org="com.google.guava" name="failureaccess" rev="1.0.1"/>
     <exclude org="com.noelios.restlet" module="com.noelios.restlet"/>
     <exclude org="javax.sql" module="jdbc-stdext"/>
     <exclude org="javax.transaction" module="jta"/>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index 6e012a8..f5b0470 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -231,6 +231,7 @@ ($)
         cpy_file("build/dist/apache-jsp-9.4.46.v20220331.jar",                      "$stage_base_dir/opt/zimbra/lib/jars/apache-jsp-9.4.46.v20220331.jar");
         cpy_file("build/dist/UserAgentUtils-1.21.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/UserAgentUtils-1.21.jar");
         cpy_file("build/dist/tika-core-1.24.1.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/tika-core-1.24.1.jar");
+        cpy_file("build/dist/failureaccess-1.0.1.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/failureaccess-1.0.1.jar");
 	cpy_file("build/dist/apache-mime4j-core-0.8.7.jar",                         "$stage_base_dir/opt/zimbra/lib/jars/apache-mime4j-core-0.8.7.jar");
 	cpy_file("build/dist/zmlocalconfig",                                        "$stage_base_dir/opt/zimbra/lib/patches/localconfig/zmlocalconfig");
         return ["."];