Annotations: remove dependency from BugRanker

Author: amaembo

findbugs/src/java/edu/umd/cs/findbugs/annotations/DesireWarning.java

@@ -8,8 +8,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import edu.umd.cs.findbugs.BugRanker;
-
 /**
  * Annotation indicating that a FindBugs warning is desired.
  *
@@ -29,7 +27,7 @@
     public Confidence confidence() default Confidence.LOW;
 
     /** Desire a warning at least this scary */
-    public int rank() default BugRanker.VISIBLE_RANK_MAX;
+    public int rank() default 20; // BugRanker.VISIBLE_RANK_MAX
 
     /** Desire at least this many warnings */
     public int num() default 1;

findbugs/src/java/edu/umd/cs/findbugs/annotations/ExpectWarning.java

@@ -8,8 +8,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import edu.umd.cs.findbugs.BugRanker;
-
 /**
  * Annotation indicating that a FindBugs warning is expected.
  *
@@ -29,7 +27,7 @@
     public Confidence confidence() default Confidence.LOW;
 
     /** Expect a warning at least this scary */
-    public int rank() default BugRanker.VISIBLE_RANK_MAX;
+    public int rank() default 20; // BugRanker.VISIBLE_RANK_MAX
 
     /** Expect at least this many warnings */
     public int num() default 1;

findbugs/src/java/edu/umd/cs/findbugs/annotations/NoWarning.java

@@ -8,8 +8,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import edu.umd.cs.findbugs.BugRanker;
-
 /**
  * Annotation indicating that <em>no</em> FindBugs warning is expected.
  *
@@ -29,7 +27,7 @@
     public Confidence confidence() default Confidence.LOW;
 
     /** Want no warning at this rank or scarier */
-    public int rank() default BugRanker.VISIBLE_RANK_MAX;
+    public int rank() default 20; // BugRanker.VISIBLE_RANK_MAX
 
     /** Tolerate up to this many warnings */
     public int num() default 0;

pom/annotations/pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>com.google.code.findbugs</groupId>
   <artifactId>annotations</artifactId>
-  <version>3.0.1</version>
+  <version>3.0.1u1</version>
   <packaging>jar</packaging>
 
   <url>http://findbugs.sourceforge.net/</url>
@@ -113,12 +113,6 @@
           <includes>
               <include>edu/umd/cs/findbugs/annotations/*.java</include>
           </includes>
-          <excludes>
-              <exclude>edu/umd/cs/findbugs/annotations/DesireWarning.java</exclude>
-              <exclude>edu/umd/cs/findbugs/annotations/DesireNoWarning.java</exclude>
-              <exclude>edu/umd/cs/findbugs/annotations/ExpectWarning.java</exclude>
-              <exclude>edu/umd/cs/findbugs/annotations/NoWarning.java</exclude>
-          </excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -138,12 +132,6 @@
               <include>edu/umd/cs/findbugs/annotations/*.java</include>
               <include>edu/umd/cs/findbugs/Priorities.java</include>
           </includes>
-          <excludes>
-              <exclude>edu/umd/cs/findbugs/annotations/DesireWarning.java</exclude>
-              <exclude>edu/umd/cs/findbugs/annotations/DesireNoWarning.java</exclude>
-              <exclude>edu/umd/cs/findbugs/annotations/ExpectWarning.java</exclude>
-              <exclude>edu/umd/cs/findbugs/annotations/NoWarning.java</exclude>
-          </excludes>
         </configuration>
       </plugin>
       <plugin>