[FSTORE-1273][APPEND] remove zookeeper dependency (#1501)

* [FSTORE-1273] Get Kafka brokers using admin client (#1726) * [FSTORE-1273][APPEND] remove zookeeper dependency (#1727) * init * remove zookeeper dependency * suppression * undo suppress * fix suppress
logicalclocks · Mar 5, 2024 · 21f3c2c · 21f3c2c
1 parent fad2305
commit 21f3c2c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 57 deletions.
diff --git a/LICENSE_OF_DEPENDENCIES.md b/LICENSE_OF_DEPENDENCIES.md
@@ -106,7 +106,6 @@ Backend Dependencies
 * org.apache.kafka:kafka-clients:jar:3.4.0 [ApacheV2](https://github.com/apache/kafka/blob/trunk/LICENSE)
 * org.apache.thrift:libfb303:jar:0.9.3 [ApacheV2](https://github.com/apache/thrift/blob/master/LICENSE)
 * org.apache.thrift:libthrift:jar:0.9.3 [ApacheV2](https://github.com/apache/thrift/blob/master/LICENSE)
-* org.apache.zookeeper:zookeeper:jar:3.7.1 [ApacheV2](https://github.com/apache/zookeeper)
 * org.codehaus.plexus:plexus-utils:jar:3.0.18 [ApacheV2](http://www.apache.org/licenses/LICENSE-2.0)
 * org.eclipse.persistence:eclipselink:jar:2.5.2 [EDL](http://www.eclipse.org/org/documents/edl-v10.php)
 * org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:jar:2.5.2 [EDL](http://www.eclipse.org/org/documents/edl-v10.php)

diff --git a/hopsworks-common/pom.xml b/hopsworks-common/pom.xml
@@ -106,16 +106,6 @@
       <groupId>io.hops</groupId>
       <artifactId>hadoop-client-runtime</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>

diff --git a/hopsworks-common/src/main/java/io/hops/hopsworks/common/util/Settings.java b/hopsworks-common/src/main/java/io/hops/hopsworks/common/util/Settings.java
@@ -2355,10 +2355,6 @@ public synchronized Boolean isDelaEnabled() {
     return DELA_ENABLED;
   }
 
-  //************************************************ZOOKEEPER********************************************************
-  public static final int ZOOKEEPER_SESSION_TIMEOUT_MS = 30 * 1000;//30 seconds
-  //Zookeeper END
-
   //************************************************KAFKA********************************************************
 
   public static final String KAFKA_ACL_WILDCARD = "*";

diff --git a/pom.xml b/pom.xml
@@ -148,7 +148,6 @@
     <spnego.version>7.0</spnego.version>
     <swagger-annotations.version>1.6.2</swagger-annotations.version>
     <swagger.jersey2.jaxrs.version>1.6.2</swagger.jersey2.jaxrs.version>
-    <zookeeper.version>3.8.3</zookeeper.version>
     <cron-utils.version>9.2.1</cron-utils.version>
     <arrow.version>14.0.1</arrow.version>
   </properties>
@@ -462,6 +461,10 @@
         <artifactId>hops-jdbc</artifactId>
         <version>${hive.version}</version>
         <exclusions>
+          <exclusion>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+          </exclusion>
           <exclusion>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>*</artifactId>
@@ -734,33 +737,6 @@
         <artifactId>libthrift</artifactId>
         <version>${libthrift.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.zookeeper</groupId>
-        <artifactId>zookeeper</artifactId>
-        <version>${zookeeper.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.jboss.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcpkix-jdk15on</artifactId>

diff --git a/project-suppression.xml b/project-suppression.xml
@@ -121,20 +121,6 @@
     <cve>CVE-2020-11022</cve>
     <cve>CVE-2020-11023</cve>
   </suppress>
-  <suppress>
-    <notes><![CDATA[
-   file name: zookeeper-3.4.14.jar
-   ]]></notes>
-    <packageUrl regex="true">^pkg:maven/org\.apache\.zookeeper/zookeeper\-*.*$</packageUrl>
-    <cve>CVE-2021-28165</cve>
-  </suppress>
-  <suppress>
-    <notes><![CDATA[
-   file name: flink-shaded-zookeeper-3-3.4.14-14.0.jar
-   ]]></notes>
-    <packageUrl regex="true">^pkg:maven/org\.apache\.flink/flink-shaded-zookeeper-3\-*.*$</packageUrl>
-    <cve>CVE-2021-28165</cve>
-  </suppress>
   <suppress>
     <notes><![CDATA[
    file name: flink-hadoop-fs-1.14.3.jar