install_jar CMake function

61 files changed, 67 insertions, 72 deletions

diff --git a/application-model/CMakeLists.txt b/application-model/CMakeLists.txt
index 3bc7d65bd67..df7fff3a202 100644
--- a/application-model/CMakeLists.txt
+++ b/application-model/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(application-model)
+install_jar(application-model-jar-with-dependencies.jar)
diff --git a/application-preprocessor/CMakeLists.txt b/application-preprocessor/CMakeLists.txt
index 479f0c64350..d4b0b766fd8 100644
--- a/application-preprocessor/CMakeLists.txt
+++ b/application-preprocessor/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(application-preprocessor)
+install_jar(application-preprocessor-jar-with-dependencies.jar)
 vespa_install_script(src/main/sh/vespa-preprocess-application bin)
 
diff --git a/athenz-identity-provider-service/CMakeLists.txt b/athenz-identity-provider-service/CMakeLists.txt
index 0e9903dcf63..75208c49bd3 100644
--- a/athenz-identity-provider-service/CMakeLists.txt
+++ b/athenz-identity-provider-service/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(athenz-identity-provider-service)
+install_jar(athenz-identity-provider-service-jar-with-dependencies.jar)
diff --git a/cloud-tenant-cd/CMakeLists.txt b/cloud-tenant-cd/CMakeLists.txt
index e9498d21871..74ce3f5d7ec 100644
--- a/cloud-tenant-cd/CMakeLists.txt
+++ b/cloud-tenant-cd/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(cloud-tenant-cd)
+install_jar(cloud-tenant-cd-jar-with-dependencies.jar)
diff --git a/clustercontroller-apps/CMakeLists.txt b/clustercontroller-apps/CMakeLists.txt
index d18180fabee..54918159ace 100644
--- a/clustercontroller-apps/CMakeLists.txt
+++ b/clustercontroller-apps/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(clustercontroller-apps)
+install_jar(clustercontroller-apps-jar-with-dependencies.jar)
diff --git a/clustercontroller-core/CMakeLists.txt b/clustercontroller-core/CMakeLists.txt
index bd0d8b26cf4..c7d127b4d0a 100644
--- a/clustercontroller-core/CMakeLists.txt
+++ b/clustercontroller-core/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(clustercontroller-core)
+install_jar(clustercontroller-core-jar-with-dependencies.jar)
diff --git a/clustercontroller-reindexer/CMakeLists.txt b/clustercontroller-reindexer/CMakeLists.txt
index d2407767e0d..436184268b0 100644
--- a/clustercontroller-reindexer/CMakeLists.txt
+++ b/clustercontroller-reindexer/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(clustercontroller-reindexer)
+install_jar(clustercontroller-reindexer-jar-with-dependencies.jar)
diff --git a/clustercontroller-utils/CMakeLists.txt b/clustercontroller-utils/CMakeLists.txt
index 53f28f7c1ab..ae5dc312869 100644
--- a/clustercontroller-utils/CMakeLists.txt
+++ b/clustercontroller-utils/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(clustercontroller-utils)
+install_jar(clustercontroller-utils-jar-with-dependencies.jar)
diff --git a/config-bundle/CMakeLists.txt b/config-bundle/CMakeLists.txt
index 774372de9d0..9647f65cfce 100644
--- a/config-bundle/CMakeLists.txt
+++ b/config-bundle/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(config-bundle)
+install_jar(config-bundle-jar-with-dependencies.jar)
diff --git a/config-model-api/CMakeLists.txt b/config-model-api/CMakeLists.txt
index 81bf9928a8c..a3d3a80ed3f 100644
--- a/config-model-api/CMakeLists.txt
+++ b/config-model-api/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(config-model-api)
+install_jar(config-model-api-jar-with-dependencies.jar)
diff --git a/config-model-fat/CMakeLists.txt b/config-model-fat/CMakeLists.txt
index fd40048e2c4..a2f59cd51c8 100644
--- a/config-model-fat/CMakeLists.txt
+++ b/config-model-fat/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_java_artifact(config-model-fat)
+install_jar(config-model-fat.jar)
 
 install(FILES src/main/resources/config-models.xml
         DESTINATION conf/configserver-app)
diff --git a/config-model/CMakeLists.txt b/config-model/CMakeLists.txt
index d23ea29c3d0..8f59bb77ef2 100644
--- a/config-model/CMakeLists.txt
+++ b/config-model/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(config-model)
+install_jar(config-model-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/perl/vespa-deploy bin)
 vespa_install_script(src/main/perl/vespa-expand-config.pl bin)
diff --git a/config-provisioning/CMakeLists.txt b/config-provisioning/CMakeLists.txt
index 63a6c3cb3e7..f5a64dcf646 100644
--- a/config-provisioning/CMakeLists.txt
+++ b/config-provisioning/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(config-provisioning)
+install_jar(config-provisioning-jar-with-dependencies.jar)
 install_config_definitions()
diff --git a/config-proxy/CMakeLists.txt b/config-proxy/CMakeLists.txt
index 22b9369a63c..9f2311ae51e 100644
--- a/config-proxy/CMakeLists.txt
+++ b/config-proxy/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(config-proxy)
+install_jar(config-proxy-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/sh/vespa-config-ctl.sh vespa-config-ctl bin)
 vespa_install_script(src/main/sh/vespa-config-loadtester.sh vespa-config-loadtester bin)
diff --git a/configdefinitions/CMakeLists.txt b/configdefinitions/CMakeLists.txt
index e032ab51445..c374e93904e 100644
--- a/configdefinitions/CMakeLists.txt
+++ b/configdefinitions/CMakeLists.txt
@@ -9,4 +9,4 @@ vespa_define_module(
     src/vespa
 )
 
-install_fat_java_artifact(configdefinitions)
+install_jar(configdefinitions-jar-with-dependencies.jar)
diff --git a/configserver-flags/CMakeLists.txt b/configserver-flags/CMakeLists.txt
index 0eac9d119f4..5609a3ebeb1 100644
--- a/configserver-flags/CMakeLists.txt
+++ b/configserver-flags/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(configserver-flags)
+install_jar(configserver-flags-jar-with-dependencies.jar)
diff --git a/container-apache-http-client-bundle/CMakeLists.txt b/container-apache-http-client-bundle/CMakeLists.txt
index 861fda3395f..0f65b3308fc 100644
--- a/container-apache-http-client-bundle/CMakeLists.txt
+++ b/container-apache-http-client-bundle/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(container-apache-http-client-bundle)
+install_jar(container-apache-http-client-bundle-jar-with-dependencies.jar)
diff --git a/container-core/CMakeLists.txt b/container-core/CMakeLists.txt
index 5015fd22c0d..cb51d76b7e2 100644
--- a/container-core/CMakeLists.txt
+++ b/container-core/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_config_definitions()
-install_java_artifact_dependencies(container-core)
+install_jar_dependencies(container-core)
 
 vespa_install_script(src/main/sh/find-pid libexec/vespa)
 vespa_install_script(src/main/sh/vespa-load-balancer-status libexec/vespa)
diff --git a/container-disc/CMakeLists.txt b/container-disc/CMakeLists.txt
index c6f745c7d57..6b905c27a8c 100644
--- a/container-disc/CMakeLists.txt
+++ b/container-disc/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(container-disc)
+install_jar(container-disc-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/sh/vespa-start-container-daemon.sh vespa-start-container-daemon bin)
 
diff --git a/container-search-and-docproc/CMakeLists.txt b/container-search-and-docproc/CMakeLists.txt
index 2a4a0718129..006bf92f230 100644
--- a/container-search-and-docproc/CMakeLists.txt
+++ b/container-search-and-docproc/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(container-search-and-docproc)
+install_jar(container-search-and-docproc-jar-with-dependencies.jar)
 
 install_config_definitions()
diff --git a/container-search-gui/CMakeLists.txt b/container-search-gui/CMakeLists.txt
index 4360e7ed01a..572a337c0d0 100644
--- a/container-search-gui/CMakeLists.txt
+++ b/container-search-gui/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(container-search-gui)
\ No newline at end of file
+install_jar(container-search-gui-jar-with-dependencies.jar)
\ No newline at end of file
diff --git a/docprocs/CMakeLists.txt b/docprocs/CMakeLists.txt
index 33f0bdbfa22..30dbb2242d5 100644
--- a/docprocs/CMakeLists.txt
+++ b/docprocs/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(docprocs)
+install_jar(docprocs-jar-with-dependencies.jar)
diff --git a/document/CMakeLists.txt b/document/CMakeLists.txt
index 6505de79d39..15954e9bfb2 100644
--- a/document/CMakeLists.txt
+++ b/document/CMakeLists.txt
@@ -43,4 +43,4 @@ vespa_define_module(
     src/tests/tensor_fieldvalue/partial_remove
 )
 
-install_java_artifact(document)
+install_jar(document.jar)
diff --git a/filedistribution/CMakeLists.txt b/filedistribution/CMakeLists.txt
index cddeccc9574..ff6e3b28473 100644
--- a/filedistribution/CMakeLists.txt
+++ b/filedistribution/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(filedistribution)
+install_jar(filedistribution-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/sh/vespa-status-filedistribution.sh vespa-status-filedistribution bin)
diff --git a/flags/CMakeLists.txt b/flags/CMakeLists.txt
index 1b1adce2463..722dbd2679e 100644
--- a/flags/CMakeLists.txt
+++ b/flags/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(flags)
+install_jar(flags-jar-with-dependencies.jar)
diff --git a/functions.cmake b/functions.cmake
index 2f0056b3f2a..6dea158c6ae 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -655,18 +655,14 @@ function(install_config_definitions)
     install(DIRECTORY ${DEFINITIONS_DIR}/ DESTINATION share/vespa/configdefinitions FILES_MATCHING PATTERN "*.def")
 endfunction()
 
-function(install_java_artifact NAME)
-    install(FILES "target/${NAME}.jar" DESTINATION lib/jars/)
+function(install_jar FILENAME)
+    install(FILES "target/${FILENAME}" DESTINATION lib/jars/)
 endfunction()
 
-function(install_java_artifact_dependencies NAME)
+function(install_jar_dependencies NAME)
     install(DIRECTORY "target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar")
 endfunction()
 
-function(install_fat_java_artifact NAME)
-    install(FILES "target/${NAME}-jar-with-dependencies.jar" DESTINATION lib/jars/)
-endfunction()
-
 function(install_absolute_symlink TARGET LINK)
     install(CODE "execute_process(COMMAND ln -snf ${TARGET} \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LINK})")
 endfunction(install_absolute_symlink)
@@ -686,9 +682,8 @@ function(install_configserver_component NAME)
     if(NOT PARAM_CLASSIFIER)
        SET(PARAM_CLASSIFIER "jar-with-dependencies")
     endif()
-    install(FILES "target/${NAME}-${PARAM_CLASSIFIER}.jar" DESTINATION lib/jars/)
-    install(DIRECTORY DESTINATION conf/configserver-app/components)
-    install_symlink(lib/jars/${NAME}-${PARAM_CLASSIFIER}.jar conf/configserver-app/components/${NAME}.jar)
+    install_jar("target/${NAME}-${PARAM_CLASSIFIER}.jar")
+    install_app_component_symlink(configserver-app "${NAME}" CLASSIFIER "${PARAM_CLASSIFIER}")
 endfunction()
 
 function(install_app_component_symlink APPNAME NAME)
diff --git a/hosted-zone-api/CMakeLists.txt b/hosted-zone-api/CMakeLists.txt
index ebbe7d806a1..914101b970f 100644
--- a/hosted-zone-api/CMakeLists.txt
+++ b/hosted-zone-api/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(hosted-zone-api)
+install_jar(hosted-zone-api-jar-with-dependencies.jar)
diff --git a/http-client/CMakeLists.txt b/http-client/CMakeLists.txt
index 3f5bf469481..58249a8c665 100644
--- a/http-client/CMakeLists.txt
+++ b/http-client/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(http-client)
+install_jar(http-client-jar-with-dependencies.jar)
diff --git a/jdisc-cloud-aws/CMakeLists.txt b/jdisc-cloud-aws/CMakeLists.txt
index d0c55306d12..d83f371c014 100644
--- a/jdisc-cloud-aws/CMakeLists.txt
+++ b/jdisc-cloud-aws/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(jdisc-cloud-aws)
+install_jar(jdisc-cloud-aws-jar-with-dependencies.jar)
 install_config_definitions()
diff --git a/jdisc-security-filters/CMakeLists.txt b/jdisc-security-filters/CMakeLists.txt
index d37c7b18cf8..3927d07613a 100644
--- a/jdisc-security-filters/CMakeLists.txt
+++ b/jdisc-security-filters/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(jdisc-security-filters)
+install_jar(jdisc-security-filters-jar-with-dependencies.jar)
 
 install_config_definitions()
diff --git a/jdisc_core/CMakeLists.txt b/jdisc_core/CMakeLists.txt
index 073649a5e60..b70c5744e61 100644
--- a/jdisc_core/CMakeLists.txt
+++ b/jdisc_core/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(jdisc_core)
+install_jar(jdisc_core-jar-with-dependencies.jar)
diff --git a/jdisc_jetty/CMakeLists.txt b/jdisc_jetty/CMakeLists.txt
index 129cd9de06a..7f72c61be20 100644
--- a/jdisc_jetty/CMakeLists.txt
+++ b/jdisc_jetty/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_java_artifact(jdisc_jetty)
-install_java_artifact_dependencies(jdisc_jetty)
+install_jar(jdisc_jetty.jar)
+install_jar_dependencies(jdisc_jetty)
diff --git a/linguistics-components/CMakeLists.txt b/linguistics-components/CMakeLists.txt
index 0e853b1daac..a26095a4649 100644
--- a/linguistics-components/CMakeLists.txt
+++ b/linguistics-components/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-install_fat_java_artifact(linguistics-components)
+install_jar(linguistics-components-jar-with-dependencies.jar)
 
 install_config_definitions()
diff --git a/logserver/CMakeLists.txt b/logserver/CMakeLists.txt
index 76f726f8b38..f336bd7af94 100644
--- a/logserver/CMakeLists.txt
+++ b/logserver/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(logserver)
+install_jar(logserver-jar-with-dependencies.jar)
 
 vespa_install_script(bin/logserver-start.sh vespa-logserver-start bin)
diff --git a/metrics-proxy/CMakeLists.txt b/metrics-proxy/CMakeLists.txt
index c54bbb57cf8..5963cba9615 100644
--- a/metrics-proxy/CMakeLists.txt
+++ b/metrics-proxy/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(metrics-proxy)
+install_jar(metrics-proxy-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/sh/start-telegraf.sh libexec/vespa)
 vespa_install_script(src/main/sh/stop-telegraf.sh libexec/vespa)
diff --git a/model-evaluation/CMakeLists.txt b/model-evaluation/CMakeLists.txt
index ebda5698957..dafccd28e2b 100644
--- a/model-evaluation/CMakeLists.txt
+++ b/model-evaluation/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(model-evaluation)
+install_jar(model-evaluation-jar-with-dependencies.jar)
diff --git a/model-integration/CMakeLists.txt b/model-integration/CMakeLists.txt
index 4225ac38f89..4423746ccbc 100644
--- a/model-integration/CMakeLists.txt
+++ b/model-integration/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(model-integration)
+install_jar(model-integration-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/python/vespa-convert-tf2onnx.py vespa-convert-tf2onnx bin)
 
diff --git a/node-repository/CMakeLists.txt b/node-repository/CMakeLists.txt
index fe4e09dc8a1..b4482f0daa7 100644
--- a/node-repository/CMakeLists.txt
+++ b/node-repository/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(node-repository)
+install_jar(node-repository-jar-with-dependencies.jar)
 
 install(FILES src/main/config/node-repository.xml
         DESTINATION conf/configserver-app)
diff --git a/orchestrator/CMakeLists.txt b/orchestrator/CMakeLists.txt
index 77e1238d9bc..22044a9dace 100644
--- a/orchestrator/CMakeLists.txt
+++ b/orchestrator/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(orchestrator)
+install_jar(orchestrator-jar-with-dependencies.jar)
diff --git a/predicate-search/CMakeLists.txt b/predicate-search/CMakeLists.txt
index a180c3fcd3e..eecd4c336ff 100644
--- a/predicate-search/CMakeLists.txt
+++ b/predicate-search/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(predicate-search)
+install_jar(predicate-search-jar-with-dependencies.jar)
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index 54892bbea3d..412d00a1c6a 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -233,7 +233,7 @@ vespa_define_module(
     src/tests/vespa-fileheader-inspect
 )
 
-install_java_artifact(searchlib)
+install_jar(searchlib.jar)
 
 vespa_install_script(src/main/sh/vespa-gbdt-converter bin)
 vespa_install_script(src/main/sh/vespa-treenet-converter bin)
diff --git a/security-tools/CMakeLists.txt b/security-tools/CMakeLists.txt
index 4e426d43160..8341f57b9cc 100644
--- a/security-tools/CMakeLists.txt
+++ b/security-tools/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(security-tools)
+install_jar(security-tools-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/sh/vespa-security-env vespa-security-env bin)
 vespa_install_script(src/main/sh/vespa-curl-wrapper vespa-curl-wrapper libexec/vespa)
diff --git a/security-utils/CMakeLists.txt b/security-utils/CMakeLists.txt
index 1ca28662d4e..b7700f45876 100644
--- a/security-utils/CMakeLists.txt
+++ b/security-utils/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_java_artifact(security-utils)
+install_jar(security-utils.jar)
diff --git a/service-monitor/CMakeLists.txt b/service-monitor/CMakeLists.txt
index 8d505e5c00b..4be67e8f7b2 100644
--- a/service-monitor/CMakeLists.txt
+++ b/service-monitor/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(service-monitor)
+install_jar(service-monitor-jar-with-dependencies.jar)
diff --git a/standalone-container/CMakeLists.txt b/standalone-container/CMakeLists.txt
index c3026df11a4..9dbe9aa41db 100644
--- a/standalone-container/CMakeLists.txt
+++ b/standalone-container/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(standalone-container)
+install_jar(standalone-container-jar-with-dependencies.jar)
 install(PROGRAMS src/main/sh/standalone-container.sh DESTINATION libexec/vespa)
diff --git a/tenant-cd-api/CMakeLists.txt b/tenant-cd-api/CMakeLists.txt
index d5155ec34d1..741e0759071 100644
--- a/tenant-cd-api/CMakeLists.txt
+++ b/tenant-cd-api/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(tenant-cd-api)
+install_jar(tenant-cd-api-jar-with-dependencies.jar)
diff --git a/vespa-athenz/CMakeLists.txt b/vespa-athenz/CMakeLists.txt
index 5c5fa370796..f5d3dbd3f04 100644
--- a/vespa-athenz/CMakeLists.txt
+++ b/vespa-athenz/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(vespa-athenz)
+install_jar(vespa-athenz-jar-with-dependencies.jar)
 install_config_definitions()
diff --git a/vespa-feed-client-cli/CMakeLists.txt b/vespa-feed-client-cli/CMakeLists.txt
index 7b0160a62a5..80bfc2234fd 100644
--- a/vespa-feed-client-cli/CMakeLists.txt
+++ b/vespa-feed-client-cli/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(vespa-feed-client-cli)
+install_jar(vespa-feed-client-cli-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/sh/vespa-feed-client.sh vespa-feed-client bin)
 install(FILES src/main/resources/logging.properties DESTINATION conf/vespa-feed-client)
diff --git a/vespa-http-client/CMakeLists.txt b/vespa-http-client/CMakeLists.txt
index 40d7070eca3..3fb22316a28 100644
--- a/vespa-http-client/CMakeLists.txt
+++ b/vespa-http-client/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(vespa-http-client)
+install_jar(vespa-http-client-jar-with-dependencies.jar)
diff --git a/vespa-osgi-testrunner/CMakeLists.txt b/vespa-osgi-testrunner/CMakeLists.txt
index e803531f003..294d89871b3 100644
--- a/vespa-osgi-testrunner/CMakeLists.txt
+++ b/vespa-osgi-testrunner/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(vespa-osgi-testrunner)
+install_jar(vespa-osgi-testrunner-jar-with-dependencies.jar)
 install_config_definitions()
diff --git a/vespa-testrunner-components/CMakeLists.txt b/vespa-testrunner-components/CMakeLists.txt
index 7548a05b5bf..4378f8d971f 100644
--- a/vespa-testrunner-components/CMakeLists.txt
+++ b/vespa-testrunner-components/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_java_artifact(vespa-testrunner-components)
-install_fat_java_artifact(vespa-testrunner-components)
+install_jar(vespa-testrunner-components.jar)
+install_jar(vespa-testrunner-components-jar-with-dependencies.jar)
 install_config_definitions()
diff --git a/vespa_feed_perf/CMakeLists.txt b/vespa_feed_perf/CMakeLists.txt
index 094ad04cbea..e7339795fcd 100644
--- a/vespa_feed_perf/CMakeLists.txt
+++ b/vespa_feed_perf/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(vespa_feed_perf)
+install_jar(vespa_feed_perf-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/sh/vespa-feed-perf vespa-feed-perf bin)
diff --git a/vespa_jersey2/CMakeLists.txt b/vespa_jersey2/CMakeLists.txt
index f75d54991fc..ced1db89e30 100644
--- a/vespa_jersey2/CMakeLists.txt
+++ b/vespa_jersey2/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_java_artifact_dependencies(vespa_jersey2)
+install_jar_dependencies(vespa_jersey2)
diff --git a/vespaclient-container-plugin/CMakeLists.txt b/vespaclient-container-plugin/CMakeLists.txt
index 57f0847d64a..e1b21cc39f9 100644
--- a/vespaclient-container-plugin/CMakeLists.txt
+++ b/vespaclient-container-plugin/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(vespaclient-container-plugin)
+install_jar(vespaclient-container-plugin-jar-with-dependencies.jar)
diff --git a/vespaclient-java/CMakeLists.txt b/vespaclient-java/CMakeLists.txt
index c8f48a8b332..2fb6d0154bb 100644
--- a/vespaclient-java/CMakeLists.txt
+++ b/vespaclient-java/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(vespaclient-java)
+install_jar(vespaclient-java-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/sh/vespa-document-statistics.sh vespa-document-statistics bin)
 vespa_install_script(src/main/sh/vespa-stat.sh vespa-stat bin)
diff --git a/vespajlib/CMakeLists.txt b/vespajlib/CMakeLists.txt
index a22e8c636e1..6d137d0c010 100644
--- a/vespajlib/CMakeLists.txt
+++ b/vespajlib/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_java_artifact(vespajlib)
+install_jar(vespajlib.jar)
diff --git a/zkfacade/CMakeLists.txt b/zkfacade/CMakeLists.txt
index 4ea012aa9a5..a29a66cccfc 100644
--- a/zkfacade/CMakeLists.txt
+++ b/zkfacade/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(zkfacade)
+install_jar(zkfacade-jar-with-dependencies.jar)
diff --git a/zookeeper-command-line-client/CMakeLists.txt b/zookeeper-command-line-client/CMakeLists.txt
index 81a100d1b25..8140822388c 100644
--- a/zookeeper-command-line-client/CMakeLists.txt
+++ b/zookeeper-command-line-client/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(zookeeper-command-line-client)
+install_jar(zookeeper-command-line-client-jar-with-dependencies.jar)
 
 vespa_install_script(src/main/sh/vespa-zkcat vespa-zkcat bin)
 vespa_install_script(src/main/sh/vespa-zkcli vespa-zkcli bin)
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)