Annotations: remove dependency from Priorities constants

findbugsproject · Oct 9, 2015 · 725be6e · 725be6e
1 parent 2f9d672
commit 725be6e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/findbugs/src/java/edu/umd/cs/findbugs/annotations/Confidence.java b/findbugs/src/java/edu/umd/cs/findbugs/annotations/Confidence.java
@@ -21,14 +21,14 @@
 
 import javax.annotation.Nonnull;
 
-import edu.umd.cs.findbugs.Priorities;
-
 /**
  * Describes the confidence with which FindBugs reports a bug instance.
  */
 public enum Confidence {
-    HIGH(Priorities.HIGH_PRIORITY), MEDIUM(Priorities.NORMAL_PRIORITY), LOW(Priorities.LOW_PRIORITY), IGNORE(
-            Priorities.IGNORE_PRIORITY);
+    HIGH(1 /* Priorities.HIGH_PRIORITY */),
+    MEDIUM(2 /* Priorities.NORMAL_PRIORITY */ ),
+    LOW(3 /* Priorities.LOW_PRIORITY */),
+    IGNORE(5 /*Priorities.IGNORE_PRIORITY */);
 
     private final int confidenceValue;
 

diff --git a/findbugs/src/java/edu/umd/cs/findbugs/annotations/Priority.java b/findbugs/src/java/edu/umd/cs/findbugs/annotations/Priority.java
@@ -19,16 +19,17 @@
 
 package edu.umd.cs.findbugs.annotations;
 
-import edu.umd.cs.findbugs.Priorities;
 
 /**
  * @author pugh
  * @deprecated use {@link Confidence} instead
  */
 @Deprecated
 public enum Priority {
-    HIGH(Priorities.HIGH_PRIORITY), MEDIUM(Priorities.NORMAL_PRIORITY), LOW(Priorities.LOW_PRIORITY), IGNORE(
-            Priorities.IGNORE_PRIORITY);
+    HIGH(1 /* Priorities.HIGH_PRIORITY */),
+    MEDIUM(2 /* Priorities.NORMAL_PRIORITY */ ),
+    LOW(3 /* Priorities.LOW_PRIORITY */),
+    IGNORE(5 /*Priorities.IGNORE_PRIORITY */);
 
     private final int priorityValue;
 

diff --git a/pom/annotations/pom.xml b/pom/annotations/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>com.google.code.findbugs</groupId>
   <artifactId>annotations</artifactId>
-  <version>3.0.1u1</version>
+  <version>3.0.1u2</version>
   <packaging>jar</packaging>
 
   <url>http://findbugs.sourceforge.net/</url>
@@ -130,7 +130,6 @@
         <configuration>
           <includes>
               <include>edu/umd/cs/findbugs/annotations/*.java</include>
-              <include>edu/umd/cs/findbugs/Priorities.java</include>
           </includes>
         </configuration>
       </plugin>
@@ -151,6 +150,7 @@
        <configuration>
         <instructions>
          <Bundle-SymbolicName>findbugsAnnotations</Bundle-SymbolicName>
+         <Bundle-Version>3.0.1</Bundle-Version>
          <Bundle-Name>${project.name}</Bundle-Name>
          <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
          <Import-Package></Import-Package>