From 5531347e569c4af160ec3cca4a6ea3e734aa9021 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Wed, 1 Aug 2018 22:33:57 +0200
Subject: [PATCH] Bump auto-value to 1.6.2

This upgrade is needed to support JDK9, that was fixed in this
commit: [1].

[1] https://github.com/google/auto/commit/f04406c1f11d3796bd93ed89ae160f47bcb4b7e4

Change-Id: Ic7464964dc7e21946aac4b4a786107a0df51ae2a
---
 WORKSPACE                         | 12 ++++++++++--
 gerrit-acceptance-framework/BUILD |  1 +
 gerrit-common/BUILD               |  1 +
 gerrit-httpd/BUILD                |  1 +
 gerrit-pgm/BUILD                  |  1 +
 gerrit-server/BUILD               |  2 ++
 gerrit-sshd/BUILD                 |  1 +
 lib/auto/BUILD                    | 21 +++++++++++++++++++--
 8 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index efa7149f06..3e1ef2c0d3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -440,10 +440,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",
-    sha1 = "6d1448fcd13074bd3658ef915022410b7c48343b",
+    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(
diff --git a/gerrit-acceptance-framework/BUILD b/gerrit-acceptance-framework/BUILD
index 83aca51124..ef78e228c4 100644
--- a/gerrit-acceptance-framework/BUILD
+++ b/gerrit-acceptance-framework/BUILD
@@ -44,6 +44,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",
diff --git a/gerrit-common/BUILD b/gerrit-common/BUILD
index 7f299da76e..6432060f99 100644
--- a/gerrit-common/BUILD
+++ b/gerrit-common/BUILD
@@ -82,5 +82,6 @@ junit_tests(
     deps = [
         "//lib:truth",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
     ],
 )
diff --git a/gerrit-httpd/BUILD b/gerrit-httpd/BUILD
index a5494bcf9d..fda84af075 100644
--- a/gerrit-httpd/BUILD
+++ b/gerrit-httpd/BUILD
@@ -39,6 +39,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",
diff --git a/gerrit-pgm/BUILD b/gerrit-pgm/BUILD
index 54851f1f4c..389d8d98b4 100644
--- a/gerrit-pgm/BUILD
+++ b/gerrit-pgm/BUILD
@@ -151,6 +151,7 @@ java_library(
         # We want all these deps to be provided_deps
         "//gerrit-launcher:launcher",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
     ],
 )
 
diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
index f730ca4819..a92ddea15a 100644
--- a/gerrit-server/BUILD
+++ b/gerrit-server/BUILD
@@ -55,6 +55,7 @@ java_library(
         "//lib:velocity",
         "//lib/antlr:java-runtime",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/bouncycastle:bcpkix-neverlink",
         "//lib/bouncycastle:bcprov-neverlink",
         "//lib/commons:codec",
@@ -130,6 +131,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",
diff --git a/gerrit-sshd/BUILD b/gerrit-sshd/BUILD
index b1fe5ecbce..189057e9b3 100644
--- a/gerrit-sshd/BUILD
+++ b/gerrit-sshd/BUILD
@@ -24,6 +24,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",
diff --git a/lib/auto/BUILD b/lib/auto/BUILD
index 98055eb475..1e722bcae5 100644
--- a/lib/auto/BUILD
+++ b/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"],
+)