diff --git a/src/main/java/hudson/plugins/emailext/EmailExtRecipientStep.java b/src/main/java/hudson/plugins/emailext/EmailExtRecipientStep.java
index e74949850..48cc09311 100644
--- a/src/main/java/hudson/plugins/emailext/EmailExtRecipientStep.java
+++ b/src/main/java/hudson/plugins/emailext/EmailExtRecipientStep.java
@@ -15,7 +15,7 @@
 import org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.mail.internet.InternetAddress;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -44,7 +44,7 @@ public static class Executor extends SynchronousNonBlockingStepExecution<String>
 
         private final transient EmailExtRecipientStep step;
 
-        protected Executor(EmailExtRecipientStep step, @Nonnull StepContext context) {
+        protected Executor(EmailExtRecipientStep step, @NonNull StepContext context) {
             super(context);
             this.step = step;
         }
diff --git a/src/main/java/hudson/plugins/emailext/EmailExtStep.java b/src/main/java/hudson/plugins/emailext/EmailExtStep.java
index 52ec035b4..9f4465935 100644
--- a/src/main/java/hudson/plugins/emailext/EmailExtStep.java
+++ b/src/main/java/hudson/plugins/emailext/EmailExtStep.java
@@ -25,8 +25,8 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.List;
 import java.util.Set;
 
@@ -185,7 +185,7 @@ public static class EmailExtStepExecution extends SynchronousNonBlockingStepExec
 
         private final transient EmailExtStep step;
 
-        protected EmailExtStepExecution(EmailExtStep step, @Nonnull StepContext context) {
+        protected EmailExtStepExecution(EmailExtStep step, @NonNull StepContext context) {
             super(context);
             this.step = step;
         }
diff --git a/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java b/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java
index 80137de2f..8acdc4df7 100644
--- a/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java
+++ b/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java
@@ -63,8 +63,8 @@
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.mail.Address;
 import javax.mail.Message;
 import javax.mail.MessagingException;
@@ -1120,7 +1120,7 @@ public BuildStepMonitor getRequiredMonitorService() {
      * in progress
      */
     public static @CheckForNull
-    Run<?, ?> getPreviousRun(@Nonnull Run<?, ?> run, TaskListener listener) {
+    Run<?, ?> getPreviousRun(@NonNull Run<?, ?> run, TaskListener listener) {
         Run<?, ?> previousRun = run.getPreviousBuild();
         if (previousRun != null && previousRun.isBuilding()) {
             listener.getLogger().println(Messages.ExtendedEmailPublisher__is_still_in_progress_ignoring_for_purpo(previousRun.getDisplayName()));
diff --git a/src/main/java/hudson/plugins/emailext/GroovyTemplateConfig.java b/src/main/java/hudson/plugins/emailext/GroovyTemplateConfig.java
index 3e8363b17..cab8144e2 100644
--- a/src/main/java/hudson/plugins/emailext/GroovyTemplateConfig.java
+++ b/src/main/java/hudson/plugins/emailext/GroovyTemplateConfig.java
@@ -12,7 +12,7 @@
 import org.jenkinsci.plugins.scriptsecurity.scripts.languages.GroovyLanguage;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class GroovyTemplateConfig extends Config {
     @Override
@@ -50,7 +50,7 @@ public String getDisplayName() {
 
         @NonNull
         @Override
-        public Config newConfig(@Nonnull String id) {
+        public Config newConfig(@NonNull String id) {
             return new GroovyTemplateConfig(id, "Groovy Email Template", "", "");
         }
 
diff --git a/src/main/java/hudson/plugins/emailext/JellyTemplateConfig.java b/src/main/java/hudson/plugins/emailext/JellyTemplateConfig.java
index 7f9c2b786..bba7a9086 100644
--- a/src/main/java/hudson/plugins/emailext/JellyTemplateConfig.java
+++ b/src/main/java/hudson/plugins/emailext/JellyTemplateConfig.java
@@ -12,7 +12,7 @@
 import org.jenkinsci.plugins.scriptsecurity.scripts.languages.JellyLanguage;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class JellyTemplateConfig extends Config {
     @Override
@@ -49,7 +49,7 @@ public String getDisplayName() {
 
         @NonNull
         @Override
-        public Config newConfig(@Nonnull String id) {
+        public Config newConfig(@NonNull String id) {
             return new JellyTemplateConfig(id, "Jelly Email Template", "", "");
         }
 
diff --git a/src/main/java/hudson/plugins/emailext/groovy/sandbox/EmailExtScriptTokenMacroWhitelist.java b/src/main/java/hudson/plugins/emailext/groovy/sandbox/EmailExtScriptTokenMacroWhitelist.java
index 224a158ef..84ad5d788 100644
--- a/src/main/java/hudson/plugins/emailext/groovy/sandbox/EmailExtScriptTokenMacroWhitelist.java
+++ b/src/main/java/hudson/plugins/emailext/groovy/sandbox/EmailExtScriptTokenMacroWhitelist.java
@@ -34,7 +34,7 @@
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.AbstractWhitelist;
 import org.jenkinsci.plugins.tokenmacro.TokenMacro;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -60,7 +60,7 @@ public EmailExtScriptTokenMacroWhitelist() {
     }
 
     @Override
-    public boolean permitsMethod(@Nonnull Method method, @Nonnull Object receiver, @Nonnull Object[] args) {
+    public boolean permitsMethod(@NonNull Method method, @NonNull Object receiver, @NonNull Object[] args) {
         //method groovy.lang.GroovyObject invokeMethod java.lang.String java.lang.Object (SimpleTemplateScript2 BUILD_ID)
         if (method.getDeclaringClass() == GroovyObject.class
                 && receiver instanceof EmailExtScript && "invokeMethod".equals(method.getName()) && args.length > 0) {
diff --git a/src/main/java/hudson/plugins/emailext/groovy/sandbox/MimeMessageInstanceWhitelist.java b/src/main/java/hudson/plugins/emailext/groovy/sandbox/MimeMessageInstanceWhitelist.java
index cbb3c2acd..3bafff51f 100644
--- a/src/main/java/hudson/plugins/emailext/groovy/sandbox/MimeMessageInstanceWhitelist.java
+++ b/src/main/java/hudson/plugins/emailext/groovy/sandbox/MimeMessageInstanceWhitelist.java
@@ -1,6 +1,6 @@
 package hudson.plugins.emailext.groovy.sandbox;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.mail.internet.MimeMessage;
 import java.lang.reflect.Method;
 
@@ -9,12 +9,12 @@
  */
 public class MimeMessageInstanceWhitelist extends ObjectInstanceWhitelist<MimeMessage> {
 
-    public MimeMessageInstanceWhitelist(@Nonnull MimeMessage instance) {
+    public MimeMessageInstanceWhitelist(@NonNull MimeMessage instance) {
         super(instance);
     }
 
     @Override
-    public boolean permitsMethod(@Nonnull Method method, @Nonnull Object receiver, @Nonnull Object[] args) {
+    public boolean permitsMethod(@NonNull Method method, @NonNull Object receiver, @NonNull Object[] args) {
         if (permitsInstance(receiver) && isClass(method.getDeclaringClass())) {
             String name = method.getName();
             return name.startsWith("get") || name.startsWith("set") || name.startsWith("add");
diff --git a/src/main/java/hudson/plugins/emailext/groovy/sandbox/ObjectInstanceWhitelist.java b/src/main/java/hudson/plugins/emailext/groovy/sandbox/ObjectInstanceWhitelist.java
index 950d317a9..35b9266f8 100644
--- a/src/main/java/hudson/plugins/emailext/groovy/sandbox/ObjectInstanceWhitelist.java
+++ b/src/main/java/hudson/plugins/emailext/groovy/sandbox/ObjectInstanceWhitelist.java
@@ -3,7 +3,7 @@
 import org.jenkinsci.plugins.scriptsecurity.sandbox.Whitelist;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.AbstractWhitelist;
 
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.lang.ref.WeakReference;
 
 /**
diff --git a/src/main/java/hudson/plugins/emailext/groovy/sandbox/PrintStreamInstanceWhitelist.java b/src/main/java/hudson/plugins/emailext/groovy/sandbox/PrintStreamInstanceWhitelist.java
index 33163178d..ddd4d5907 100644
--- a/src/main/java/hudson/plugins/emailext/groovy/sandbox/PrintStreamInstanceWhitelist.java
+++ b/src/main/java/hudson/plugins/emailext/groovy/sandbox/PrintStreamInstanceWhitelist.java
@@ -1,6 +1,6 @@
 package hudson.plugins.emailext.groovy.sandbox;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.PrintStream;
 import java.lang.reflect.Method;
 
@@ -14,7 +14,7 @@ public PrintStreamInstanceWhitelist(PrintStream instance) {
     }
 
     @Override
-    public boolean permitsMethod(@Nonnull Method method, @Nonnull Object receiver, @Nonnull Object[] args) {
+    public boolean permitsMethod(@NonNull Method method, @NonNull Object receiver, @NonNull Object[] args) {
         if (permitsInstance(receiver) && isClass(method.getDeclaringClass())) {
             String name = method.getName();
             return name.equals("write")
diff --git a/src/main/java/hudson/plugins/emailext/groovy/sandbox/PropertiesInstanceWhitelist.java b/src/main/java/hudson/plugins/emailext/groovy/sandbox/PropertiesInstanceWhitelist.java
index cb6c27d6f..df55f6051 100644
--- a/src/main/java/hudson/plugins/emailext/groovy/sandbox/PropertiesInstanceWhitelist.java
+++ b/src/main/java/hudson/plugins/emailext/groovy/sandbox/PropertiesInstanceWhitelist.java
@@ -1,6 +1,6 @@
 package hudson.plugins.emailext.groovy.sandbox;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.lang.reflect.Method;
 import java.util.Properties;
 
@@ -14,7 +14,7 @@ public PropertiesInstanceWhitelist(Properties instance) {
     }
 
     @Override
-    public boolean permitsMethod(@Nonnull Method method, @Nonnull Object receiver, @Nonnull Object[] args) {
+    public boolean permitsMethod(@NonNull Method method, @NonNull Object receiver, @NonNull Object[] args) {
         if (permitsInstance(receiver) && isClass(method.getDeclaringClass())) {
             String name = method.getName();
             return name.equals("setProperty")
diff --git a/src/main/java/hudson/plugins/emailext/groovy/sandbox/StaticProxyInstanceWhitelist.java b/src/main/java/hudson/plugins/emailext/groovy/sandbox/StaticProxyInstanceWhitelist.java
index 7c509f09d..4930b6ac8 100644
--- a/src/main/java/hudson/plugins/emailext/groovy/sandbox/StaticProxyInstanceWhitelist.java
+++ b/src/main/java/hudson/plugins/emailext/groovy/sandbox/StaticProxyInstanceWhitelist.java
@@ -3,8 +3,8 @@
 import org.jenkinsci.plugins.scriptsecurity.sandbox.Whitelist;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.StaticWhitelist;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -15,7 +15,7 @@
 public class StaticProxyInstanceWhitelist extends ObjectInstanceWhitelist<Object> {
     private Whitelist[] proxies;
 
-    public StaticProxyInstanceWhitelist(Object instance, @Nonnull String... resources) throws IOException {
+    public StaticProxyInstanceWhitelist(Object instance, @NonNull String... resources) throws IOException {
         super(instance);
         proxies = new Whitelist[resources.length];
         for (int i = 0; i < resources.length; i++) {
@@ -25,7 +25,7 @@ public StaticProxyInstanceWhitelist(Object instance, @Nonnull String... resource
     }
 
     @Override
-    public boolean permitsMethod(@Nonnull Method method, @Nonnull Object receiver, @Nonnull Object[] args) {
+    public boolean permitsMethod(@NonNull Method method, @NonNull Object receiver, @NonNull Object[] args) {
         if (permitsInstance(receiver)) {
             for (Whitelist proxy : proxies) {
                 if (proxy.permitsMethod(method, receiver, args)) {
@@ -37,7 +37,7 @@ public boolean permitsMethod(@Nonnull Method method, @Nonnull Object receiver, @
     }
 
     @Override
-    public boolean permitsFieldGet(@Nonnull Field field, @Nonnull Object receiver) {
+    public boolean permitsFieldGet(@NonNull Field field, @NonNull Object receiver) {
         if (permitsInstance(receiver)) {
             for (Whitelist proxy : proxies) {
                 if (proxy.permitsFieldGet(field, receiver)) {
@@ -49,7 +49,7 @@ public boolean permitsFieldGet(@Nonnull Field field, @Nonnull Object receiver) {
     }
 
     @Override
-    public boolean permitsFieldSet(@Nonnull Field field, @Nonnull Object receiver, @CheckForNull Object value) {
+    public boolean permitsFieldSet(@NonNull Field field, @NonNull Object receiver, @CheckForNull Object value) {
         return false;
     }
 }
diff --git a/src/main/java/hudson/plugins/emailext/groovy/sandbox/TaskListenerInstanceWhitelist.java b/src/main/java/hudson/plugins/emailext/groovy/sandbox/TaskListenerInstanceWhitelist.java
index 8561dc244..9c43f9fca 100644
--- a/src/main/java/hudson/plugins/emailext/groovy/sandbox/TaskListenerInstanceWhitelist.java
+++ b/src/main/java/hudson/plugins/emailext/groovy/sandbox/TaskListenerInstanceWhitelist.java
@@ -2,8 +2,8 @@
 
 import hudson.model.TaskListener;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
@@ -17,7 +17,7 @@ public TaskListenerInstanceWhitelist(TaskListener instance) {
     }
 
     @Override
-    public boolean permitsMethod(@Nonnull Method method, @Nonnull Object receiver, @Nonnull Object[] args) {
+    public boolean permitsMethod(@NonNull Method method, @NonNull Object receiver, @NonNull Object[] args) {
         if (permitsInstance(receiver) && isClass(method.getDeclaringClass())) {
             String name = method.getName();
             return name.equals("getLogger")
@@ -29,12 +29,12 @@ public boolean permitsMethod(@Nonnull Method method, @Nonnull Object receiver, @
     }
 
     @Override
-    public boolean permitsFieldGet(@Nonnull Field field, @Nonnull Object receiver) {
+    public boolean permitsFieldGet(@NonNull Field field, @NonNull Object receiver) {
         return false;
     }
 
     @Override
-    public boolean permitsFieldSet(@Nonnull Field field, @Nonnull Object receiver, @CheckForNull Object value) {
+    public boolean permitsFieldSet(@NonNull Field field, @NonNull Object receiver, @CheckForNull Object value) {
         return false;
     }
 }
diff --git a/src/main/java/hudson/plugins/emailext/plugins/RecipientProvider.java b/src/main/java/hudson/plugins/emailext/plugins/RecipientProvider.java
index d949150af..1d1132875 100644
--- a/src/main/java/hudson/plugins/emailext/plugins/RecipientProvider.java
+++ b/src/main/java/hudson/plugins/emailext/plugins/RecipientProvider.java
@@ -9,7 +9,7 @@
 import jenkins.model.Jenkins;
 import org.apache.commons.lang.StringUtils;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.mail.internet.InternetAddress;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -44,7 +44,7 @@ public static List<RecipientProviderDescriptor> allSupporting(Class<? extends Jo
         return rt;
     }
 
-    public static void checkAllSupport(@Nonnull List<? extends RecipientProvider> providers, Class<? extends Job> clazz) {
+    public static void checkAllSupport(@NonNull List<? extends RecipientProvider> providers, Class<? extends Job> clazz) {
         Set<String> notSupported = new TreeSet<>();
         for (RecipientProvider provider : providers) {
             if (!provider.getDescriptor().isApplicable(clazz)) {
diff --git a/src/main/java/hudson/plugins/emailext/plugins/content/JellyScriptContent.java b/src/main/java/hudson/plugins/emailext/plugins/content/JellyScriptContent.java
index 61d7b73d5..f3ffcdb77 100644
--- a/src/main/java/hudson/plugins/emailext/plugins/content/JellyScriptContent.java
+++ b/src/main/java/hudson/plugins/emailext/plugins/content/JellyScriptContent.java
@@ -21,7 +21,7 @@
 import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
 import org.xml.sax.InputSource;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -44,7 +44,7 @@ public JellyScriptContent() {
     }
 
     @Override
-    public String evaluate(@Nonnull Run<?, ?> run, FilePath workspace, @Nonnull TaskListener listener, String macroName) throws MacroEvaluationException, IOException, InterruptedException {
+    public String evaluate(@NonNull Run<?, ?> run, FilePath workspace, @NonNull TaskListener listener, String macroName) throws MacroEvaluationException, IOException, InterruptedException {
         InputStream inputStream = null;
 
         try {
@@ -64,7 +64,7 @@ protected Class<? extends ConfigProvider> getProviderClass() {
         return JellyTemplateConfigProvider.class;
     }
 
-    private String renderContent(@Nonnull Run<?, ?> build, InputStream inputStream, @Nonnull TaskListener listener)
+    private String renderContent(@NonNull Run<?, ?> build, InputStream inputStream, @NonNull TaskListener listener)
             throws JellyException, IOException {
         String rawScript = IOUtils.toString(inputStream);
         if (inputStream instanceof UserProvidedContentInputStream) {
@@ -93,7 +93,7 @@ private String convert(Run<?, ?> build, JellyContext context, Script script)
         return output.toString(getCharset(build));
     }
 
-    private JellyContext createContext(Object it, @Nonnull Run<?, ?> build, @Nonnull TaskListener listener) {
+    private JellyContext createContext(Object it, @NonNull Run<?, ?> build, @NonNull TaskListener listener) {
         JellyContext context = new JellyContext();
         ExtendedEmailPublisherDescriptor descriptor = Jenkins.get().getDescriptorByType(ExtendedEmailPublisherDescriptor.class);
         context.setVariable("it", it);
diff --git a/src/main/java/hudson/plugins/emailext/plugins/recipients/RecipientProviderUtilities.java b/src/main/java/hudson/plugins/emailext/plugins/recipients/RecipientProviderUtilities.java
index 3d6492ee6..379f10ae5 100644
--- a/src/main/java/hudson/plugins/emailext/plugins/recipients/RecipientProviderUtilities.java
+++ b/src/main/java/hudson/plugins/emailext/plugins/recipients/RecipientProviderUtilities.java
@@ -39,7 +39,7 @@
 import org.acegisecurity.Authentication;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
 
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import javax.mail.internet.InternetAddress;
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java b/src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java
index cf58ade60..3b2c0f57c 100644
--- a/src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java
+++ b/src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java
@@ -27,7 +27,7 @@
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.io.ObjectStreamException;
 import java.io.PrintStream;
@@ -76,7 +76,7 @@ private boolean hasScript() {
     }
 
     @Override
-    public boolean configure(@Nonnull StaplerRequest req, @Nonnull JSONObject formData) {
+    public boolean configure(@NonNull StaplerRequest req, @NonNull JSONObject formData) {
         super.configure(req, formData);
         if(formData.containsKey("secureTriggerScript")) {
             this.secureTriggerScript = req.bindJSON(SecureGroovyScript.class, formData.getJSONObject("secureTriggerScript"));
diff --git a/src/test/java/hudson/plugins/emailext/EmailExtStepTest.java b/src/test/java/hudson/plugins/emailext/EmailExtStepTest.java
index 028787c26..583d44514 100644
--- a/src/test/java/hudson/plugins/emailext/EmailExtStepTest.java
+++ b/src/test/java/hudson/plugins/emailext/EmailExtStepTest.java
@@ -20,7 +20,7 @@
 import org.jvnet.mock_javamail.Mailbox;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.mail.BodyPart;
 import javax.mail.Message;
 import javax.mail.internet.MimeMessage;
@@ -174,7 +174,7 @@ public static class Execution extends SynchronousNonBlockingStepExecution<Boolea
 
             private final transient FileCopyStep step;
 
-            protected Execution(FileCopyStep step, @Nonnull StepContext context) {
+            protected Execution(FileCopyStep step, @NonNull StepContext context) {
                 super(context);
                 this.step = step;
             }