From 9c7428264769e9c211c0cf23a2d6ec9406be791b Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Fri, 22 Nov 2019 21:40:13 -0800
Subject: [PATCH 1/2] Bazel: Consistently use bazelisk during publishing of
 artifacts

Change-Id: I1e3d7ceaf7908f3b53a5b11a257aa752eaec066e
---
 tools/maven/package.bzl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/maven/package.bzl b/tools/maven/package.bzl
index 5b497f83b6..ce60db9ebc 100644
--- a/tools/maven/package.bzl
+++ b/tools/maven/package.bzl
@@ -17,6 +17,14 @@ sh_bang_template = (" && ".join([
     "echo \"# this script should run from the root of your workspace.\" >> $@",
     "echo \"set -e\" >> $@",
     "echo \"\" >> $@",
+    "echo 'function bazel_cmd() {' >> $@",
+    "echo '  if [[ `which bazelisk` ]]; then' >> $@",
+    "echo '    bazelisk \"$$@\"' >> $@",
+    "echo '  else' >> $@",
+    "echo '    bazel \"$$@\"' >> $@",
+    "echo '  fi' >> $@",
+    "echo '}' >> $@",
+    "echo \"\" >> $@",
     "echo 'if [[ \"$$VERBOSE\" ]]; then set -x ; fi' >> $@",
     "echo \"\" >> $@",
     "echo %s >> $@",
@@ -32,7 +40,7 @@ def maven_package(
         src = {},
         doc = {},
         war = {}):
-    build_cmd = ["bazel", "build"]
+    build_cmd = ["bazel_cmd", "build"]
     mvn_cmd = ["python", "tools/maven/mvn.py", "-v", version]
     api_cmd = mvn_cmd[:]
     api_targets = []

From ea1f0165ade2a370e69d6e2cb527907f797c31a5 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Sat, 23 Nov 2019 14:10:45 +0900
Subject: [PATCH 2/2] Bump bazel version to 1.2.0

See the release notes [1] for details.

[1] https://blog.bazel.build/2019/11/20/bazel-1.2.0.html

Change-Id: Ice7301db98ece2b6fc214f9abe6c09bf630b67d1
---
 .bazelversion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bazelversion b/.bazelversion
index 9084fa2f71..26aaba0e86 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-1.1.0
+1.2.0