Merge branch 'stable-3.1'

* stable-3.1:
  Bazel: Remove even more unused dependencies
  Bazel: Remove more unused dependencies flagged by unused_deps
  Bazel: Remove unused dependencies flagged by unused_deps
  Bump bazel version to 1.2.0
  Bazel: Consistently use bazelisk during publishing of artifacts

Change-Id: Ia03a1ebd179228e4fb1f210b89c0f8ed3ae500ea

.bazelversion

@@ -1 +1 @@
-1.1.0
+1.2.0

java/com/google/gerrit/acceptance/BUILD

@@ -122,7 +122,6 @@ java_library2(
         "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/mail",
         "//java/com/google/gerrit/metrics",
-        "//java/com/google/gerrit/pgm/init",
         "//java/com/google/gerrit/server",
         "//java/com/google/gerrit/server/audit",
         "//java/com/google/gerrit/server/git/receive",

java/com/google/gerrit/httpd/init/BUILD

@@ -6,7 +6,6 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/gerrit/elasticsearch",
-        "//java/com/google/gerrit/entities",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/gpg",
         "//java/com/google/gerrit/httpd",

javatests/com/google/gerrit/acceptance/api/group/BUILD

@@ -19,7 +19,6 @@ java_library(
     name = "util",
     srcs = ["GroupAssert.java"],
     deps = [
-        "//java/com/google/gerrit/entities",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/server",
         "//lib/truth",

javatests/com/google/gerrit/common/BUILD

@@ -7,7 +7,6 @@ junit_tests(
     deps = [
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/common:version",
-        "//java/com/google/gerrit/entities",
         "//java/com/google/gerrit/launcher",
         "//lib:guava",
         "//lib/auto:auto-value",

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 = []