From b5a5999e545b36dbdb6565d30c424081fa7e00e9 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sun, 27 Oct 2019 10:21:04 +0100 Subject: Revert "Revert "Reapply "Create seperate bundles compiled against different ZooKeeper versions""" --- standalone-container/vespa-standalone-container.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'standalone-container') diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec index c8029a81bf6..0dc4c54a409 100644 --- a/standalone-container/vespa-standalone-container.spec +++ b/standalone-container/vespa-standalone-container.spec @@ -62,7 +62,6 @@ declare -a modules=( vespa-athenz vespaclient-container-plugin zkfacade - zookeeper-server ) for module in "${modules[@]}"; do cp "$module"/target/"$module"-jar-with-dependencies.jar "$jars_dir" @@ -71,6 +70,13 @@ done # vespajlib must be installed _without_ dependencies. cp vespajlib/target/vespajlib.jar "$jars_dir" +# Copy from submodules, so must be done separately +cp zookeeper-server/zookeeper-server-common/target/zookeeper-server-common-jar-with-dependencies.jar "$jars_dir" +cp zookeeper-server/zookeeper-server-3.4/target/zookeeper-server-3.4-jar-with-dependencies.jar "$jars_dir" +cp zookeeper-server/zookeeper-server-3.5/target/zookeeper-server-3.5-jar-with-dependencies.jar "$jars_dir" +# Symlink to default version +ln -s zookeeper-server-3.4-jar-with-dependencies.jar "$jars_dir"/zookeeper-server-jar-with-dependencies.jar + declare -a libexec_files=( standalone-container/src/main/sh/standalone-container.sh security-tools/src/main/sh/vespa-curl-wrapper -- cgit v1.2.3