Revert "FindBugs' full :annotation instead of :jsr305 artifact sub-set"

This reverts commit 4647724a79fbf7db440716f93f1067d17ecd8dda.

It breaks yangtools' and bgpcep's SFT, I suspect it breaks others
as well.

Change-Id: I880c3835958edac14a608fb8f7346c2274298c83
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 83f211d3f19fdf1f06ee3ad4172eff573f0b1a43..e876571ff30353d12995aad6eb807e7a6f989224 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -498,18 +498,23 @@
         <artifactId>java-concurrent-hash-trie-map</artifactId>
         <version>0.2.23-ODL</version>
       </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.1</version>
-        <scope>provided</scope>
+        <version>3.0.0</version>
         <exclusions>
-          <!-- The following exclusions are also enforced by our maven-enforcer-plugin configuration in odlparent-lite -->
-          <exclusion>
-            <groupId>com.google.code.findbugs</groupId>
-            <!-- The types of this artifact are already shaded inside the :annotations artifact -->
-            <artifactId>jsr305</artifactId>
-          </exclusion>
+          <!-- We'd like (have) to eventually exclude :jsr305 here as well, because
+               the types of this artifact are already shaded inside the :annotations artifact.
+               This state is a temporary solution to allow all projects to gradually switch over
+               switch their <dependency><groupId>com.google.code.findbugs from
+               <artifactId>jsr305 to <artifactId>annotations in all pom.xml.
+               The target solution is https://git.opendaylight.org/gerrit/#/c/47337/
+            -->
           <exclusion>
             <groupId>net.jcip</groupId>
             <!-- The types of this artifact are already shaded inside the :annotations artifact -->
@@ -1313,12 +1318,18 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Enable FindBugs & JSR-305 annotations everywhere -->
+    <!-- Enable JSR-305 annotations everywhere -->
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>annotations</artifactId>
       <scope>provided</scope>
     </dependency>
+    <!-- See note above; having both :jsr305 and :annotations here is an intermediate step -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>org.eclipse.jdt.annotation</artifactId>