Upgrade auto-value to 1.6

The annotations are now provided in a separate artifact.

Change-Id: I6df14c97c44b211671961810b17760d81c20c5c3

WORKSPACE

@@ -415,10 +415,18 @@ maven_jar(
     sha1 = "430b2fc839b5de1f3643b528853d5cf26096c1de",
 )
 
+AUTO_VALUE_VERSION = "1.6"
+
 maven_jar(
     name = "auto_value",
-    artifact = "com.google.auto.value:auto-value:1.5.4",
+    artifact = "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION,
-    sha1 = "65183ddd1e9542d69d8f613fdae91540d04e1476",
+    sha1 = "a3b1b1404f8acaa88594a017185e013cd342c9a8",
+)
+
+maven_jar(
+    name = "auto_value_annotations",
+    artifact = "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION,
+    sha1 = "da725083ee79fdcd86d9f3d8a76e38174a01892a",
 )
 
 # Transitive dependency of commons-compress

java/com/google/gerrit/acceptance/BUILD

@@ -78,6 +78,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",

java/com/google/gerrit/common/BUILD

@@ -23,6 +23,7 @@ gwt_module(
         "//lib:gwtorm_client",
         "//lib:servlet-api-3_1",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/jgit/org.eclipse.jgit:jgit",
         "//lib/log:api",
     ],
@@ -48,6 +49,7 @@ java_library(
         "//lib:gwtorm",
         "//lib:servlet-api-3_1",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/jgit/org.eclipse.jgit:jgit",
         "//lib/log:api",
     ],

java/com/google/gerrit/httpd/BUILD

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

java/com/google/gerrit/index/BUILD

@@ -42,6 +42,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",
     ],

java/com/google/gerrit/pgm/BUILD

@@ -49,6 +49,7 @@ java_library(
         "//lib:protobuf",
         "//lib:servlet-api-3_1-without-neverlink",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/guice",
         "//lib/guice:guice-assistedinject",
         "//lib/guice:guice-servlet",

java/com/google/gerrit/server/BUILD

@@ -62,6 +62,7 @@ java_library(
         "//lib:soy",
         "//lib:tukaani-xz",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/bouncycastle:bcpkix-neverlink",
         "//lib/bouncycastle:bcprov-neverlink",
         "//lib/commons:codec",

java/com/google/gerrit/server/git/receive/BUILD

@@ -13,6 +13,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",

java/com/google/gerrit/server/restapi/BUILD

@@ -25,6 +25,7 @@ java_library(
         "//lib:gwtorm",
         "//lib:servlet-api-3_1",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/commons:codec",
         "//lib/commons:compress",
         "//lib/commons:lang",

java/com/google/gerrit/server/schema/BUILD

@@ -16,6 +16,7 @@ java_library(
         "//lib:guava",
         "//lib:gwtorm",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/commons:dbcp",
         "//lib/guice",
         "//lib/jgit/org.eclipse.jgit.archive:jgit-archive",

java/com/google/gerrit/sshd/BUILD

@@ -25,6 +25,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",

java/com/google/gerrit/testing/BUILD

@@ -32,6 +32,7 @@ java_library(
         "//lib:h2",
         "//lib:truth",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/guice",
         "//lib/guice:guice-servlet",
         "//lib/jgit/org.eclipse.jgit:jgit",

javatests/com/google/gerrit/common/BUILD

@@ -30,5 +30,6 @@ junit_tests(
         "//lib:guava",
         "//lib:truth",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
     ],
 )

javatests/com/google/gerrit/server/BUILD

@@ -55,6 +55,7 @@ junit_tests(
         "//lib:gwtorm",
         "//lib:truth-java8-extension",
         "//lib/auto:auto-value",
+        "//lib/auto:auto-value-annotations",
         "//lib/commons:codec",
         "//lib/guice",
         "//lib/jgit/org.eclipse.jgit:jgit",

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//jar",
+        "@auto_value_annotations//jar",
+    ],
 )
 
 java_plugin(
     name = "auto-value-plugin",
     processor_class = "com.google.auto.value.processor.AutoValueProcessor",
-    deps = ["@auto_value//jar"],
+    deps = [
+        "@auto_value//jar",
+        "@auto_value_annotations//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"],
+)