summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@verizonmedia.com>2021-11-17 09:38:26 +0100
committerGitHub <noreply@github.com>2021-11-17 09:38:26 +0100
commitae273a24c301d57a64412d05e6ca6aa3834a72d8 (patch)
tree7a8814a3fc46fd2f93e3330f03397ce123e6b0bb
parent65ee60f8bcd5f09ef88bbf7c74d21a15d628c6fe (diff)
parent5cf5ca1970bda1f806f8374b3c90a023c461401a (diff)
Merge pull request #19856 from vespa-engine/hmusum/use-zookeeper-server-3.7.0
Use ZooKeeper server 3.7.0 [run-systemtest]
-rw-r--r--zookeeper-server/zookeeper-server-3.6.3/CMakeLists.txt2
-rw-r--r--zookeeper-server/zookeeper-server-3.7.0/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/zookeeper-server/zookeeper-server-3.6.3/CMakeLists.txt b/zookeeper-server/zookeeper-server-3.6.3/CMakeLists.txt
index 9e6e235f6b4..b7871cfbde1 100644
--- a/zookeeper-server/zookeeper-server-3.6.3/CMakeLists.txt
+++ b/zookeeper-server/zookeeper-server-3.6.3/CMakeLists.txt
@@ -1,4 +1,4 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
install_fat_java_artifact(zookeeper-server-3.6.3)
# 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.3-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar)
+#install_symlink(lib/jars/zookeeper-server-3.6.3-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar)
diff --git a/zookeeper-server/zookeeper-server-3.7.0/CMakeLists.txt b/zookeeper-server/zookeeper-server-3.7.0/CMakeLists.txt
index c106a26fffc..8a41fc8b8fa 100644
--- a/zookeeper-server/zookeeper-server-3.7.0/CMakeLists.txt
+++ b/zookeeper-server/zookeeper-server-3.7.0/CMakeLists.txt
@@ -1,4 +1,4 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
install_fat_java_artifact(zookeeper-server-3.7.0)
# 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.7.0-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar)
+install_symlink(lib/jars/zookeeper-server-3.7.0-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar)