Use version 3.6.2 as default version for ZooKeeper server

3 files changed, 3 insertions, 5 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
index cc0a4f75a43..59a2796b508 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
@@ -120,7 +120,7 @@ public class PermanentFlags {
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundStringFlag ZOOKEEPER_SERVER_VERSION = defineStringFlag(
-            "zookeeper-server-version", "3.5.6",
+            "zookeeper-server-version", "3.6.2",
             "ZooKeeper server version, a jar file zookeeper-server-<ZOOKEEPER_SERVER_VERSION>-jar-with-dependencies.jar must exist",
             "Takes effect on restart of Docker container",
             NODE_TYPE, APPLICATION_ID, HOSTNAME);
diff --git a/zookeeper-server/zookeeper-server-3.5.6/CMakeLists.txt b/zookeeper-server/zookeeper-server-3.5.6/CMakeLists.txt
index 0de588e0ad3..e5b439c9f4e 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/CMakeLists.txt
+++ b/zookeeper-server/zookeeper-server-3.5.6/CMakeLists.txt
@@ -1,4 +1,2 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(zookeeper-server-3.5.6)
-# Included when this is the wanted default version (and symlinks for other versions need to be removed)
-install_symlink(lib/jars/zookeeper-server-3.5.6-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar)
diff --git a/zookeeper-server/zookeeper-server-3.6.2/CMakeLists.txt b/zookeeper-server/zookeeper-server-3.6.2/CMakeLists.txt
index e540353f113..c85a65e8e78 100644
--- a/zookeeper-server/zookeeper-server-3.6.2/CMakeLists.txt
+++ b/zookeeper-server/zookeeper-server-3.6.2/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(zookeeper-server-3.6.2)
-# TODO: Needs to be included when this is the wanted default version (and symlinks for other versions need to be removed)
-# install_symlink(lib/jars/zookeeper-server-3.6.2-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar)
+# Needs to be included when this is the wanted default version (and symlinks for other versions need to be removed)
+install_symlink(lib/jars/zookeeper-server-3.6.2-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar)