diff options
Diffstat (limited to 'container-disc/pom.xml')
| -rw-r--r-- | container-disc/pom.xml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index b0637393fba..1af9c69318a 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -8,11 +8,11 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-disc</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>container-plugin</packaging> <dependencies> <dependency> @@ -137,12 +137,6 @@ <scope>provided</scope> </dependency> <!-- end WARNING --> - <!-- Athenz --> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <scope>compile</scope> - </dependency> </dependencies> <build> <plugins> @@ -165,6 +159,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 +177,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, |