From 8415fae62aec07914027f01f72d7486111a0d1bf Mon Sep 17 00:00:00 2001
From: zimsuchitgupta <suchit.gupta@synacor.com>
Date: Tue, 22 Mar 2022 11:29:28 +0530
Subject: [PATCH] ZCS-11112: updated the versions for slf4j and apache mina

---
 ivy.xml        | 6 +++---
 pkg-builder.pl | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index ef031f6..1284bed 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -82,7 +82,7 @@
     <dependency org="org.apache.lucene" name="lucene-analyzers" rev="3.5.0"/>
     <dependency org="org.apache.lucene" name="lucene-core" rev="3.5.0"/>
     <dependency org="org.apache.lucene" name="lucene-smartcn" rev="3.5.0"/>
-    <dependency org="org.apache.mina" name="mina-core" rev="2.0.4"/>
+    <dependency org="org.apache.mina" name="mina-core" rev="2.1.6"/>
     <dependency org="org.apache.neethi" name="neethi" rev="3.0.2"/>
     <dependency org="org.apache.ws.xmlschema" name="xmlschema-core" rev="2.0.3"/>
     <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.5"/>
@@ -119,8 +119,8 @@
     <dependency org="org.mariadb.jdbc" name="mariadb-java-client" rev="2.4.3"/>
     <dependency org="org.python" name="jython-standalone" rev="2.5.2"/>
     <dependency org="org.scijava" name="native-lib-loader" rev="2.3.5"/>
-    <dependency org="org.slf4j" name="slf4j-api" rev="1.7.30"/>
-    <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.30"/>
+    <dependency org="org.slf4j" name="slf4j-api" rev="1.7.36"/>
+    <dependency org="org.slf4j" name="slf4j-simple" rev="1.7.36"/>
     <dependency org="org.springframework" name="spring-aop" rev="5.1.10.RELEASE"/>
     <dependency org="org.springframework" name="spring-beans" rev="5.1.10.RELEASE"/>
     <dependency org="org.springframework" name="spring-context" rev="5.1.10.RELEASE"/>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index 3d54299..ac8396c 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -186,7 +186,7 @@ ($)
         cpy_file("build/dist/lucene-smartcn-3.5.0.jar",                             "$stage_base_dir/opt/zimbra/lib/jars/lucene-smartcn-3.5.0.jar");
         cpy_file("build/dist/mail-1.4.7.jar",                                       "$stage_base_dir/opt/zimbra/lib/jars/mail-1.4.7.jar");
         cpy_file("build/dist/mariadb-java-client-2.4.3.jar",                        "$stage_base_dir/opt/zimbra/lib/jars/mariadb-java-client-2.4.3.jar");
-        cpy_file("build/dist/mina-core-2.0.4.jar",                                  "$stage_base_dir/opt/zimbra/lib/jars/mina-core-2.0.4.jar");
+        cpy_file("build/dist/mina-core-2.1.6.jar",                                  "$stage_base_dir/opt/zimbra/lib/jars/mina-core-2.1.6.jar");
         cpy_file("build/dist/neethi-3.0.2.jar",                                     "$stage_base_dir/opt/zimbra/lib/jars/neethi-3.0.2.jar");
         cpy_file("build/dist/nekohtml-1.9.13.1z.jar",                               "$stage_base_dir/opt/zimbra/lib/jars/nekohtml-1.9.13.1z.jar");
         cpy_file("build/dist/oauth-20100527.jar",                                   "$stage_base_dir/opt/zimbra/lib/jars/oauth-20100527.jar");
@@ -196,8 +196,8 @@ ($)
         cpy_file("build/dist/batik-util-1.14.jar",                                  "$stage_base_dir/opt/zimbra/lib/jars/batik-util-1.14.jar");
         cpy_file("build/dist/sac-1.3.jar",                                          "$stage_base_dir/opt/zimbra/lib/jars/sac-1.3.jar");
         cpy_file("build/dist/policy-2.3.jar",                                       "$stage_base_dir/opt/zimbra/lib/jars/policy-2.3.jar");
-        cpy_file("build/dist/slf4j-api-1.7.30.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/slf4j-api-1.7.30.jar");
-        cpy_file("build/dist/slf4j-log4j12-1.7.30.jar",                             "$stage_base_dir/opt/zimbra/lib/jars/slf4j-log4j12-1.7.30.jar");
+        cpy_file("build/dist/slf4j-api-1.7.36.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/slf4j-api-1.7.36.jar");
+        cpy_file("build/dist/slf4j-simple-1.7.36.jar",                             "$stage_base_dir/opt/zimbra/lib/jars/slf4j-simple-1.7.36.jar");
         cpy_file("build/dist/spring-aop-5.1.10.RELEASE.jar",                        "$stage_base_dir/opt/zimbra/lib/jars/spring-aop-5.1.10.RELEASE.jar");
         cpy_file("build/dist/spring-beans-5.1.10.RELEASE.jar",                      "$stage_base_dir/opt/zimbra/lib/jars/spring-beans-5.1.10.RELEASE.jar");
         cpy_file("build/dist/spring-context-5.1.10.RELEASE.jar",                    "$stage_base_dir/opt/zimbra/lib/jars/spring-context-5.1.10.RELEASE.jar");
@@ -263,7 +263,7 @@ ($)
        cpy_file("build/dist/sshd-common-2.6.1.jar",                                 "$stage_base_dir/opt/zimbra/jetty_base/common/lib/sshd-common-2.6.1.jar");
        cpy_file("build/dist/sshd-core-2.6.1.jar",                                   "$stage_base_dir/opt/zimbra/jetty_base/common/lib/sshd-core-2.6.1.jar");
        cpy_file("build/dist/eddsa-0.3.0.jar",                                       "$stage_base_dir/opt/zimbra/jetty_base/common/lib/eddsa-0.3.0.jar");
-       cpy_file("build/dist/slf4j-api-1.7.30.jar",                                  "$stage_base_dir/opt/zimbra/jetty_base/common/lib/slf4j-api-1.7.30.jar");
+       cpy_file("build/dist/slf4j-api-1.7.36.jar",                                  "$stage_base_dir/opt/zimbra/jetty_base/common/lib/slf4j-api-1.7.36.jar");
        cpy_file("build/dist/guava-28.1-jre.jar",                                    "$stage_base_dir/opt/zimbra/jetty_base/common/lib/guava-28.1-jre.jar");
        cpy_file("build/dist/httpasyncclient-4.1.4.jar",                             "$stage_base_dir/opt/zimbra/jetty_base/common/lib/httpasyncclient-4.1.4.jar");
        cpy_file("build/dist/httpclient-4.5.8.jar",                                  "$stage_base_dir/opt/zimbra/jetty_base/common/lib/httpclient-4.5.8.jar");