Merge pull request #210 from salesforce/plaird/toolchains

add jartools_toolchains attribute
salesforce · Oct 29, 2024 · 23c614b · 23c614b
2 parents 84ffa1e + 3964bd7
commit 23c614b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/springboot/springboot.bzl b/springboot/springboot.bzl
@@ -388,6 +388,7 @@ def springboot(
         visibility = None,
         bazelrun_addopens = [],
         bazelrun_addexports = [],
+        jartools_toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
         exclude = [], # deprecated
         classpath_index = "@rules_spring//springboot:empty.txt", # deprecated
         use_build_dependency_order = True, # deprecated
@@ -446,6 +447,7 @@ def springboot(
       tags: Optional. Bazel standard attribute.
       testonly: Optional. Bazel standard attribute. Defaults to False.
       visibility: Optional. Bazel standard attribute.
+      jartools_toolchains: Optional. Toolchains for running build tools like singlejar, override for obscure use cases. Default: ["@bazel_tools//tools/jdk:current_java_runtime"]
       exclude: Deprecated synonym of *deps_exclude*
       classpath_index: Deprecated synonym of *deps_index_file*
       use_build_dependency_order: Deprecated synonym of *deps_use_starlark_order*
@@ -514,7 +516,7 @@ def springboot(
         outs = [genmanifest_out],
         tags = tags,
         testonly = testonly,
-        toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],  # so that JAVABASE is computed
+        toolchains = jartools_toolchains,  # so that JAVABASE is computed
     )
 
     # SUBRULE 2B: GENERATE THE GIT PROPERTIES
@@ -577,7 +579,7 @@ def springboot(
         tags = tags,
         testonly = testonly,
         outs = [_get_springboot_jar_file_name(name)],
-        toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],  # so that JAVABASE is computed
+        toolchains = jartools_toolchains,  # so that JAVABASE is computed
         visibility = visibility,
     )
 

diff --git a/springboot/springboot_doc.md b/springboot/springboot_doc.md
@@ -45,6 +45,7 @@ Note that the rule README has more detailed usage instructions for each attribut
 | tags |  Optional. Bazel standard attribute.   |  <code>[]</code> |
 | testonly |  Optional. Bazel standard attribute. Defaults to False.   |  <code>False</code> |
 | visibility |  Optional. Bazel standard attribute.   |  <code>None</code> |
+| jartools_toolchains | Optional. Toolchains for running build tools like singlejar, override for obscure use cases. | <code>["@bazel_tools//tools/jdk:current_java_runtime"]</code> |
 | exclude |  Deprecated synonym of *deps_exclude*   |  <code>[]</code> |
 | classpath_index |  Deprecated synonym of *deps_index_file*   |  <code>"@rules_spring//springboot:empty.txt"</code> |
 | use_build_dependency_order |  Deprecated synonym of *deps_use_starlark_order*   |  <code>True</code> |