Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Remove duplication of sha1 values; reuse arguments
  Unwrap `load` lines in README.md
  Allow plugins to override default API versions
  Dedupe gerrit_api and gerrit_api_maven_local
  Switch examples from GitHub to Gerrit Review
  Clarify that one needs to call gerrit_api in the README.md
  Re-format example directory tree in README.md

Update the gerrit_api README example so it fits with this target branch.

Change-Id: I9dac03faf80e3bb52ba416843cddb6a057f3fcc6
diff --git a/README.md b/README.md
index 3f0d7de..725a35d 100644
--- a/README.md
+++ b/README.md
@@ -36,9 +36,9 @@
 
 ```python
 load("@com_googlesource_gerrit_bazlets//:gerrit_api.bzl", "gerrit_api")
-gerrit_api(version = "3.0.9",
-           plugin_api_sha1 = "dbcadf2c198b1ee1b74678855e8e10b2c403de1f",
-           acceptance_framework_sha1 = "799cb104f2c0de4394528e38ad487557dd69bb49")
+gerrit_api(version = "3.1.6",
+           plugin_api_sha1 = "e57f6465c9805f568082bffffd61a2771f10d68a",
+           acceptance_framework_sha1 = "ebfd50383f8593678b451c81dbc332db8e8da188")
 ```
 
 If the version ends in `-SNAPSHOT`, the jars are consumed from the local
@@ -47,7 +47,7 @@
 
 ```python
 load("@com_googlesource_gerrit_bazlets//:gerrit_api.bzl", "gerrit_api")
-gerrit_api(version = "3.0.10-SNAPSHOT")
+gerrit_api(version = "3.1.7-SNAPSHOT")
 ```
 
 <a name="basic-example"></a>
diff --git a/gerrit_api.bzl b/gerrit_api.bzl
index a12aed4..332a493 100644
--- a/gerrit_api.bzl
+++ b/gerrit_api.bzl
@@ -7,9 +7,9 @@
 gerrit_api is rule for fetching Gerrit plugin API using Bazel.
 """
 
-def gerrit_api(version = "3.0.10",
-               plugin_api_sha1 = "90df648d9ef9e1a953e253972d9922fc1b753f83",
-               acceptance_framework_sha1 = "9c30ee281fa9016d460d16dd08a87ef16cedbf84"):
+def gerrit_api(version = "3.1.6",
+               plugin_api_sha1 = "e57f6465c9805f568082bffffd61a2771f10d68a",
+               acceptance_framework_sha1 = "ebfd50383f8593678b451c81dbc332db8e8da188"):
     gerrit_api_version(
         name = "gerrit_api_version",
         version = version,