Merge pull request #36205 from vespa-engine/hmusum/remove-zk-3.9.4-make-3.9.5-default

Remove ZooKeeper server 3.9.4, make 3.9.5 default

Author: hmusum

vespa-dependencies-enforcer/allowed-maven-dependencies.txt

@@ -145,10 +145,8 @@ org.apache.opennlp:opennlp-tools:${opennlp.vespa.version}
 org.apache.velocity:velocity-engine-core:${velocity.vespa.version}
 org.apache.yetus:audience-annotations:0.12.0
 org.apache.zookeeper:zookeeper-jute:${zookeeper.client.vespa.version}
-org.apache.zookeeper:zookeeper-jute:3.9.4
 org.apache.zookeeper:zookeeper-jute:3.9.5
 org.apache.zookeeper:zookeeper:${zookeeper.client.vespa.version}
-org.apache.zookeeper:zookeeper:3.9.4
 org.apache.zookeeper:zookeeper:3.9.5
 org.apiguardian:apiguardian-api:${apiguardian.vespa.version}
 org.assertj:assertj-core:${assertj.vespa.version}

zookeeper-server/CMakeLists.txt

@@ -1,4 +1,3 @@
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 add_subdirectory(zookeeper-server-common)
 add_subdirectory(zookeeper-server)
-add_subdirectory(zookeeper-server-3.9.5)

zookeeper-server/pom.xml

@@ -15,7 +15,6 @@
   <modules>
     <module>zookeeper-server-common</module>
     <module>zookeeper-server</module>
-    <module>zookeeper-server-3.9.5</module>
   </modules>
   <dependencies>
     <dependency>