Merge pull request #377 from MarkEWaite/fix-jsr-305

Replace JSR-305 annotations with spotbugs annotations
jenkinsci · May 7, 2024 · 5aa9d5c · 5aa9d5c
2 parents ca57d8e + 11cc152
commit 5aa9d5c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/com/coravy/hudson/plugins/github/GithubLinkAnnotator.java b/src/main/java/com/coravy/hudson/plugins/github/GithubLinkAnnotator.java
@@ -9,9 +9,9 @@
 import hudson.scm.ChangeLogSet.Entry;
 import org.apache.commons.lang.StringUtils;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.CheckReturnValue;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckReturnValue;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 import static hudson.Functions.htmlAttributeEscape;
 import static java.lang.String.format;
@@ -100,13 +100,13 @@ void process(MarkupText text, String url) {
  "(?:C|c)lose(?:s?)\\s(?<!\\:)(?:#)NUM", // "Closes #123"
  "issues/$1")};
 
- @Nonnull
+ @NonNull
  public static String getAllowedUriSchemes() {
  return StringUtils.join(ALLOWED_URI_SCHEMES, ',');
  }
 
  @CheckReturnValue
- @Nonnull
+ @NonNull
  public static boolean verifyUrl(@CheckForNull String urlString) {
  if (StringUtils.isBlank(urlString)) {
  return false;