diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-09-14 08:34:48 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:21 +0100 |
commit | 178903a8b938738e7fc1db18eea850863f9461ed (patch) | |
tree | 2c466235ece1c4e4a39f1a16e6ce55c60eafbbc8 | |
parent | 6e7198c87d0451b3ac441bb21348ab9cf71bf699 (diff) |
Move BouncyCastle preinstall declaration to vespajlib
-rw-r--r-- | jdisc_http_service/pom.xml | 17 | ||||
-rw-r--r-- | vespajlib/pom.xml | 7 |
2 files changed, 12 insertions, 12 deletions
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index 3e1b81d62c6..141927fc674 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -18,16 +18,6 @@ <dependencies> <!-- PROVIDED SCOPE --> <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <scope>provided</scope> @@ -129,6 +119,11 @@ <artifactId>spring-test</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> @@ -172,8 +167,6 @@ <extensions>true</extensions> <configuration> <discPreInstallBundle> - bcpkix-jdk15on-${bouncycastle.version}.jar, - bcprov-jdk15on-${bouncycastle.version}.jar, javax.servlet-api-3.1.0.jar, jetty-continuation-${jetty.version}.jar, jetty-http-${jetty.version}.jar, diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index 48f70abba15..3f57bcf1b99 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -90,7 +90,14 @@ <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> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> |