diff options
| -rw-r--r-- | container-disc/pom.xml | 4 | ||||
| -rw-r--r-- | vespajlib/pom.xml | 6 |
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> |