Format build files using buildifier Release-Notes: skip Change-Id: I67afcff877e2f14574c15e7d60d7bf2a70c59d1e
diff --git a/BUILD b/BUILD index 9bd469c..0888a81 100644 --- a/BUILD +++ b/BUILD
@@ -1,16 +1,17 @@ +load("@rules_antlr//antlr:antlr4.bzl", "antlr") +load("@rules_java//java:defs.bzl", "java_library", "java_plugin") +load("//tools/bzl:js.bzl", "gerrit_js_bundle") +load("//tools/bzl:junit.bzl", "junit_tests") load( "//tools/bzl:plugin.bzl", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "gerrit_plugin", ) -load("//tools/bzl:js.bzl", "gerrit_js_bundle") load("//tools/js:eslint.bzl", "eslint") -load("//tools/bzl:junit.bzl", "junit_tests") -load("@rules_java//java:defs.bzl", "java_library", "java_plugin") -load("@rules_antlr//antlr:antlr4.bzl", "antlr") plugin_name = "task" + test_factory_provider_plugin_name = "names-factory-provider" java_plugin( @@ -47,6 +48,12 @@ gerrit_plugin( name = plugin_name, srcs = glob(["src/main/java/**/*.java"]), + javacopts = [ + "-Werror", + "-Xlint:all", + "-Xlint:-classfile", + "-Xlint:-processing", + ], manifest_entries = [ "Gerrit-PluginName: " + plugin_name, "Implementation-Title: Task Plugin", @@ -60,7 +67,6 @@ ":task_reference_parser", "@antlr4_runtime//jar", ], - javacopts = [ "-Werror", "-Xlint:all", "-Xlint:-classfile", "-Xlint:-processing"], ) gerrit_js_bundle( @@ -78,8 +84,8 @@ gerrit_plugin( name = test_factory_provider_plugin_name, - dir_name = plugin_name, srcs = ["src/main/java/com/googlesource/gerrit/plugins/task/extensions/PluginProvidedTaskNamesFactory.java"] + glob(["src/test/java/**/names_factory_provider/*.java"]), + dir_name = plugin_name, manifest_entries = [ "Gerrit-PluginName: " + test_factory_provider_plugin_name, "Gerrit-Module: com.googlesource.gerrit.plugins.names_factory_provider.Module", @@ -91,8 +97,19 @@ name = "docker-tests", size = "medium", srcs = ["test/docker/run.sh"], - args = ["--gerrit-war", "$(location //:gerrit.war)", "--task-plugin-jar", "$(location :task)", "--names-factory-provider-plugin-jar", "$(location :names-factory-provider)"], - data = ["//:gerrit.war", plugin_name, test_factory_provider_plugin_name] + glob(["test/**"]) + glob(["src/main/resources/Documentation/*"]), + args = [ + "--gerrit-war", + "$(location //:gerrit.war)", + "--task-plugin-jar", + "$(location :task)", + "--names-factory-provider-plugin-jar", + "$(location :names-factory-provider)", + ], + data = [ + "//:gerrit.war", + plugin_name, + test_factory_provider_plugin_name, + ] + glob(["test/**"]) + glob(["src/main/resources/Documentation/*"]), local = True, tags = ["docker"], )
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index f33e277..0e645d8 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -1,5 +1,5 @@ -load("//tools/bzl:maven_jar.bzl", "maven_jar") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("//tools/bzl:maven_jar.bzl", "maven_jar") def external_plugin_deps(): AUTO_VALUE_VERSION = "1.7.4"