diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cloud-tenant-cd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cloud-tenant-cd/pom.xml | 4 | ||||
| -rw-r--r-- | dist/vespa.spec | 3 | ||||
| -rw-r--r-- | tenant-cd-api/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tenant-cd-api/pom.xml | 4 | ||||
| -rw-r--r-- | vespa-osgi-testrunner/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespa-osgi-testrunner/pom.xml | 4 |
8 files changed, 15 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 873e4c5fad7..96eca0da82a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,7 @@ add_subdirectory(container-messagebus) add_subdirectory(container-search) add_subdirectory(container-search-gui) add_subdirectory(container-search-and-docproc) +add_subdirectory(cloud-tenant-cd) add_subdirectory(clustercontroller-apps) add_subdirectory(clustercontroller-apputil) add_subdirectory(clustercontroller-utils) @@ -127,11 +128,13 @@ add_subdirectory(storageframework) add_subdirectory(storageserver) add_subdirectory(statistics) add_subdirectory(streamingvisitors) +add_subdirectory(tenant-cd-api) add_subdirectory(vbench) add_subdirectory(vdslib) add_subdirectory(vdstestlib) add_subdirectory(vespa-athenz) add_subdirectory(vespa-http-client) +add_subdirectory(vespa-osgi-testrunner) add_subdirectory(vespa-testrunner-components) add_subdirectory(vespa_feed_perf) add_subdirectory(vespa_jersey2) diff --git a/cloud-tenant-cd/CMakeLists.txt b/cloud-tenant-cd/CMakeLists.txt new file mode 100644 index 00000000000..2d30b9c4611 --- /dev/null +++ b/cloud-tenant-cd/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(cloud-tenant-cd) diff --git a/cloud-tenant-cd/pom.xml b/cloud-tenant-cd/pom.xml index c771e2dd1c3..b4670e6e83f 100644 --- a/cloud-tenant-cd/pom.xml +++ b/cloud-tenant-cd/pom.xml @@ -78,9 +78,7 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> - <attachBundleArtifact>true</attachBundleArtifact> - <bundleClassifierName>deploy</bundleClassifierName> - <useCommonAssemblyIds>false</useCommonAssemblyIds> + <useCommonAssemblyIds>true</useCommonAssemblyIds> </configuration> </plugin> <plugin> diff --git a/dist/vespa.spec b/dist/vespa.spec index 1e1658d3d55..9353acf5c68 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -441,6 +441,7 @@ fi %{_prefix}/lib/jars/application-model-jar-with-dependencies.jar %{_prefix}/lib/jars/application-preprocessor-jar-with-dependencies.jar %{_prefix}/lib/jars/athenz-identity-provider-service-jar-with-dependencies.jar +%{_prefix}/lib/jars/cloud-tenant-cd-jar-with-dependencies.jar %{_prefix}/lib/jars/clustercontroller-apps-jar-with-dependencies.jar %{_prefix}/lib/jars/clustercontroller-apputil-jar-with-dependencies.jar %{_prefix}/lib/jars/clustercontroller-core-jar-with-dependencies.jar @@ -460,7 +461,9 @@ fi %{_prefix}/lib/jars/searchlib.jar %{_prefix}/lib/jars/searchlib-jar-with-dependencies.jar %{_prefix}/lib/jars/service-monitor-jar-with-dependencies.jar +%{_prefix}/lib/jars/tenant-cd-api-jar-with-dependencies.jar %{_prefix}/lib/jars/vespa_feed_perf-jar-with-dependencies.jar +%{_prefix}/lib/jars/vespa-osgi-testrunner-jar-with-dependencies.jar %{_prefix}/lib/jars/vespa-testrunner-components.jar %{_prefix}/lib/jars/vespa-testrunner-components-jar-with-dependencies.jar %{_prefix}/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar diff --git a/tenant-cd-api/CMakeLists.txt b/tenant-cd-api/CMakeLists.txt new file mode 100644 index 00000000000..971aa974aa2 --- /dev/null +++ b/tenant-cd-api/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(tenant-cd-api) diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml index b19d42d094f..23e5f3ec3f4 100644 --- a/tenant-cd-api/pom.xml +++ b/tenant-cd-api/pom.xml @@ -57,9 +57,7 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> - <attachBundleArtifact>true</attachBundleArtifact> - <bundleClassifierName>deploy</bundleClassifierName> - <useCommonAssemblyIds>false</useCommonAssemblyIds> + <useCommonAssemblyIds>true</useCommonAssemblyIds> </configuration> </plugin> <plugin> diff --git a/vespa-osgi-testrunner/CMakeLists.txt b/vespa-osgi-testrunner/CMakeLists.txt new file mode 100644 index 00000000000..58aba186710 --- /dev/null +++ b/vespa-osgi-testrunner/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(vespa-osgi-testrunner) diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml index 5ed9f75c9eb..62ea578f14f 100644 --- a/vespa-osgi-testrunner/pom.xml +++ b/vespa-osgi-testrunner/pom.xml @@ -79,9 +79,7 @@ <version>${project.version}</version> <extensions>true</extensions> <configuration> - <attachBundleArtifact>true</attachBundleArtifact> - <bundleClassifierName>deploy</bundleClassifierName> - <useCommonAssemblyIds>false</useCommonAssemblyIds> + <useCommonAssemblyIds>true</useCommonAssemblyIds> </configuration> </plugin> <plugin> |