Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Bazel: Use junit_test instead of java_test
Change-Id: I07ea4e715a435ead03c8895cb57db5dfc921bd68
diff --git a/BUILD b/BUILD
index ce2e923..93bb716 100644
--- a/BUILD
+++ b/BUILD
@@ -1,9 +1,11 @@
+load("@rules_java//java:defs.bzl", "java_library")
load(
"//tools/bzl:plugin.bzl",
"PLUGIN_DEPS",
"PLUGIN_TEST_DEPS",
"gerrit_plugin",
)
+load("//tools/bzl:junit.bzl", "junit_tests")
gerrit_plugin(
name = "verify-status",
@@ -21,12 +23,11 @@
resources = glob(["src/main/**/*"]),
)
-java_test(
+junit_tests(
name = "verify-status_tests",
size = "small",
srcs = ["src/test/java/com/googlesource/gerrit/plugins/verifystatus/VerifyStatusIT.java"],
tags = ["verify-status"],
- test_class = "com.googlesource.gerrit.plugins.verifystatus.VerifyStatusIT",
deps = [
":verify-status__plugin_test_deps",
],