Merge pull request #5242 from vespa-engine/bjorncs/bouncycastle-preinstall

bjorncs+gv/bouncycastle preinstall

17 files changed, 74 insertions, 106 deletions

diff --git a/application/pom.xml b/application/pom.xml
index 8103226e55d..ac9ba96cb27 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -134,16 +134,6 @@
       <artifactId>commons-digester</artifactId>
       <version>1.8</version>
     </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>${bouncycastle.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>${bouncycastle.version}</version>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml
index 50d045a8198..86d4defa861 100644
--- a/athenz-identity-provider-service/pom.xml
+++ b/athenz-identity-provider-service/pom.xml
@@ -64,25 +64,23 @@
             <artifactId>httpcore</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>com.yahoo.athenz</groupId>
             <artifactId>athenz-zts-java-client</artifactId>
             <scope>compile</scope>
             <exclusions>
+                <!--Exclude all bundles provided by JDisc -->
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcpkix-jdk15on</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
-                <!--Exclude all Jackson bundles provided by JDisc -->
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 3384da7c1eb..fa55908befe 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -103,6 +103,8 @@
                                                 <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include>
                                                 <include>org.apache.httpcomponents:httpclient:[4.3.6]:jar:provided</include>
                                                 <include>org.apache.httpcomponents:httpcore:[4.3.3]:jar:provided</include>
+                                                <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include>
+                                                <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include>
                                                 <include>org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:provided</include>
                                                 <include>org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:provided</include>
                                                 <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:provided</include>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index eca7002b977..68736c39623 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -221,6 +221,16 @@
                 <version>4.3.3</version>
             </dependency>
             <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-http</artifactId>
                 <version>${jetty.version}</version>
@@ -424,6 +434,7 @@
     </dependencyManagement>
 
     <properties>
+        <bouncycastle.version>1.58</bouncycastle.version>
         <felix.version>4.2.1</felix.version>
         <findbugs.version>1.3.9</findbugs.version>
         <guava.version>18.0</guava.version>
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 16006452e61..53153a05c4a 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -38,16 +38,6 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>jdisc_http_service</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcpkix-jdk15on</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcprov-jdk15on</artifactId>
-       </exclusion>
-     </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
@@ -114,14 +104,6 @@
           <artifactId>httpclient</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcpkix-jdk15on</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcprov-jdk15on</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>org.tensorflow</groupId>
           <artifactId>proto</artifactId>
         </exclusion>
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 811af33ff8c..9128d1033be 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -143,11 +143,6 @@
       <artifactId>httpclient</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
   <properties>
     <!-- These versions must be the ones used by the current jersey version (see vespa_jersey2/target/dependency).
diff --git a/container-test/pom.xml b/container-test/pom.xml
index 26f02767062..845660f638b 100644
--- a/container-test/pom.xml
+++ b/container-test/pom.xml
@@ -101,14 +101,5 @@
       <artifactId>commons-digester</artifactId>
       <version>1.8</version>
     </dependency>
-    <!-- Required for both jdisc_http_service and container-disc -->
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-    </dependency>
   </dependencies>
 </project>
diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index c1664981657..954475508d3 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -100,13 +100,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- required for Athenz libraries -->
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <!-- compile -->
 
         <dependency>
diff --git a/docker-api/pom.xml b/docker-api/pom.xml
index e2ddd8dbcc9..e82bc86d349 100644
--- a/docker-api/pom.xml
+++ b/docker-api/pom.xml
@@ -73,6 +73,14 @@
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>httpclient</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcpkix-jdk15on</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/jdisc_http_service/CMakeLists.txt b/jdisc_http_service/CMakeLists.txt
index 8ac0b5e80fb..3b1956e16de 100644
--- a/jdisc_http_service/CMakeLists.txt
+++ b/jdisc_http_service/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(jdisc_http_service)
+install_java_artifact_dependencies(jdisc_http_service)
 
 install_config_definition(src/main/resources/configdefinitions/jdisc.http.client.http-client.def)
 install_config_definition(src/main/resources/configdefinitions/jdisc.http.connector.def)
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml
index a1482669b39..6373189e738 100644
--- a/jdisc_http_service/pom.xml
+++ b/jdisc_http_service/pom.xml
@@ -19,12 +19,12 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
@@ -176,6 +176,8 @@
         <configuration>
           <discPreInstallBundle>
             asm-debug-all-${asm-debug-all.version}.jar,
+            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,
@@ -192,6 +194,22 @@
           </discPreInstallBundle>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.bouncycastle</includeGroupIds>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index e9f1dcdbfa1..b5e21ce7385 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -132,16 +132,6 @@
             <artifactId>velocity</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -163,23 +153,6 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/node-admin-app/components</outputDirectory>
-                            <includeArtifactIds>bcprov-jdk15on,bcpkix-jdk15on</includeArtifactIds>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/node-repository/pom.xml b/node-repository/pom.xml
index 0959b5cc5b8..8efd4099773 100644
--- a/node-repository/pom.xml
+++ b/node-repository/pom.xml
@@ -77,6 +77,16 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <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>
 
         <!-- compile -->
         <dependency>
@@ -95,10 +105,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index cbcc218b27d..465771de9cf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -668,16 +668,6 @@
                 <version>2.11.0</version>
             </dependency>
             <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15on</artifactId>
-                <version>${bouncycastle.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
-                <version>${bouncycastle.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>com.ibm.icu</groupId>
                 <artifactId>icu4j</artifactId>
                 <version>57.1</version>
@@ -708,7 +698,6 @@
         <asm-debug-all.version>5.0.3</asm-debug-all.version>
         <!-- Athenz dependencies. Make sure these dependencies matches those in Vespa's internal repositories -->
         <athenz.version>1.7.43</athenz.version>
-        <bouncycastle.version>1.58</bouncycastle.version>
         <commons-lang.version>2.6</commons-lang.version>
         <!-- WARNING: If you change curator version, you also need to update
                  zkfacade/src/main/java/org/apache/curator/**/package-info.java
diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml
index 33f1977c7e2..9c2cc236c2a 100755
--- a/provided-dependencies/pom.xml
+++ b/provided-dependencies/pom.xml
@@ -34,14 +34,20 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
-      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec
index fb66c76ba0e..d2140814d92 100644
--- a/standalone-container/vespa-standalone-container.spec
+++ b/standalone-container/vespa-standalone-container.spec
@@ -29,6 +29,7 @@ declare jars_dir=%buildroot%_prefix/lib/jars
 mkdir -p "$jars_dir"
 
 declare -a dirs=(
+  jdisc_http_service/target/dependency
   jdisc_jetty/target/dependency
   vespa_jersey2/target/dependency
 )
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index 31e56f76dd2..835c9bb178c 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -58,6 +58,10 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcpkix-jdk15on</artifactId>
+                </exclusion>
                 <!-- Exclude all Jersey bundles provided by JDisc -->
                 <exclusion>
                     <groupId>org.glassfish.jersey.core</groupId>