Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Expose jsr305 in plugin API
  Bazel: Fix another usage of tools in action inputs

Change-Id: Ib8fb741c3800c44f3d6dd7f3ce9a785e4b45b026

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",

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,