Merge "Don't ship bouncycastle libraries in plugin API" into stable-2.14
diff --git a/gerrit-acceptance-tests/tests.bzl b/gerrit-acceptance-tests/tests.bzl
index 3b1a4f4..594e583 100644
--- a/gerrit-acceptance-tests/tests.bzl
+++ b/gerrit-acceptance-tests/tests.bzl
@@ -10,8 +10,6 @@
name = group,
deps = deps + [
'//gerrit-acceptance-tests:lib',
- "//lib/bouncycastle:bcpkix",
- "//lib/bouncycastle:bcpg",
],
tags = labels + [
'acceptance',
diff --git a/gerrit-gpg/BUILD b/gerrit-gpg/BUILD
index 1d949d1..680071f 100644
--- a/gerrit-gpg/BUILD
+++ b/gerrit-gpg/BUILD
@@ -19,8 +19,8 @@
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 @@
srcs = TESTUTIL_SRCS,
visibility = ["//visibility:public"],
deps = DEPS + [
+ "//lib/bouncycastle:bcpg-neverlink",
+ "//lib/bouncycastle:bcprov-neverlink",
":gpg",
- "//lib/bouncycastle:bcpg",
- "//lib/bouncycastle:bcprov",
],
)
diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
index a8ac50d..adfe7a4 100644
--- a/gerrit-server/BUILD
+++ b/gerrit-server/BUILD
@@ -55,8 +55,8 @@
"//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",
@@ -230,6 +230,7 @@
"//lib:guava-retrying",
"//lib:protobuf",
"//lib/bouncycastle:bcprov",
+ "//lib/bouncycastle:bcpkix",
"//lib/dropwizard:dropwizard-core",
"//lib/guice:guice-assistedinject",
"//lib/prolog:runtime",
diff --git a/gerrit-sshd/BUILD b/gerrit-sshd/BUILD
index 2288e5d..db27f02 100644
--- a/gerrit-sshd/BUILD
+++ b/gerrit-sshd/BUILD
@@ -23,7 +23,7 @@
"//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",
diff --git a/lib/bouncycastle/BUILD b/lib/bouncycastle/BUILD
index 746a982..cf3e996 100644
--- a/lib/bouncycastle/BUILD
+++ b/lib/bouncycastle/BUILD
@@ -18,3 +18,27 @@
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"],
+)
diff --git a/tools/bzl/pkg_war.bzl b/tools/bzl/pkg_war.bzl
index 7eebcd3..edaaab0 100644
--- a/tools/bzl/pkg_war.bzl
+++ b/tools/bzl/pkg_war.bzl
@@ -21,6 +21,9 @@
"//gerrit-war:log4j-config",
"//gerrit-war:version",
"//lib:postgresql",
+ "//lib/bouncycastle:bcpkix",
+ "//lib/bouncycastle:bcprov",
+ "//lib/bouncycastle:bcpg",
"//lib/log:impl_log4j",
]
diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index de82af8..59e7335 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -12,7 +12,12 @@
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,
