diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-09-22 14:38:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 14:38:17 +0200 |
| commit | 05f118fcca1dad818960248a4fe24c76f33f4bbb (patch) | |
| tree | e469e618505154bd9c301e51c9da1a1432c09f04 | |
| parent | 5ff3a5a4cbbd43180d821700f572eae73720fc17 (diff) | |
| parent | 042f2e2c341f186333bd50c05f9a535d14f418b1 (diff) | |
Merge pull request #19239 from vespa-engine/config-bundle-cleanup
Config bundle cleanup [run-systemtest]
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | configgen/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | container-disc/pom.xml | 2 | ||||
| -rw-r--r-- | defaults/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 2 |
5 files changed, 1 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3598d259144..7d9968b6329 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,6 @@ add_subdirectory(config) add_subdirectory(config-model-fat) add_subdirectory(configd) add_subdirectory(configdefinitions) -add_subdirectory(configgen) add_subdirectory(configserver) add_subdirectory(configserver-flags) add_subdirectory(configutil) diff --git a/configgen/CMakeLists.txt b/configgen/CMakeLists.txt deleted file mode 100644 index 107037f8008..00000000000 --- a/configgen/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_java_artifact(configgen) diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 5debf6c9c02..9b6ccd93a41 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -167,7 +167,6 @@ <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> <!-- Vespa bundles --> - configgen.jar, config-bundle-jar-with-dependencies.jar, configdefinitions-jar-with-dependencies.jar, container-search-and-docproc-jar-with-dependencies.jar, @@ -178,7 +177,6 @@ vespaclient-container-plugin-jar-with-dependencies.jar, vespa-athenz-jar-with-dependencies.jar, security-utils-jar-with-dependencies.jar, - defaults-jar-with-dependencies.jar, zkfacade-jar-with-dependencies.jar, zookeeper-server-jar-with-dependencies.jar, <!-- Apache http client repackaged as bundle --> diff --git a/defaults/CMakeLists.txt b/defaults/CMakeLists.txt index c42e5402688..ed0ab1e6fb0 100644 --- a/defaults/CMakeLists.txt +++ b/defaults/CMakeLists.txt @@ -7,4 +7,4 @@ vespa_define_module( src/apps/printdefault ) -install_fat_java_artifact(defaults) +# No separate java artifact is installed (part of config-bundle) diff --git a/dist/vespa.spec b/dist/vespa.spec index aa3d64401d3..e976d710fb5 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -791,7 +791,6 @@ fi %{_prefix}/lib/jars/bcprov-jdk15on-*.jar %{_prefix}/lib/jars/config-bundle-jar-with-dependencies.jar %{_prefix}/lib/jars/configdefinitions-jar-with-dependencies.jar -%{_prefix}/lib/jars/configgen.jar %{_prefix}/lib/jars/config-model-api-jar-with-dependencies.jar %{_prefix}/lib/jars/config-model-jar-with-dependencies.jar %{_prefix}/lib/jars/config-provisioning-jar-with-dependencies.jar @@ -799,7 +798,6 @@ fi %{_prefix}/lib/jars/container-disc-jar-with-dependencies.jar %{_prefix}/lib/jars/container-search-and-docproc-jar-with-dependencies.jar %{_prefix}/lib/jars/container-search-gui-jar-with-dependencies.jar -%{_prefix}/lib/jars/defaults-jar-with-dependencies.jar %{_prefix}/lib/jars/docprocs-jar-with-dependencies.jar %{_prefix}/lib/jars/flags-jar-with-dependencies.jar %{_prefix}/lib/jars/hk2-*.jar |