summaryrefslogtreecommitdiffstats
path: root/zookeeper-server
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2022-05-20 22:43:17 +0200
committerGitHub <noreply@github.com>2022-05-20 22:43:17 +0200
commit243a4d6e601c09217edcff35790400b48652047f (patch)
treec65c60fbd62ed454eb7d6d9513b6fc838def0ea4 /zookeeper-server
parent37d915ab1872688591a9e9e59c9a3336d8d37e7e (diff)
parent479a1dd853675e5511417e9fd77cd9826c471fe6 (diff)
Merge pull request #22689 from vespa-engine/hakonhall/installjar-cmake-function
install_jar CMake function
Diffstat (limited to 'zookeeper-server')
-rw-r--r--zookeeper-server/zookeeper-server-3.7.1/CMakeLists.txt2
-rw-r--r--zookeeper-server/zookeeper-server-common/CMakeLists.txt2
-rw-r--r--zookeeper-server/zookeeper-server/CMakeLists.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/zookeeper-server/zookeeper-server-3.7.1/CMakeLists.txt b/zookeeper-server/zookeeper-server-3.7.1/CMakeLists.txt
index 3f90b81966b..6afd812ef07 100644
--- a/zookeeper-server/zookeeper-server-3.7.1/CMakeLists.txt
+++ b/zookeeper-server/zookeeper-server-3.7.1/CMakeLists.txt
@@ -1,2 +1,2 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(zookeeper-server-3.7.1)
+install_jar(zookeeper-server-3.7.1-jar-with-dependencies.jar)
diff --git a/zookeeper-server/zookeeper-server-common/CMakeLists.txt b/zookeeper-server/zookeeper-server-common/CMakeLists.txt
index 6f8ea04c263..9f3d26e836f 100644
--- a/zookeeper-server/zookeeper-server-common/CMakeLists.txt
+++ b/zookeeper-server/zookeeper-server-common/CMakeLists.txt
@@ -1,2 +1,2 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(zookeeper-server-common)
+install_jar(zookeeper-server-common-jar-with-dependencies.jar)
diff --git a/zookeeper-server/zookeeper-server/CMakeLists.txt b/zookeeper-server/zookeeper-server/CMakeLists.txt
index 1022ee5b2cd..98cb495e4b6 100644
--- a/zookeeper-server/zookeeper-server/CMakeLists.txt
+++ b/zookeeper-server/zookeeper-server/CMakeLists.txt
@@ -1,4 +1,4 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(zookeeper-server-3.7.0)
+install_jar(zookeeper-server-3.7.0-jar-with-dependencies.jar)
# Make symlink so that we have a default version, should be done only in zookeeper-server module
install_symlink(lib/jars/zookeeper-server-3.7.0-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar)