diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-10-25 12:35:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-25 12:35:04 +0200 |
commit | 91f027082d74a11016375782a9e4c2effd02f8a5 (patch) | |
tree | 725c673a2f17bd3cc6bed650bfe85ba3ac5185fc /standalone-container/vespa-standalone-container.spec | |
parent | ec409d09db10f1af1b059133623c69eb82502445 (diff) | |
parent | d05425122af12c3bb8a28027b97fb87cae53bb53 (diff) |
Merge pull request #11098 from vespa-engine/revert-11096-revert-11095-revert-11089-hmusum/create-versioned-zookeeper-bundles
Revert "Reapply "Create seperate bundles compiled against different ZooKeeper versions""
Diffstat (limited to 'standalone-container/vespa-standalone-container.spec')
-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 c03c546f059..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 "$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 |