From 8c313bf1953e3a07a577868f190c3987beef56a9 Mon Sep 17 00:00:00 2001
From: Daniel Oliveira <daniel.o.programmer@gmail.com>
Date: Tue, 24 Oct 2017 14:34:38 -0700
Subject: [PATCH] Getting AutoValue 1.5.1 working in Beam.

---
 examples/java/pom.xml     | 6 ++++++
 pom.xml                   | 8 +++++++-
 sdks/java/nexmark/pom.xml | 6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index dd95d029ace1..e47e9a12e251 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -491,6 +491,12 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.auto.value</groupId>
+      <artifactId>auto-value</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- Hamcrest and JUnit are required dependencies of PAssert,
          which is used in the main code of DebuggingWordCount example. -->
 
diff --git a/pom.xml b/pom.xml
index 3cb3b110cc40..fcd033935938 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
     <datastore.proto.version>1.3.0</datastore.proto.version>
     <google-api-common.version>1.0.0-rc2</google-api-common.version>
     <google-auto-service.version>1.0-rc2</google-auto-service.version>
-    <google-auto-value.version>1.4.1</google-auto-value.version>
+    <google-auto-value.version>1.5.1</google-auto-value.version>
     <google-auth.version>0.7.1</google-auth.version>
     <google-clients.version>1.22.0</google-clients.version>
     <google-cloud-bigdataoss.version>1.4.5</google-cloud-bigdataoss.version>
@@ -1992,6 +1992,11 @@
               <!-- Ignore runtime-only dependencies in analysis -->
               <ignoreNonCompile>true</ignoreNonCompile>
               <failOnWarning>true</failOnWarning>
+
+              <!-- ignore jsr305 for both "used but undeclared" and "declared but unused" -->
+              <ignoredDependencies>
+                <ignoredDependency>com.google.code.findbugs:jsr305</ignoredDependency>
+              </ignoredDependencies>
             </configuration>
           </execution>
         </executions>
@@ -2016,6 +2021,7 @@
                       version. Is not shaded, so safe to ignore.
                     -->
                     <exclude>jdk.tools:jdk.tools</exclude>
+                    <exclude>com.google.auto.value:auto-value</exclude>
                   </excludes>
                 </enforceBytecodeVersion>
                 <requireJavaVersion>
diff --git a/sdks/java/nexmark/pom.xml b/sdks/java/nexmark/pom.xml
index 05163dcf8a54..8210ddc04747 100644
--- a/sdks/java/nexmark/pom.xml
+++ b/sdks/java/nexmark/pom.xml
@@ -255,5 +255,11 @@
       <artifactId>beam-runners-direct-java</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.google.auto.value</groupId>
+      <artifactId>auto-value</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>