aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-09-19 14:34:14 +0200
committergjoranv <gv@oath.com>2019-01-21 15:09:22 +0100
commite3eb38a73b3b4e85e96218461205dfce6df0fa64 (patch)
tree9c31851c2272b5ce3d3d50e89d4eea2293e278de
parentefa8fb852caaf8d63209faefc8391694e2d1e011 (diff)
Move BouncyCastle preinstall declaration to container-disc
-rw-r--r--container-disc/pom.xml4
-rw-r--r--vespajlib/pom.xml6
2 files changed, 4 insertions, 6 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index b0637393fba..85866692489 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -165,6 +165,7 @@
<configuration>
<discApplicationClass>com.yahoo.container.jdisc.ConfiguredApplication</discApplicationClass>
<discPreInstallBundle>
+ <!-- Vespa bundles -->
config-bundle-jar-with-dependencies.jar,
configdefinitions-jar-with-dependencies.jar,
container-jersey2-jar-with-dependencies.jar,
@@ -182,6 +183,9 @@
defaults-jar-with-dependencies.jar,
component-jar-with-dependencies.jar,
zkfacade-jar-with-dependencies.jar,
+ <!-- Misc 3rd party bundles -->
+ bcpkix-jdk15on-${bouncycastle.version}.jar,
+ bcprov-jdk15on-${bouncycastle.version}.jar,
<!-- Jersey 2 + Jackson 2 -->
aopalliance-repackaged-${hk2.version}.jar,
hk2-api-${hk2.version}.jar,
diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml
index 3f57bcf1b99..fbd1fb8d215 100644
--- a/vespajlib/pom.xml
+++ b/vespajlib/pom.xml
@@ -90,12 +90,6 @@
<groupId>com.yahoo.vespa</groupId>
<artifactId>bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <discPreInstallBundle>
- bcpkix-jdk15on-${bouncycastle.version}.jar,
- bcprov-jdk15on-${bouncycastle.version}.jar,
- </discPreInstallBundle>
- </configuration>
</plugin>
<plugin>