From 0ac74b8126b76498075f43c37603d67a15d8d205 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Fri, 7 Jan 2022 23:45:21 +0000
Subject: [PATCH] turn on animal-sniffer (#9383)

* turn on animal-sniffer
* allow API level 19 for util package
---
 java/pom.xml      | 50 ++++++++++++++++++++++++++++-------------------
 java/util/pom.xml | 22 ++++++++++++++++++++-
 2 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 5dd0b925b84d..e0f4f2643167 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -160,33 +160,43 @@
           <artifactId>maven-antrun-plugin</artifactId>
           <version>3.0.0</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.0.0-M5</version>
+        </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>animal-sniffer-maven-plugin</artifactId>
           <version>1.20</version>
-          <configuration>
-            <signature>
-              <groupId>net.sf.androidscents.signature</groupId>
-              <artifactId>android-api-level-14</artifactId>
-              <version>4.0_r4</version>
-            </signature>
-          </configuration>
-          <executions>
-            <execution>
-              <id>android</id>
-              <phase>test</phase>
-              <goals>
-                <goal>check</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M5</version>
         </plugin>
       </plugins>
     </pluginManagement>
+    
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <configuration>
+          <signature>
+            <groupId>net.sf.androidscents.signature</groupId>
+            <artifactId>android-api-level-14</artifactId>
+            <version>4.0_r4</version>
+          </signature>
+          <ignores>
+            <ignore>sun.misc.Unsafe</ignore>
+          </ignores>
+        </configuration>
+        <executions>
+          <execution>
+            <id>android</id>
+            <phase>test</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
   <profiles>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index e870bff04c4a..5e7e891de75d 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -117,7 +117,27 @@
           </execution>
         </executions>
       </plugin>
-
+      
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <configuration>
+          <signature>
+            <groupId>net.sf.androidscents.signature</groupId>
+            <artifactId>android-api-level-19</artifactId>
+            <version>4.4.2_r4</version>
+          </signature>
+        </configuration>
+        <executions>
+          <execution>
+            <id>android</id>
+            <phase>test</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <!-- Configure the OSGI bundle -->
       <plugin>
         <groupId>org.apache.felix</groupId>