s/javax.annotation.concurrent.GuardedBy/net.jcip.annotations.GuardedBy/

core/src/main/java/hudson/model/Computer.java

@@ -93,7 +93,7 @@ import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
 
 import edu.umd.cs.findbugs.annotations.OverrideMustInvoke;
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import javax.servlet.ServletException;
 
 import java.io.File;

core/src/main/java/hudson/model/Executor.java

@@ -46,7 +46,7 @@ import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;

core/src/main/java/hudson/model/ListView.java

@@ -47,7 +47,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.model.ParameterizedJobMixIn;

core/src/main/java/hudson/model/Queue.java

@@ -109,7 +109,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import javax.servlet.ServletException;
 
 import jenkins.model.Jenkins;

core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java

@@ -34,7 +34,7 @@ import hudson.slaves.OfflineCause;
 import jenkins.util.SystemProperties;
 import jenkins.util.Timer;
 
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Date;

core/src/main/java/hudson/slaves/CloudRetentionStrategy.java

@@ -25,7 +25,7 @@ package hudson.slaves;
 
 
 import jenkins.util.SystemProperties;
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import java.io.IOException;
 import java.util.logging.Logger;
 

core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java

@@ -5,7 +5,7 @@ import hudson.model.Node;
 import java.util.concurrent.TimeUnit;
 import jenkins.model.Jenkins;
 
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;

core/src/main/java/hudson/slaves/NodeProvisioner.java

@@ -37,7 +37,7 @@ import org.jenkinsci.Symbol;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import java.awt.Color;
 import java.util.Arrays;
 import java.util.Collections;

core/src/main/java/hudson/slaves/RetentionStrategy.java

@@ -35,7 +35,7 @@ import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;

core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java

@@ -35,7 +35,7 @@ import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import java.io.InvalidObjectException;
 import java.io.ObjectStreamException;
 import java.util.Calendar;

core/src/main/java/hudson/util/RobustReflectionConverter.java

@@ -55,7 +55,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import static java.util.logging.Level.FINE;
 import java.util.logging.Logger;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import jenkins.util.xstream.CriticalXStreamException;
 
 /**

core/src/main/java/jenkins/model/queue/AsynchronousExecution.java

@@ -36,7 +36,7 @@ import hudson.model.ResourceController;
 import hudson.model.ResourceList;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;

core/src/main/java/jenkins/model/queue/ItemDeletion.java

@@ -36,7 +36,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 
 /**
  * A {@link Queue.QueueDecisionHandler} that blocks items being deleted from entering the queue.

test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java

@@ -34,7 +34,7 @@ import org.kohsuke.stapler.Stapler;
 import org.springframework.dao.DataAccessException;
 import test.security.realm.InMemorySecurityRealm;
 
-import javax.annotation.concurrent.GuardedBy;
+import net.jcip.annotations.GuardedBy;
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.Matchers.is;