diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-10-27 06:41:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 06:41:42 +0100 |
| commit | ff47f5d753f02361b9eb25f6e39ebfff8d9e1e57 (patch) | |
| tree | e76537b3df36a8791570c9fb17240d1795155dae /standalone-container | |
| parent | 64cce27a240e076ea99fe63fa439795fbb220ae3 (diff) | |
| parent | 19987a0f2da4256cee40ef66e2c3387c7c70d026 (diff) | |
Merge pull request #11119 from vespa-engine/revert-11118-revert-11117-revert-11115-revert-11113-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 |