Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Minor improvements in receive.maxObjectSizeLimit documentation
  Bazel: Consume rules_closure from HEAD
  Bump auto-value to 1.6.2

Change-Id: I401942a40c5001300f77f9437d342001cd42e619

Documentation/config-gerrit.txt

@@ -3627,7 +3627,7 @@ Gerrit administrators can use this setting to prevent developers
 from pushing objects which are too large to Gerrit.
 +
 This setting can also be set in the `project.config`
-link:config-project-config.html[receive.maxObjectSizeLimit] in order
+(link:config-project-config.html[receive.maxObjectSizeLimit]) in order
 to further reduce the global setting. The project specific setting is
 only honored when it further reduces the global limit.
 +

Documentation/config-project-config.txt

@@ -136,9 +136,9 @@ is larger than the given size the pack-parsing will abort and the push
 operation will fail. If set to zero then there is no limit.
 +
 Project owners can use this setting to prevent developers from pushing
-objects which are too large to Gerrit. This setting can also be set it
-`gerrit.config` globally link:config-gerrit.html#receive.maxObjectSizeLimit[
-receive.maxObjectSizeLimit].
+objects which are too large to Gerrit. This setting can also be set in
+`gerrit.config` globally (link:config-gerrit.html#receive.maxObjectSizeLimit[
+receive.maxObjectSizeLimit]).
 +
 The project specific setting in `project.config` is only honored when it
 further reduces the global limit.

WORKSPACE

@@ -14,11 +14,9 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_closure",
-    build_file_content = "exports_files([\"0001-Replace-native-http-git-_archive-with-Skylark-rules.patch\"])",
-    patches = ["//:0001-Replace-native-http-git-_archive-with-Skylark-rules.patch"],
-    sha256 = "a80acb69c63d5f6437b099c111480a4493bad4592015af2127a2f49fb7512d8d",
-    strip_prefix = "rules_closure-0.7.0",
-    url = "https://github.com/bazelbuild/rules_closure/archive/0.7.0.tar.gz",
+    sha256 = "4dd84dd2bdd6c9f56cb5a475d504ea31d199c34309e202e9379501d01c3067e5",
+    strip_prefix = "rules_closure-3103a773820b59b76345f94c231cb213e0d404e2",
+    url = "https://github.com/bazelbuild/rules_closure/archive/3103a773820b59b76345f94c231cb213e0d404e2.tar.gz",
 )
 
 # File is specific to Polymer and copied from the Closure Github -- should be
@@ -440,10 +438,18 @@ maven_jar(
     sha1 = "b60e33a6bd0d71831e0c249816d01e6c1dd90a47",
 )
 
+AUTO_VALUE_VERSION = "1.6.2"
+
 maven_jar(
     name = "auto-value",
-    artifact = "com.google.auto.value:auto-value:1.4.1",
-    sha1 = "8172ebbd7970188aff304c8a420b9f17168f6f48",
+    artifact = "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION,
+    sha1 = "e7eae562942315a983eea3e191b72d755c153620",
+)
+
+maven_jar(
+    name = "auto-value-annotations",
+    artifact = "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION,
+    sha1 = "ed193d86e0af90cc2342aedbe73c5d86b03fa09b",
 )
 
 maven_jar(

gerrit-acceptance-framework/BUILD

@@ -53,6 +53,7 @@ java_library2(
         "//lib:truth",
         "//lib:truth-java8-extension",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/httpcomponents:fluent-hc",
         "//lib/httpcomponents:httpclient",
         "//lib/httpcomponents:httpcore",

gerrit-common/BUILD

@@ -82,5 +82,6 @@ junit_tests(
     deps = [
         "//lib:truth",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
     ],
 )

gerrit-httpd/BUILD

@@ -41,6 +41,7 @@ java_library(
         "//lib:servlet-api-3_1",
         "//lib:soy",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/commons:codec",
         "//lib/commons:lang",
         "//lib/guice",

gerrit-index/BUILD

@@ -55,6 +55,7 @@ java_library(
         "//lib:gwtorm",
         "//lib/antlr:java-runtime",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/jgit/org.eclipse.jgit:jgit",
         "//lib/log:api",
     ],

gerrit-pgm/BUILD

@@ -154,6 +154,7 @@ java_library(
         # We want all these deps to be provided_deps
         "//gerrit-launcher:launcher",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
     ],
 )
 

gerrit-server/BUILD

@@ -78,6 +78,7 @@ java_library(
         "//lib:tukaani-xz",
         "//lib:velocity",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/bouncycastle:bcpkix-neverlink",
         "//lib/bouncycastle:bcprov-neverlink",
         "//lib/commons:codec",
@@ -143,6 +144,7 @@ java_library(
         "//lib:guava",
         "//lib:gwtorm",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/guice",
         "//lib/guice:guice-assistedinject",
         "//lib/jgit/org.eclipse.jgit:jgit",
@@ -209,6 +211,7 @@ java_library(
     deps = TESTUTIL_DEPS + [
         "//gerrit-pgm:init",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/easymock:easymock",
         "//lib/powermock:powermock-api-easymock",
         "//lib/powermock:powermock-api-support",

gerrit-sshd/BUILD

@@ -26,6 +26,7 @@ java_library(
         "//lib:jsch",
         "//lib:servlet-api-3_1",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/bouncycastle:bcprov-neverlink",
         "//lib/commons:codec",
         "//lib/dropwizard:dropwizard-core",

lib/auto/BUILD

@@ -1,13 +1,19 @@
 java_plugin(
     name = "auto-annotation-plugin",
     processor_class = "com.google.auto.value.processor.AutoAnnotationProcessor",
-    deps = ["@auto-value//jar"],
+    deps = [
+        "@auto-value-annotations//jar",
+        "@auto-value//jar",
+    ],
 )
 
 java_plugin(
     name = "auto-value-plugin",
     processor_class = "com.google.auto.value.processor.AutoValueProcessor",
-    deps = ["@auto-value//jar"],
+    deps = [
+        "@auto-value-annotations//jar",
+        "@auto-value//jar",
+    ],
 )
 
 java_library(
@@ -20,3 +26,14 @@ java_library(
     visibility = ["//visibility:public"],
     exports = ["@auto-value//jar"],
 )
+
+java_library(
+    name = "auto-value-annotations",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exported_plugins = [
+        ":auto-annotation-plugin",
+        ":auto-value-plugin",
+    ],
+    visibility = ["//visibility:public"],
+    exports = ["@auto-value-annotations//jar"],
+)