diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-10-26 17:14:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 17:14:17 +0200 |
| commit | 3be01e3c1b0898206f4ec58cc4101be558381355 (patch) | |
| tree | a7aa960c4f92fa8f94d93fd78e5eab64561f67a0 /standalone-container | |
| parent | 935cf534c4e775ec17feff0c62d0f587c064257b (diff) | |
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, 1 insertions, 7 deletions
diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec index 0dc4c54a409..c8029a81bf6 100644 --- a/standalone-container/vespa-standalone-container.spec +++ b/standalone-container/vespa-standalone-container.spec @@ -62,6 +62,7 @@ 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" @@ -70,13 +71,6 @@ 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 |