From d66b84b4b0e33b37d329c777b2977e92c2412685 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Wed, 9 Oct 2019 10:32:03 -0400
Subject: [PATCH 1/2] Make animal sniffer annotations optional

Per https://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/ this should not be inherited by dependents
---
 guava/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guava/pom.xml b/guava/pom.xml
index df35cea12e5d..a8e404a75094 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -46,6 +46,7 @@
       <groupId>org.codehaus.mojo</groupId>
       <artifactId>animal-sniffer-annotations</artifactId>
       <version>${animal.sniffer.version}</version>
+      <optional>true</optional>
     </dependency>
     <!-- TODO(cpovirk): does this comment belong on the <dependency> in <profiles>? -->
     <!-- TODO(cpovirk): want this only for dependency plugin but seems not to work there? Maven runs without failure, but the resulting Javadoc is missing the hoped-for inherited text -->

From c7112ee5d1cb68d955dcaf99c8bae316aca0d80d Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Wed, 9 Oct 2019 10:36:34 -0400
Subject: [PATCH 2/2] android as well

---
 android/guava/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/guava/pom.xml b/android/guava/pom.xml
index e990374ebf90..60e45370ea12 100644
--- a/android/guava/pom.xml
+++ b/android/guava/pom.xml
@@ -46,6 +46,7 @@
       <groupId>org.codehaus.mojo</groupId>
       <artifactId>animal-sniffer-annotations</artifactId>
       <version>${animal.sniffer.version}</version>
+      <optional>true</optional>
     </dependency>
     <!-- TODO(cpovirk): does this comment belong on the <dependency> in <profiles>? -->
     <!-- TODO(cpovirk): want this only for dependency plugin but seems not to work there? Maven runs without failure, but the resulting Javadoc is missing the hoped-for inherited text -->