diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-10-26 11:44:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-26 11:44:56 +0200 |
commit | 5b4544bb226235e8b541eefc229ac00ecdd38eec (patch) | |
tree | e3a07bcba7d0d1f5aac2c0e9a4f88536b00ab214 /standalone-container | |
parent | c13358c3a86323ad89d9e883dbe919bb09baed99 (diff) | |
parent | 6daa95d998561df8e8d4a0e5b5d16b0c13f20abd (diff) |
Merge pull request #11113 from vespa-engine/revert-11112-revert-11101-revert-11098-revert-11096-revert-11095-revert-11089-hmusum/create-versioned-zookeeper-bundles
Reapply "Create seperate bundles compiled against different ZooKeeper versions"
Diffstat (limited to 'standalone-container')
-rw-r--r-- | standalone-container/vespa-standalone-container.spec | 8 |
1 files changed, 7 insertions, 1 deletions
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 |