From 178903a8b938738e7fc1db18eea850863f9461ed Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@oath.com>
Date: Fri, 14 Sep 2018 08:34:48 +0200
Subject: Move BouncyCastle preinstall declaration to vespajlib

---
 jdisc_http_service/pom.xml | 17 +++++------------
 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
@@ -17,16 +17,6 @@
   <name>${project.artifactId}</name>
   <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>
@@ -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>
-- 
cgit v1.2.3