Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Remove omit_rules_java in call to closure_repositories
  Set version to 2.15.18-SNAPSHOT
  Set version to 2.15.17
  .bazelrc: Update 'strict_action_env' flag
  Add caveat about plugin branches in the list of plugins
  Doc: Clarify sshd.backend description
  Bazel: Bump rules_closure to 3.10.0-rc1
  Bazel: Remove duplicate bazel_toolchains fetching

Change-Id: Ibb4c6baa4d225bd942d07bf88dce9b7365f23bde

.bazelrc

@@ -1,10 +1,16 @@
 build --workspace_status_command=./tools/workspace-status.sh --strategy=Closure=worker
 build --repository_cache=~/.gerritcodereview/bazel-cache/repository
-build --experimental_strict_action_env
 build --action_env=PATH
 build --disk_cache=~/.gerritcodereview/bazel-cache/cas
 build --java_toolchain //tools:error_prone_warnings_toolchain
 
+# Enable strict_action_env flag to. For more information on this feature see
+# https://groups.google.com/forum/#!topic/bazel-discuss/_VmRfMyyHBk.
+# This will be the new default behavior at some point (and the flag was flipped
+# shortly in 0.21.0 - https://github.com/bazelbuild/bazel/issues/7026). Remove
+# this flag here once flipped in Bazel again.
+build --incompatible_strict_action_env
+
 test --build_tests_only
 test --test_output=errors
 

Documentation/config-gerrit.txt

@@ -4432,8 +4432,8 @@ By default, `false`.
 [[sshd.backend]]sshd.backend::
 +
 Starting from version 0.9.0 Apache SSHD project added support for NIO2
-IoSession. To use the new NIO2 session the `backend` option must be set
+IoSession. To use the old MINA session the `backend` option must be set
-to `NIO2`. Otherwise, this option must be set to `MINA`.
+to `MINA`.
 +
 By default, `NIO2`.
 

Documentation/config-plugins.txt

@@ -39,6 +39,10 @@ installed during the link:pgm-init.html[Gerrit initialization].
 The core plugins are developed and maintained by the Gerrit maintainers
 and the Gerrit community.
 
+Note that the documentation and configuration links in the list below are
+to the plugins' master branch. Please refer to the appropriate branch or
+revision for the Gerrit version you are using.
+
 [[codemirror-editor]]
 === codemirror-editor
 
@@ -138,6 +142,12 @@ list may not be complete. You may discover more plugins on
 link:https://gerrit-review.googlesource.com/admin/repos/?filter=plugins%252F[
 gerrit-review].
 
+Note that the documentation and configuration links in the list below are
+to the plugins' master branch. Please refer to the appropriate branch for
+the Gerrit version you are using. Be aware that in some cases a stable
+branch might not exist when the master branch is compatible with multiple
+versions, or the plugin might not be compatible at all with your version.
+
 [[admin-console]]
 === admin-console
 

WORKSPACE

@@ -24,23 +24,6 @@ load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
 # otherwise refer to RBE docs.
 rbe_autoconfig(name = "rbe_default")
 
-http_archive(
-    name = "bazel_toolchains",
-    sha256 = "88e818f9f03628eef609c8429c210ecf265ffe46c2af095f36c7ef8b1855fef5",
-    strip_prefix = "bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz",
-        "https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz",
-    ],
-)
-
-load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
-
-# Creates a default toolchain config for RBE.
-# Use this as is if you are using the rbe_ubuntu16_04 container,
-# otherwise refer to RBE docs.
-rbe_autoconfig(name = "rbe_default")
-
 http_archive(
     name = "bazel_skylib",
     sha256 = "2ea8a5ed2b448baf4a6855d3ce049c4c452a6470b1efd1504fdb7c1c134d220a",
@@ -50,9 +33,9 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_closure",
-    sha256 = "d075b084e6f4109d1b1ab877495ac72c1a6c4dbc593980967e0b7359f4254d7e",
+    sha256 = "39b7bec43e6178d065875987b18623d476acd54f355d7711ce9dce4a3eec0795",
-    strip_prefix = "rules_closure-78f1192664acf66ca1de24116cbcc98e1698f26b",
+    strip_prefix = "rules_closure-0.25",
-    urls = ["https://github.com/bazelbuild/rules_closure/archive/78f1192664acf66ca1de24116cbcc98e1698f26b.tar.gz"],
+    urls = ["https://github.com/davido/rules_closure/archive/v0.25.tar.gz"],
 )
 
 # File is specific to Polymer and copied from the Closure Github -- should be
@@ -74,6 +57,17 @@ load("@bazelisk_version//:check.bzl", "check_bazel_version")
 
 check_bazel_version()
 
+# Protobuf rules support
+http_archive(
+    name = "rules_proto",
+    sha256 = "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
+    strip_prefix = "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
+        "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
+    ],
+)
+
 # Rules Python
 http_archive(
     name = "rules_python",
@@ -86,7 +80,7 @@ load("@rules_python//python:repositories.bzl", "py_repositories")
 
 py_repositories()
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
+load("@io_bazel_rules_closure//closure:repositories.bzl", "closure_repositories")
 
 # Prevent redundant loading of dependencies.
 # TODO(davido): Omit re-fetching ancient args4j version when these PRs are merged:
@@ -96,6 +90,7 @@ closure_repositories(
     omit_aopalliance = True,
     omit_bazel_skylib = True,
     omit_javax_inject = True,
+    omit_rules_cc = True,
 )
 
 # Golang support for PolyGerrit local dev server.