Merge pull request #63 from basil/jsr305

EOL JSR 305

Author: car-roll

src/main/java/org/jenkinsci/plugins/workflow/steps/scm/MultiSCMRevisionState.java

@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
  * A special revision state that can accommodate multiple SCMs, using {@link SCM#getKey}.
@@ -44,15 +44,15 @@ final class MultiSCMRevisionState extends SCMRevisionState {
 		revisionStates = new HashMap<String, SCMRevisionState>();
 	}
 
-	public void add(@Nonnull SCM scm, @Nonnull SCMRevisionState scmState) {
+	public void add(@NonNull SCM scm, @NonNull SCMRevisionState scmState) {
         String key = scm.getKey();
         SCMRevisionState old = revisionStates.put(key, scmState);
         if (old != null) {
             Logger.getLogger(MultiSCMRevisionState.class.getName()).log(Level.FINE, "overriding old revision state {0} from {1}", new Object[] {old, key});
         }
 	}
 
-	public SCMRevisionState get(@Nonnull SCM scm) {
+	public SCMRevisionState get(@NonNull SCM scm) {
 		return revisionStates.get(scm.getKey());
 	}
 

src/main/java/org/jenkinsci/plugins/workflow/steps/scm/SCMStep.java

@@ -41,7 +41,7 @@
 import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import org.jenkinsci.plugins.workflow.steps.Step;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
@@ -79,7 +79,7 @@ public boolean isChangelog() {
         return new StepExecutionImpl(this, context);
     }
 
-    protected abstract @Nonnull SCM createSCM();
+    protected abstract @NonNull SCM createSCM();
 
     public static final class StepExecutionImpl extends SynchronousNonBlockingStepExecution<Map<String,String>> {