Merge changes I6143263b,I0deada50 into stable-3.1 * changes: Acceptance BUILD: Fix plugin standalone test exec Bazel: Reduce size of gerrit-acceptance-framework artifact
diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD index 812d089..e719f83 100644 --- a/java/com/google/gerrit/acceptance/BUILD +++ b/java/com/google/gerrit/acceptance/BUILD
@@ -7,6 +7,79 @@ "testsuite/ThrowingFunction.java", ] +DEPLOY_ENV = [ + "//java/com/google/gerrit/exceptions", + "//java/com/google/gerrit/gpg", + "//java/com/google/gerrit/git", + "//java/com/google/gerrit/index:query_exception", + "//java/com/google/gerrit/launcher", + "//java/com/google/gerrit/lifecycle", + "//java/com/google/gerrit/common:annotations", + "//java/com/google/gerrit/common:server", + "//java/com/google/gerrit/entities", + "//java/com/google/gerrit/extensions:api", + "//java/com/google/gerrit/httpd", + "//java/com/google/gerrit/index", + "//java/com/google/gerrit/index/project", + "//java/com/google/gerrit/json", + "//java/com/google/gerrit/lucene", + "//java/com/google/gerrit/mail", + "//java/com/google/gerrit/metrics", + "//java/com/google/gerrit/server", + "//java/com/google/gerrit/server/audit", + "//java/com/google/gerrit/server/git/receive", + "//java/com/google/gerrit/server/logging", + "//java/com/google/gerrit/server/restapi", + "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/git", + "//java/com/google/gerrit/server/util/time", + "//java/com/google/gerrit/sshd", + "//lib/auto:auto-value", + "//lib/auto:auto-value-annotations", + "//lib:args4j", + "//lib:gson", + "//lib:guava-retrying", + "//lib:jgit", + "//lib:jsch", + "//lib/commons:compress", + "//lib/commons:lang", + "//lib/flogger:api", + "//lib/guice", + "//lib/guice:guice-assistedinject", + "//lib/guice:guice-servlet", + "//lib/mail", + "//lib/mina:sshd", + "//lib/log:impl-log4j", + "//lib/log:log4j", + "//lib:guava", + "//lib/bouncycastle:bcpg", + "//lib/bouncycastle:bcprov", + "//prolog:gerrit-prolog-common", +] + +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/testsuite/project", + "//java/com/google/gerrit/server/group/testing", + "//java/com/google/gerrit/server/project/testing:project-test-util", + "//java/com/google/gerrit/testing:gerrit-test-util", + "//java/com/google/gerrit/extensions/common/testing:common-test-util", + "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util", + "//java/com/google/gerrit/gpg/testing:gpg-test-util", + "//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, @@ -15,61 +88,25 @@ visibility = ["//visibility:public"], exports = [ ":framework-lib", - "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/entities", - "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/extensions/common/testing:common-test-util", - "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util", - "//java/com/google/gerrit/git", - "//java/com/google/gerrit/git/testing", - "//java/com/google/gerrit/gpg/testing:gpg-test-util", - "//java/com/google/gerrit/httpd", - "//java/com/google/gerrit/index", - "//java/com/google/gerrit/json", - "//java/com/google/gerrit/launcher", - "//java/com/google/gerrit/lucene", - "//java/com/google/gerrit/mail", - "//java/com/google/gerrit/metrics", - "//java/com/google/gerrit/pgm", - "//java/com/google/gerrit/pgm/init", - "//java/com/google/gerrit/pgm/util", - "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server/audit", - "//java/com/google/gerrit/server/git/receive", - "//java/com/google/gerrit/server/project/testing:project-test-util", - "//java/com/google/gerrit/server/restapi", - "//java/com/google/gerrit/sshd", - "//java/com/google/gerrit/testing:gerrit-test-util", - "//java/com/google/gerrit/truth", - "//lib:args4j", - "//lib:gson", - "//lib:guava-retrying", - "//lib:h2", - "//lib:jgit", - "//lib:jimfs", - "//lib:jsch", - "//lib:servlet-api-without-neverlink", - "//lib/bouncycastle:bcpg", - "//lib/bouncycastle:bcprov", - "//lib/commons:compress", - "//lib/flogger:api", - "//lib/guice", - "//lib/guice:guice-assistedinject", - "//lib/guice:guice-servlet", - "//lib/mina:sshd", - "//prolog:gerrit-prolog-common", - ], + ] + DEPLOY_ENV + TEST_DEPS, ) java_binary( name = "framework", testonly = True, + deploy_env = [":framework-deploy-env"], main_class = "Dummy", visibility = ["//visibility:public"], runtime_deps = [":framework-lib"], ) +java_binary( + name = "framework-deploy-env", + testonly = True, + main_class = "Dummy", + runtime_deps = DEPLOY_ENV + PGM_DEPLOY_ENV, +) + java_library2( name = "framework-lib", testonly = True, @@ -79,71 +116,19 @@ ), exported_deps = [ ":function", - "//java/com/google/gerrit/acceptance/testsuite/project", - "//java/com/google/gerrit/exceptions", - "//java/com/google/gerrit/gpg", - "//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:daemon", - "//java/com/google/gerrit/pgm/http/jetty", - "//java/com/google/gerrit/pgm/util", - "//java/com/google/gerrit/server/group/testing", - "//java/com/google/gerrit/server/project/testing:project-test-util", - "//java/com/google/gerrit/testing:gerrit-test-util", - "//lib:guava", "//lib:jgit-junit", "//lib:jimfs", - "//lib/auto:auto-value", - "//lib/auto:auto-value-annotations", + "//lib:servlet-api", "//lib/httpcomponents:fluent-hc", "//lib/httpcomponents:httpclient", "//lib/httpcomponents:httpcore", - "//lib/jetty:servlet", - "//lib/log:impl-log4j", - "//lib/log:log4j", "//lib/mockito", "//lib/truth", "//lib/truth:truth-java8-extension", - "//prolog:gerrit-prolog-common", - ], - visibility = ["//visibility:public"], - deps = [ - "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/entities", - "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/httpd", - "//java/com/google/gerrit/index", - "//java/com/google/gerrit/index/project", - "//java/com/google/gerrit/json", - "//java/com/google/gerrit/lucene", - "//java/com/google/gerrit/mail", - "//java/com/google/gerrit/metrics", - "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server/audit", - "//java/com/google/gerrit/server/git/receive", - "//java/com/google/gerrit/server/logging", - "//java/com/google/gerrit/server/restapi", - "//java/com/google/gerrit/server/schema", - "//java/com/google/gerrit/server/util/git", - "//java/com/google/gerrit/server/util/time", - "//java/com/google/gerrit/sshd", - "//lib:args4j", - "//lib:gson", - "//lib:guava-retrying", - "//lib:jgit", - "//lib:jsch", - "//lib:servlet-api", - "//lib/commons:lang", "//lib/greenmail", - "//lib/guice", - "//lib/guice:guice-assistedinject", - "//lib/guice:guice-servlet", - "//lib/mail", - "//lib/mina:sshd", - ], + ] + TEST_DEPS, + visibility = ["//visibility:public"], + deps = DEPLOY_ENV, ) java_library(
diff --git a/java/com/google/gerrit/extensions/BUILD b/java/com/google/gerrit/extensions/BUILD index 3683449..da5dc8b 100644 --- a/java/com/google/gerrit/extensions/BUILD +++ b/java/com/google/gerrit/extensions/BUILD
@@ -26,7 +26,6 @@ ], ) -#TODO(davido): There is no provided_deps argument to java_library rule java_library( name = "api", srcs = glob(["**/*.java"]),
diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD index ee1aede..aa4df82 100644 --- a/java/com/google/gerrit/pgm/BUILD +++ b/java/com/google/gerrit/pgm/BUILD
@@ -1,17 +1,7 @@ load("@rules_java//java:defs.bzl", "java_library") -# TODO(davido): This indirection doesn't avoid unwanted depdencies -# in acceptance-framework and should be removed. Instead, provided_deps -# should be used, once https://github.com/bazelbuild/bazel/issues/1402 -# is fixed. -alias( - name = "pgm", - actual = ":daemon", - visibility = ["//visibility:public"], -) - java_library( - name = "daemon", + name = "pgm", srcs = glob(["**/*.java"]), resource_strip_prefix = "resources", resources = ["//resources/com/google/gerrit/pgm"],
diff --git a/lib/BUILD b/lib/BUILD index 39c622a..2e5668e 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__", ],