Merge branch 'stable-3.1'
* stable-3.1:
Acceptance BUILD: Fix plugin standalone test exec
Bazel: Reduce size of gerrit-acceptance-framework artifact
Change-Id: I42dc463ee92f662ed6169c56670d1af2eb3c9c9f
diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD
index b23aca1..89d1f3d 100644
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@@ -10,13 +10,9 @@
"//java/com/google/gerrit/exceptions",
"//java/com/google/gerrit/gpg",
"//java/com/google/gerrit/git",
- "//java/com/google/gerrit/httpd/auth/openid",
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/launcher",
"//java/com/google/gerrit/lifecycle",
- "//java/com/google/gerrit/pgm",
- "//java/com/google/gerrit/pgm/http/jetty",
- "//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/entities",
@@ -50,7 +46,6 @@
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
- "//lib/jetty:servlet",
"//lib/mail",
"//lib/mina:sshd",
"//lib/log:impl-log4j",
@@ -62,6 +57,10 @@
]
TEST_DEPS = [
+ "//java/com/google/gerrit/httpd/auth/openid",
+ "//java/com/google/gerrit/pgm",
+ "//java/com/google/gerrit/pgm/http/jetty",
+ "//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/truth",
"//java/com/google/gerrit/acceptance/config",
"//java/com/google/gerrit/acceptance/testsuite/project",
@@ -75,6 +74,13 @@
"//java/com/google/gerrit/git/testing",
]
+PGM_DEPLOY_ENV = [
+ "//lib:caffeine",
+ "//lib:caffeine-guava",
+ "//lib/jackson:jackson-core",
+ "//lib/prolog:cafeteria",
+]
+
java_library(
name = "lib",
testonly = True,
@@ -99,7 +105,7 @@
name = "framework-deploy-env",
testonly = True,
main_class = "Dummy",
- runtime_deps = DEPLOY_ENV,
+ runtime_deps = DEPLOY_ENV + PGM_DEPLOY_ENV,
)
exported_deps = [
diff --git a/lib/BUILD b/lib/BUILD
index 199f4fb..f0c0aad 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -114,6 +114,7 @@
name = "caffeine",
data = ["//lib:LICENSE-Apache2.0"],
visibility = [
+ "//java/com/google/gerrit/acceptance:__pkg__",
"//java/com/google/gerrit/server/cache/mem:__pkg__",
],
exports = ["@caffeine//jar"],
@@ -128,6 +129,7 @@
name = "caffeine-guava",
data = ["//lib:LICENSE-Apache2.0"],
visibility = [
+ "//java/com/google/gerrit/acceptance:__pkg__",
"//java/com/google/gerrit/server/cache/mem:__pkg__",
],
exports = [":caffeine-guava-renamed"],
diff --git a/lib/jackson/BUILD b/lib/jackson/BUILD
index 3eed77a..d5253a0 100644
--- a/lib/jackson/BUILD
+++ b/lib/jackson/BUILD
@@ -4,6 +4,7 @@
name = "jackson-core",
data = ["//lib:LICENSE-Apache2.0"],
visibility = [
+ "//java/com/google/gerrit/acceptance:__pkg__",
"//java/com/google/gerrit/elasticsearch:__pkg__",
"//plugins:__pkg__",
],