diff options
author | HÃ¥kon Hallingstad <hakon@oath.com> | 2018-02-12 12:14:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-12 12:14:02 +0100 |
commit | 6dec94b01e5b26f2152b1c3ecb546e322d8b6772 (patch) | |
tree | 16e02530b721f2eeae8976c29f106955bb9d4e3b | |
parent | 589c0d837fd265c0dd3fe99713664347e8b8719e (diff) | |
parent | 5b7fbd2ad6031ead119f5a31191c2a4038ebf32d (diff) |
Merge pull request #5003 from vespa-engine/hakonhall/add-bouncycastle-to-vespa-node-admin-rpm
Add bouncycastle to vespa-node-admin RPM
-rw-r--r-- | node-admin/pom.xml | 17 | ||||
-rw-r--r-- | node-admin/vespa-node-admin.spec | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 9484525a8ec..3bd7eb04e8b 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -157,6 +157,23 @@ </compilerArgs> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/node-admin-app/components</outputDirectory> + <includeArtifactIds>bcprov-jdk15on,bcpkix-jdk15on</includeArtifactIds> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/node-admin/vespa-node-admin.spec b/node-admin/vespa-node-admin.spec index 049e66bf22f..d270143976c 100644 --- a/node-admin/vespa-node-admin.spec +++ b/node-admin/vespa-node-admin.spec @@ -32,6 +32,7 @@ cp node-admin/src/main/application/services.xml "$app_dir" declare -a jar_components=( node-admin/target/node-admin-jar-with-dependencies.jar + node-admin/target/node-admin-app/components/* docker-api/target/docker-api-jar-with-dependencies.jar ) for path in "${jar_components[@]}"; do |