Merge pull request #6439 from MishaDemianenko/3.0-findbugs-fix

Findbugs configuration cleanup
neo4j · Feb 18, 2016 · d07acc4 · d07acc4
2 parents d23d9b8 + 40cdad1
commit d07acc4
Show file tree

Hide file tree

Showing 103 changed files with 57 additions and 21,359 deletions.
diff --git a/community/bolt/LICENSES.txt b/community/bolt/LICENSES.txt
diff --git a/community/bolt/NOTICE.txt b/community/bolt/NOTICE.txt
@@ -28,7 +28,6 @@ Third-party licenses
 Apache Software License, Version 2.0
   Apache Commons Lang
   ConcurrentLinkedHashMap
-  FindBugs-jsr305
   Lucene Common Analyzers
   Lucene Core
   Lucene Memory
@@ -49,6 +48,3 @@ Bouncy Castle License
   Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
   Bouncy Castle Provider
 
-GNU Lesser General Public License, Version 2.1
-  FindBugs-Annotations
-
diff --git a/community/collections/LICENSES.txt b/community/collections/LICENSES.txt
diff --git a/community/collections/NOTICE.txt b/community/collections/NOTICE.txt
@@ -25,9 +25,3 @@ Full license texts are found in LICENSES.txt.
 Third-party licenses
 --------------------
 
-Apache Software License, Version 2.0
-  FindBugs-jsr305
-
-GNU Lesser General Public License, Version 2.1
-  FindBugs-Annotations
-
diff --git a/community/common/LICENSES.txt b/community/common/LICENSES.txt
diff --git a/community/common/NOTICE.txt b/community/common/NOTICE.txt
@@ -25,9 +25,3 @@ Full license texts are found in LICENSES.txt.
 Third-party licenses
 --------------------
 
-Apache Software License, Version 2.0
-  FindBugs-jsr305
-
-GNU Lesser General Public License, Version 2.1
-  FindBugs-Annotations
-
diff --git a/community/common/pom.xml b/community/common/pom.xml
@@ -50,16 +50,9 @@ the relevant Commercial Agreement.
   </licenses>
 
   <dependencies>
-    <!-- TODO: Is there a way avoid this as a runtime dependency? -->
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.0</version>
-    </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>annotations</artifactId>
-      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/community/consistency-check-legacy/LICENSES.txt b/community/consistency-check-legacy/LICENSES.txt
diff --git a/community/consistency-check-legacy/NOTICE.txt b/community/consistency-check-legacy/NOTICE.txt
@@ -27,12 +27,8 @@ Third-party licenses
 
 Apache Software License, Version 2.0
   Apache Commons Lang
-  FindBugs-jsr305
   Lucene Common Analyzers
   Lucene Core
   Lucene Memory
   Lucene QueryParsers
 
-GNU Lesser General Public License, Version 2.1
-  FindBugs-Annotations
-
diff --git a/community/consistency-check-legacy/pom.xml b/community/consistency-check-legacy/pom.xml
@@ -57,6 +57,11 @@ the relevant Commercial Agreement.
       <version>${neo4j.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/community/consistency-check/LICENSES.txt b/community/consistency-check/LICENSES.txt
diff --git a/community/consistency-check/NOTICE.txt b/community/consistency-check/NOTICE.txt
@@ -27,12 +27,8 @@ Third-party licenses
 
 Apache Software License, Version 2.0
   Apache Commons Lang
-  FindBugs-jsr305
   Lucene Common Analyzers
   Lucene Core
   Lucene Memory
   Lucene QueryParsers
 
-GNU Lesser General Public License, Version 2.1
-  FindBugs-Annotations
-
diff --git a/community/consistency-check/pom.xml b/community/consistency-check/pom.xml
@@ -71,6 +71,11 @@ the relevant Commercial Agreement.
       <version>${neo4j.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/community/csv/LICENSES.txt b/community/csv/LICENSES.txt
diff --git a/community/csv/NOTICE.txt b/community/csv/NOTICE.txt
@@ -25,9 +25,3 @@ Full license texts are found in LICENSES.txt.
 Third-party licenses
 --------------------
 
-Apache Software License, Version 2.0
-  FindBugs-jsr305
-
-GNU Lesser General Public License, Version 2.1
-  FindBugs-Annotations
-
diff --git a/community/csv/pom.xml b/community/csv/pom.xml
@@ -51,6 +51,10 @@ the relevant Commercial Agreement.
 
   <dependencies>
     <!-- main dependencies -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-primitive-collections</artifactId>

diff --git a/community/cypher/acceptance/pom.xml b/community/cypher/acceptance/pom.xml
@@ -233,5 +233,10 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+    </dependency>
+
   </dependencies>
 </project>