diff options
| author | gjoranv <gjoranv@gmail.com> | 2018-02-22 15:23:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 15:23:12 +0100 |
| commit | e71f67d47b3d95bbde38394e6bda36fa37e496f8 (patch) | |
| tree | 0cf950f1674311e2b3aeaffb57253d12da7c4ba9 | |
| parent | 6c07a0714c3c3bc4833991900fc0ae98f3db4781 (diff) | |
| parent | 513da19b55b67e83a0d38d9d9331e5909fba39ee (diff) | |
Merge pull request #5121 from vespa-engine/bjorncs/vespa-athenz
Install vespa-athenz bundle as part of open-source Vespa
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | vespa-athenz/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespa-athenz/pom.xml | 25 |
3 files changed, 3 insertions, 25 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fe91c233ab..22ebd6abb4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,7 @@ add_subdirectory(streamingvisitors) add_subdirectory(vbench) add_subdirectory(vdslib) add_subdirectory(vdstestlib) +add_subdirectory(vespa-athenz) add_subdirectory(vespa-http-client) add_subdirectory(vespa_jersey2) add_subdirectory(vespabase) diff --git a/vespa-athenz/CMakeLists.txt b/vespa-athenz/CMakeLists.txt new file mode 100644 index 00000000000..bb5a1f5b6de --- /dev/null +++ b/vespa-athenz/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(vespa-athenz) diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 5312594472f..8d83a14fcbd 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -110,31 +110,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> - <configuration> - <useCommonAssemblyIds>false</useCommonAssemblyIds> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>target/${project.artifactId}-deploy.jar</file> - <type>jar</type> - <classifier>deploy</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> |