diff --git a/plugins/BUILD b/plugins/BUILD
index 12d9c24509..1efffdc5f8 100644
--- a/plugins/BUILD
+++ b/plugins/BUILD
@@ -62,6 +62,7 @@ EXPORTS = [
     "//lib/jackson:jackson-core",
     "//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",
     "//lib/jgit/org.eclipse.jgit:jgit",
+    "//lib:jsr305",
     "//lib/log:api",
     "//lib/log:log4j",
     "//lib/mina:sshd",
diff --git a/tools/bzl/asciidoc.bzl b/tools/bzl/asciidoc.bzl
index 825ac98def..f3c4646b2b 100644
--- a/tools/bzl/asciidoc.bzl
+++ b/tools/bzl/asciidoc.bzl
@@ -100,8 +100,9 @@ def _asciidoc_impl(ctx):
     ]
     args.extend(_generate_asciidoc_args(ctx))
     ctx.actions.run(
-        inputs = ctx.files.srcs + [ctx.executable._exe, ctx.file.version],
+        inputs = ctx.files.srcs + [ctx.file.version],
         outputs = ctx.outputs.outs,
+        tools = [ctx.executable._exe],
         executable = ctx.executable._exe,
         arguments = args,
         progress_message = "Rendering asciidoctor files for %s" % ctx.label.name,