From 92d06225256669d1186929d4187320e637f0093e Mon Sep 17 00:00:00 2001
From: Sundaram Ananthanarayanan <sananthanarayanan@netflix.com>
Date: Mon, 16 Oct 2023 20:42:14 -0700
Subject: [PATCH] Updating the zookeeper version as well as updating locks for
 mantis-shaded

---
 mantis-shaded/build.gradle      | 6 ++++--
 mantis-shaded/dependencies.lock | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mantis-shaded/build.gradle b/mantis-shaded/build.gradle
index 11ca9d993..083df3651 100644
--- a/mantis-shaded/build.gradle
+++ b/mantis-shaded/build.gradle
@@ -29,7 +29,7 @@ ext {
     guavaFailureAccessVersion = '1.0.1'
     guavaVersion = '31.1-jre'
     curatorVersion = '5.1.+'
-    zookeeperVersion = '3.5.7'
+    zookeeperVersion = '3.6.0'
     jlineVersion = '0.9.94'
     nettyVersion = '3.7.0.Final'
 }
@@ -60,7 +60,9 @@ dependencies {
     shaded "org.apache.curator:curator-recipes:$curatorVersion"
     shaded "org.apache.curator:curator-framework:$curatorVersion"
     shaded "org.apache.curator:curator-client:$curatorVersion"
-    shaded "org.apache.zookeeper:zookeeper:$zookeeperVersion"
+    shaded ("org.apache.zookeeper:zookeeper:$zookeeperVersion")  {
+        exclude group: 'log4j', module: 'log4j'
+    }
     shaded "org.apache.zookeeper:zookeeper-jute:$zookeeperVersion"
     shaded "jline:jline:$jlineVersion"
     shaded "io.netty:netty:$nettyVersion"
diff --git a/mantis-shaded/dependencies.lock b/mantis-shaded/dependencies.lock
index 4ca4f890e..ac03ff3e1 100644
--- a/mantis-shaded/dependencies.lock
+++ b/mantis-shaded/dependencies.lock
@@ -74,10 +74,10 @@
             "locked": "5.1.0"
         },
         "org.apache.zookeeper:zookeeper": {
-            "locked": "3.5.7"
+            "locked": "3.6.0"
         },
         "org.apache.zookeeper:zookeeper-jute": {
-            "locked": "3.5.7"
+            "locked": "3.6.0"
         }
     },
     "testAnnotationProcessor": {