diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-10-25 23:54:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 23:54:52 +0200 |
| commit | bb0232003a3e077da04815d065d603d6a53e20c0 (patch) | |
| tree | c790f4b69b9165e4354c511b4bddf2d126ce4922 /standalone-container | |
| parent | b4b92200de63b327f8d4bcea4ccb33b79f0b4138 (diff) | |
Revert "Revert "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..c03c546f059 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 "$jars_dir"/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 |