From 26cf5993a4d95daf863e793023681fa729e75575 Mon Sep 17 00:00:00 2001
From: abhishek <abhishekdeshmukh.com@gmail.com>
Date: Sun, 20 Feb 2022 11:14:22 +0530
Subject: [PATCH] ZCS-11112 : Log4j version change to 2.17.1 ZCS-11112: updated
 the versions for slf4j and apache mina

---
 build.xml      |  3 ++-
 ivy.xml        |  9 +++++----
 pkg-builder.pl | 14 ++++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index 11c770a..07495d6 100644
--- a/build.xml
+++ b/build.xml
@@ -35,7 +35,8 @@
       <fileset dir="../antisamy/build/lib" includes="*.jar" />
     </copy>
     <ivy:install organisation="zimbra" module="zm-charset" revision="latest.integration" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
-    <ivy:install organisation="log4j" module="log4j" revision="1.2.16" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
+    <ivy:install organisation="org.apache.logging.log4j" module="log4j-core" revision="2.17.1" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
+    <ivy:install organisation="org.apache.logging.log4j" module="log4j-api" revision="2.17.1" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
     <ivy:install organisation="zimbra"  module="zmzimbratozimbramig" revision="8.7" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
     <delete>
       <fileset dir="${dist.dir}" excludes="*.jar" />
diff --git a/ivy.xml b/ivy.xml
index 938a344..2586caa 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.3.18"/>
     <dependency org="org.springframework" name="spring-beans" rev="5.3.18"/>
     <dependency org="org.springframework" name="spring-context" rev="5.3.18"/>
@@ -177,7 +177,8 @@
     <exclude org="com.noelios.restlet" module="com.noelios.restlet"/>
     <exclude org="javax.sql" module="jdbc-stdext"/>
     <exclude org="javax.transaction" module="jta"/>
-    <exclude org="log4j" module="log4j"/>
+    <exclude org="org.apache.logging.log4j" module="log4j-core"/>
+    <exclude org="org.apache.logging.log4j" module="log4j-api"/>
     <exclude org="maven-plugins" module="maven-cobertura-plugin"/>
     <exclude org="maven-plugins" module="maven-findbugs-plugin"/>
     <exclude org="net.sf.josql" module="gentlyweb-utils"/>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index 25eb7ba..9de412b 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -179,13 +179,14 @@ ($)
         cpy_file("build/dist/jline-0.9.93.jar",                                     "$stage_base_dir/opt/zimbra/lib/jars/jline-0.9.93.jar");
         cpy_file("build/dist/jzlib-1.0.7.jar",                                      "$stage_base_dir/opt/zimbra/lib/jars/jzlib-1.0.7.jar");
         cpy_file("build/dist/libidn-1.24.jar",                                      "$stage_base_dir/opt/zimbra/lib/jars/libidn-1.24.jar");
-        cpy_file("build/dist/log4j-1.2.16.jar",                                     "$stage_base_dir/opt/zimbra/lib/jars/log4j-1.2.16.jar");
+        cpy_file("build/dist/log4j-api-2.17.1.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/log4j-api-2.17.1.jar");
+        cpy_file("build/dist/log4j-core-2.17.1.jar",                                "$stage_base_dir/opt/zimbra/lib/jars/log4j-core-2.17.1.jar");
         cpy_file("build/dist/lucene-analyzers-3.5.0.jar",                           "$stage_base_dir/opt/zimbra/lib/jars/lucene-analyzers-3.5.0.jar");
         cpy_file("build/dist/lucene-core-3.5.0.jar",                                "$stage_base_dir/opt/zimbra/lib/jars/lucene-core-3.5.0.jar");
         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");
@@ -195,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.3.18.jar",                                "$stage_base_dir/opt/zimbra/lib/jars/spring-aop-5.3.18.jar");
         cpy_file("build/dist/spring-beans-5.3.18.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/spring-beans-5.3.18.jar");
         cpy_file("build/dist/spring-context-5.3.18.jar",                            "$stage_base_dir/opt/zimbra/lib/jars/spring-context-5.3.18.jar");
@@ -262,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");
@@ -282,7 +283,8 @@ ($)
        cpy_file("build/dist/junixsocket-rmi-2.3.2.jar",                             "$stage_base_dir/opt/zimbra/jetty_base/common/lib/junixsocket-rmi-2.3.2.jar");
        cpy_file("build/dist/jzlib-1.0.7.jar",                                       "$stage_base_dir/opt/zimbra/jetty_base/common/lib/jzlib-1.0.7.jar");
        cpy_file("build/dist/libidn-1.24.jar",                                       "$stage_base_dir/opt/zimbra/jetty_base/common/lib/libidn-1.24.jar");
-       cpy_file("build/dist/log4j-1.2.16.jar",                                      "$stage_base_dir/opt/zimbra/jetty_base/common/lib/log4j-1.2.16.jar");
+       cpy_file("build/dist/log4j-api-2.17.1.jar",                                  "$stage_base_dir/opt/zimbra/jetty_base/common/lib/log4j-api-2.17.1.jar");
+       cpy_file("build/dist/log4j-core-2.17.1.jar",                                 "$stage_base_dir/opt/zimbra/jetty_base/common/lib/log4j-core-2.17.1.jar");
        cpy_file("build/dist/mail-1.4.7.jar",                                        "$stage_base_dir/opt/zimbra/jetty_base/common/lib/mail-1.4.7.jar");
        cpy_file("build/dist/mariadb-java-client-2.4.3.jar",                         "$stage_base_dir/opt/zimbra/jetty_base/common/lib/mariadb-java-client-2.4.3.jar");
        cpy_file("build/dist/oauth-20100527.jar",                                    "$stage_base_dir/opt/zimbra/jetty_base/common/lib/oauth-20100527.jar");