From b551367c6d1bf4522323b7678c6eca95555b153f Mon Sep 17 00:00:00 2001
From: jdasch <hcsadj@gmail.com>
Date: Tue, 20 Feb 2018 14:01:49 -0500
Subject: [PATCH] GIRAPH-1172 Removed dependency
 com.google.code.findbugs:annotations

---
 findbugs-exclude.xml                          |  8 ++++++
 giraph-block-app/pom.xml                      |  4 ---
 .../block_app/library/gc/WorkerGCPiece.java   |  3 --
 .../giraph/object/MultiSizedReusable.java     |  3 --
 giraph-core/pom.xml                           |  6 +++-
 pom.xml                                       | 28 ++++++++++++++-----
 6 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index aa19235a2..aae041bed 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -96,4 +96,12 @@
       On the other hand, Kryo needs lambdas to be Serializable to work. -->
     <Bug pattern="SE_BAD_FIELD,SE_COMPARATOR_SHOULD_BE_SERIALIZABLE,SE_NO_SERIALVERSIONID" />
   </Match>
+  <Match>
+    <Class name="org.apache.giraph.block_app.library.gc.WorkerGCPiece"/>
+    <Bug pattern="DM_GC"/>
+  </Match>
+  <Match>
+    <Class name="org.apache.giraph.object.MultiSizedReusable"/>
+    <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
+  </Match>
 </FindBugsFilter>
diff --git a/giraph-block-app/pom.xml b/giraph-block-app/pom.xml
index 21ce0a67c..68b3a8ce8 100644
--- a/giraph-block-app/pom.xml
+++ b/giraph-block-app/pom.xml
@@ -110,10 +110,6 @@ under the License.
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
 
     <!-- runtime dependency -->
     <dependency>
diff --git a/giraph-block-app/src/main/java/org/apache/giraph/block_app/library/gc/WorkerGCPiece.java b/giraph-block-app/src/main/java/org/apache/giraph/block_app/library/gc/WorkerGCPiece.java
index 5912b9a32..25cacbd8a 100644
--- a/giraph-block-app/src/main/java/org/apache/giraph/block_app/library/gc/WorkerGCPiece.java
+++ b/giraph-block-app/src/main/java/org/apache/giraph/block_app/library/gc/WorkerGCPiece.java
@@ -23,8 +23,6 @@
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableComparable;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Dummy piece to hint System.gc()
  */
@@ -32,7 +30,6 @@ public class WorkerGCPiece extends PieceWithWorkerContext<WritableComparable,
     Writable, Writable, NoMessage, Object, NoMessage, Object>  {
 
   @Override
-  @SuppressFBWarnings(value = "DM_GC")
   public void workerContextSend(
       BlockWorkerContextSendApi<WritableComparable, NoMessage> workerContextApi,
       Object executionStage,
diff --git a/giraph-block-app/src/main/java/org/apache/giraph/object/MultiSizedReusable.java b/giraph-block-app/src/main/java/org/apache/giraph/object/MultiSizedReusable.java
index 2a91e8f5b..88e3106bf 100644
--- a/giraph-block-app/src/main/java/org/apache/giraph/object/MultiSizedReusable.java
+++ b/giraph-block-app/src/main/java/org/apache/giraph/object/MultiSizedReusable.java
@@ -25,8 +25,6 @@
 
 import com.google.common.base.Preconditions;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Holds reusable objects of multiple sizes.
  * Example usecase, is when we need a hashmap - that we will insert and iterate
@@ -43,7 +41,6 @@ public class MultiSizedReusable<T> implements Int2ObjFunction<T> {
   private final Int2ObjFunction<T> createSized;
   private final Consumer<T> init;
   @SuppressWarnings("unchecked")
-  @SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
   private final transient T[] holder = (T[]) new Object[Integer.SIZE];
 
   // No-arg constructor Kryo can call to initialize holder
diff --git a/giraph-core/pom.xml b/giraph-core/pom.xml
index 9a5d89015..3e830a726 100644
--- a/giraph-core/pom.xml
+++ b/giraph-core/pom.xml
@@ -476,7 +476,11 @@ under the License.
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
-      <artifactId>annotations</artifactId>
+      <artifactId>jsr305</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.github.stephenc.findbugs</groupId>
+      <artifactId>findbugs-annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/pom.xml b/pom.xml
index e2eff4bb1..0d2fbf781 100644
--- a/pom.xml
+++ b/pom.xml
@@ -332,6 +332,7 @@ under the License.
     <dep.fasterxml-jackson.version>2.1.2</dep.fasterxml-jackson.version>
     <dep.fastutil.version>6.5.4</dep.fastutil.version>
     <dep.google.findbugs.version>2.0.2</dep.google.findbugs.version>
+    <dep.stephenc-findbugs.version>1.3.9-1</dep.stephenc-findbugs.version>
     <dep.guava.version>18.0</dep.guava.version>
     <dep.hbase.version>0.94.16</dep.hbase.version>
     <dep.hcatalog.version>0.5.0-incubating</dep.hcatalog.version>
@@ -635,12 +636,8 @@ under the License.
                   <exclude>com.google.collections:google-collections</exclude>
                   <!-- but not the badly numbered ones... -->
                   <exclude>com.google.guava:guava</exclude>
-                  <!-- Clashes with com.google.code.findbugs:annotations and having both jars -->
-                  <!-- as a dependency then clashes with the dependency checker (because it   -->
-                  <!-- is not very good at handling annotations). Use the annotations jar     -->
-                  <!-- instead which has all jsr305 annotations and the additional findbugs   -->
-                  <!-- stuff. -->
-                  <exclude>com.google.code.findbugs:jsr305</exclude>
+                  <!-- com.google.code.findbugs:annotations is LGPL.  Use com.github.stephenc.findbugs:findbugs-annotations instead.  -->
+                  <exclude>com.google.code.findbugs:annotations</exclude>
                   <!-- Use the official version at javax.servlet:javax.servlet-api -->
                   <exclude>org.eclipse.jetty.orbit:javax.servlet</exclude>
                   <!-- Renamed airlift modules -->
@@ -1541,9 +1538,14 @@ under the License.
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
-        <artifactId>annotations</artifactId>
+        <artifactId>jsr305</artifactId>
         <version>${dep.google.findbugs.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.github.stephenc.findbugs</groupId>
+        <artifactId>findbugs-annotations</artifactId>
+        <version>${dep.stephenc-findbugs.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.tinkerpop.blueprints</groupId>
         <artifactId>blueprints-core</artifactId>
@@ -1714,6 +1716,10 @@ under the License.
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -1733,6 +1739,10 @@ under the License.
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-all</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -1757,6 +1767,10 @@ under the License.
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>