Merge branch 'stable-2.14'

* stable-2.14:
  Don't ship bouncycastle libraries in plugin API

Change-Id: I2cecc4784c1821a89313bf71b998943df0a449cc

gerrit-acceptance-tests/tests.bzl

@@ -10,8 +10,6 @@ def acceptance_tests(
     name = group,
     deps = deps + [
       '//gerrit-acceptance-tests:lib',
-      "//lib/bouncycastle:bcpkix",
-      "//lib/bouncycastle:bcpg",
     ],
     tags = labels + [
       'acceptance',

gerrit-gpg/BUILD

@@ -19,8 +19,8 @@ java_library(
     srcs = glob(["src/main/java/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = DEPS + [
-        "//lib/bouncycastle:bcpg",
-        "//lib/bouncycastle:bcprov",
+        "//lib/bouncycastle:bcpg-neverlink",
+        "//lib/bouncycastle:bcprov-neverlink",
     ],
 )
 
@@ -32,9 +32,9 @@ java_library(
     srcs = TESTUTIL_SRCS,
     visibility = ["//visibility:public"],
     deps = DEPS + [
+        "//lib/bouncycastle:bcpg-neverlink",
+        "//lib/bouncycastle:bcprov-neverlink",
         ":gpg",
-        "//lib/bouncycastle:bcpg",
-        "//lib/bouncycastle:bcprov",
     ],
 )
 

gerrit-server/BUILD

@@ -55,8 +55,8 @@ java_library(
         "//lib:velocity",
         "//lib/antlr:java_runtime",
         "//lib/auto:auto-value",
-        "//lib/bouncycastle:bcpkix",
-        "//lib/bouncycastle:bcprov",
+        "//lib/bouncycastle:bcpkix-neverlink",
+        "//lib/bouncycastle:bcprov-neverlink",
         "//lib/commons:codec",
         "//lib/commons:compress",
         "//lib/commons:dbcp",
@@ -247,6 +247,7 @@ junit_tests(
         "//lib:guava-retrying",
         "//lib:protobuf",
         "//lib/bouncycastle:bcprov",
+        "//lib/bouncycastle:bcpkix",
         "//lib/dropwizard:dropwizard-core",
         "//lib/guice:guice-assistedinject",
         "//lib/prolog:runtime",

gerrit-sshd/BUILD

@@ -23,7 +23,7 @@ java_library(
         "//lib:jsch",
         "//lib:servlet-api-3_1",
         "//lib/auto:auto-value",
-        "//lib/bouncycastle:bcprov",
+        "//lib/bouncycastle:bcprov-neverlink",
         "//lib/commons:codec",
         "//lib/dropwizard:dropwizard-core",
         "//lib/guice",

lib/bouncycastle/BUILD

@@ -18,3 +18,27 @@ java_library(
     visibility = ["//visibility:public"],
     exports = ["@bcpkix//jar"],
 )
+
+java_library(
+    name = "bcprov-neverlink",
+    data = ["//lib:LICENSE-bouncycastle"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@bcprov//jar"],
+)
+
+java_library(
+    name = "bcpg-neverlink",
+    data = ["//lib:LICENSE-bouncycastle"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@bcpg//jar"],
+)
+
+java_library(
+    name = "bcpkix-neverlink",
+    data = ["//lib:LICENSE-bouncycastle"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@bcpkix//jar"],
+)

tools/bzl/pkg_war.bzl

@@ -21,6 +21,9 @@ LIBS = [
     "//gerrit-war:log4j-config",
     "//gerrit-war:version",
     "//lib:postgresql",
+    "//lib/bouncycastle:bcpkix",
+    "//lib/bouncycastle:bcprov",
+    "//lib/bouncycastle:bcpg",
     "//lib/log:impl_log4j",
 ]
 

tools/bzl/plugin.bzl

@@ -12,7 +12,12 @@ load(
 
 PLUGIN_DEPS = ["//gerrit-plugin-api:lib"]
 
-PLUGIN_TEST_DEPS = ["//gerrit-acceptance-framework:lib"]
+PLUGIN_TEST_DEPS = [
+    "//gerrit-acceptance-framework:lib",
+    "//lib/bouncycastle:bcpg",
+    "//lib/bouncycastle:bcpkix",
+    "//lib/bouncycastle:bcprov",
+]
 
 def gerrit_plugin(
     name,