Merge branch 'master' into security-master

core/src/main/java/hudson/DependencyRunner.java

@@ -35,7 +35,6 @@ import java.util.Set;
 import java.util.Collection;
 import java.util.logging.Logger;
 
-import org.acegisecurity.Authentication;
 import org.acegisecurity.context.SecurityContext;
 import org.acegisecurity.context.SecurityContextHolder;
 

core/src/main/java/hudson/ExtensionFinder.java

@@ -37,7 +37,6 @@ import com.google.inject.Scope;
 import com.google.inject.Scopes;
 import com.google.inject.name.Names;
 import com.google.common.collect.ImmutableList;
-import hudson.init.InitMilestone;
 import hudson.model.Descriptor;
 import hudson.model.Hudson;
 import jenkins.ExtensionComponentSet;

core/src/main/java/hudson/ExtensionListView.java

@@ -24,7 +24,6 @@
 package hudson;
 
 import jenkins.model.Jenkins;
-import hudson.tasks.UserNameResolver;
 import hudson.util.CopyOnWriteList;
 
 import java.util.AbstractList;

core/src/main/java/hudson/FilePath.java

@@ -90,7 +90,6 @@ import java.io.OutputStreamWriter;
 import java.io.RandomAccessFile;
 import java.io.Serializable;
 import java.io.Writer;
-import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;

core/src/main/java/hudson/Launcher.java

@@ -29,7 +29,6 @@ import hudson.util.QuotedStringTokenizer;
 import jenkins.model.Jenkins;
 import hudson.model.TaskListener;
 import hudson.model.Node;
-import hudson.remoting.Callable;
 import hudson.remoting.Channel;
 import hudson.remoting.Pipe;
 import hudson.remoting.RemoteInputStream;

core/src/main/java/hudson/LauncherDecorator.java

 package hudson;
 
-import jenkins.model.Jenkins;
 import hudson.model.Node;
 import hudson.model.Executor;
 import hudson.tasks.BuildWrapper;

core/src/main/java/hudson/PluginManagerStaplerOverride.java

 package hudson;
 
-import jenkins.model.Jenkins;
 
-import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 /**

core/src/main/java/hudson/UDPBroadcastFragment.java

@@ -23,7 +23,6 @@
  */
 package hudson;
 
-import jenkins.model.Jenkins;
 
 import java.net.SocketAddress;
 

core/src/main/java/hudson/URLConnectionDecorator.java

@@ -23,7 +23,6 @@
  */
 package hudson;
 
-import jenkins.model.Jenkins;
 
 import java.io.IOException;
 import java.net.URL;

core/src/main/java/hudson/cli/BuildCommand.java

@@ -35,7 +35,6 @@ import hudson.model.ParameterDefinition;
 import hudson.Extension;
 import hudson.AbortException;
 import hudson.model.Item;
-import hudson.model.Result;
 import hudson.model.TaskListener;
 import hudson.model.User;
 import hudson.model.queue.QueueTaskFuture;
@@ -52,7 +51,6 @@ import java.util.ArrayList;
 import java.util.Map.Entry;
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
-import javax.annotation.Nonnull;
 
 import jenkins.model.Jenkins;
 

core/src/main/java/hudson/cli/CliTransportAuthenticator.java

@@ -4,7 +4,6 @@ import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.remoting.Channel;
 import hudson.security.SecurityRealm;
-import jenkins.model.Jenkins;
 
 /**
  * Perform {@link SecurityRealm} independent authentication.

core/src/main/java/hudson/cli/CommandDuringBuild.java

@@ -27,7 +27,6 @@ package hudson.cli;
 import jenkins.model.Jenkins;
 import hudson.model.Job;
 import hudson.model.Run;
-import hudson.remoting.Callable;
 import jenkins.security.MasterToSlaveCallable;
 import org.kohsuke.args4j.CmdLineException;
 

core/src/main/java/hudson/cli/DeleteNodeCommand.java

@@ -24,7 +24,6 @@
 package hudson.cli;
 
 import hudson.Extension;
-import hudson.model.Computer;
 import hudson.model.Node;
 import jenkins.model.Jenkins;
 import org.kohsuke.args4j.Argument;

core/src/main/java/hudson/cli/GroovyCommand.java

@@ -30,23 +30,15 @@ import hudson.model.AbstractProject;
 import jenkins.model.Jenkins;
 import hudson.model.Item;
 import hudson.model.Run;
-import hudson.remoting.Callable;
-import hudson.AbortException;
 import hudson.Extension;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.FileUtils;
 
 import java.io.IOException;
-import java.io.Serializable;
-import java.io.File;
-import java.io.InputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
-import java.net.URL;
-import java.net.MalformedURLException;
 
 /**
  * Executes the specified groovy script.

core/src/main/java/hudson/cli/ReloadJobCommand.java

@@ -24,12 +24,9 @@
 package hudson.cli;
 
 import hudson.Extension;
-import hudson.cli.handlers.ViewOptionHandler;
 import hudson.model.AbstractItem;
 import hudson.model.AbstractProject;
 import hudson.model.Item;
-import hudson.model.ViewGroup;
-import hudson.model.View;
 
 import jenkins.model.Jenkins;
 import org.kohsuke.args4j.Argument;

core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java

@@ -3,9 +3,7 @@ package hudson.cli;
 import hudson.Extension;
 import hudson.model.AbstractProject;
 import hudson.model.Run;
-import hudson.remoting.Callable;
 
-import java.io.IOException;
 import java.io.Serializable;
 
 import org.apache.commons.io.IOUtils;

core/src/main/java/hudson/cli/SetBuildResultCommand.java

@@ -25,7 +25,6 @@
 package hudson.cli;
 
 import hudson.Extension;
-import hudson.model.Item;
 import hudson.model.Result;
 import hudson.model.Run;
 import org.kohsuke.args4j.Argument;

core/src/main/java/hudson/cli/declarative/CLIRegisterer.java

@@ -33,7 +33,6 @@ import hudson.model.Hudson;
 import jenkins.ExtensionComponentSet;
 import jenkins.ExtensionRefreshException;
 import jenkins.model.Jenkins;
-import hudson.remoting.Channel;
 import hudson.security.CliAuthenticator;
 import org.acegisecurity.Authentication;
 import org.acegisecurity.context.SecurityContext;

core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java

@@ -26,7 +26,6 @@ package hudson.console;
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 import hudson.model.Run;
 import hudson.util.TimeUnit2;
 import org.jvnet.tiger_types.Types;

core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java

@@ -24,7 +24,6 @@
 package hudson.diagnosis;
 
 import hudson.model.AdministrativeMonitor;
-import jenkins.model.Jenkins;
 import hudson.model.AbstractModelObject;
 import hudson.Extension;
 import hudson.ExtensionPoint;

core/src/main/java/hudson/init/Terminator.java

 package hudson.init;
 
 import org.jvnet.hudson.annotation_indexer.Indexed;
-import org.jvnet.hudson.reactor.Task;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

core/src/main/java/hudson/init/impl/GroovyInitScript.java

@@ -27,7 +27,6 @@ import hudson.init.Initializer;
 import jenkins.model.Jenkins;
 import jenkins.util.groovy.GroovyHookScript;
 
-import java.io.IOException;
 
 import static hudson.init.InitMilestone.*;
 

core/src/main/java/hudson/lifecycle/UnixLifecycle.java

@@ -24,7 +24,6 @@
 package hudson.lifecycle;
 
 import com.sun.akuma.JavaVMArguments;
-import com.sun.akuma.Daemon;
 import com.sun.jna.Native;
 import com.sun.jna.StringArray;
 

core/src/main/java/hudson/logging/LogRecorder.java

@@ -33,7 +33,6 @@ import hudson.model.*;
 import hudson.util.HttpResponses;
 import jenkins.model.Jenkins;
 import hudson.model.listeners.SaveableListener;
-import hudson.remoting.Callable;
 import hudson.remoting.Channel;
 import hudson.remoting.VirtualChannel;
 import hudson.slaves.ComputerListener;

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

@@ -30,8 +30,6 @@ import hudson.EnvVars;
 import hudson.FilePath;
 import hudson.Functions;
 import hudson.Launcher;
-import hudson.console.AnnotatedLargeText;
-import hudson.console.ExpandableDetailsNote;
 import hudson.console.ModelHyperlinkNote;
 import hudson.model.Fingerprint.BuildPtr;
 import hudson.model.Fingerprint.RangeSet;
@@ -70,7 +68,6 @@ import javax.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.io.InterruptedIOException;
-import java.io.StringWriter;
 import java.lang.ref.WeakReference;
 import java.util.AbstractSet;
 import java.util.ArrayList;

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

@@ -30,7 +30,6 @@ import hudson.XmlFile;
 import hudson.Util;
 import hudson.Functions;
 import hudson.BulkChange;
-import hudson.cli.declarative.CLIMethod;
 import hudson.cli.declarative.CLIResolver;
 import hudson.model.listeners.ItemListener;
 import hudson.model.listeners.SaveableListener;

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

@@ -28,7 +28,6 @@ import hudson.ExtensionList;
 import hudson.Extension;
 import hudson.ExtensionPoint.LegacyInstancesAreScopedToHudson;
 import hudson.triggers.SCMTrigger;
-import hudson.triggers.TimerTrigger;
 
 import java.util.Set;
 import java.io.IOException;

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

@@ -27,11 +27,9 @@ import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.init.Initializer;
 import hudson.triggers.SafeTimerTask;
-import jenkins.model.Jenkins;
 import jenkins.util.Timer;
 
 import java.util.Random;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 

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

@@ -31,8 +31,6 @@ import java.io.IOException;
 import java.util.logging.Level;
 
 import jenkins.model.Jenkins;
-import org.acegisecurity.context.SecurityContext;
-import org.acegisecurity.context.SecurityContextHolder;
 
 /**
  * {@link AperiodicWork} that takes a long time to run. Similar to {@link AsyncPeriodicWork}, see {@link AsyncPeriodicWork} for

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

@@ -3,7 +3,6 @@ package hudson.model;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.tasks.BuildStep;
-import jenkins.model.Jenkins;
 
 /**
  * Receives events that happen as a build executes {@link BuildStep}s.

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

@@ -27,7 +27,6 @@ import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.tasks.Builder;
 import hudson.tasks.Publisher;
-import jenkins.model.Jenkins;
 
 import java.util.Map;
 

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

@@ -4,7 +4,6 @@ import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import java.util.ArrayList;
 import java.util.List;
-import jenkins.model.Jenkins;
 
 /**
  * Adds box rendered in the computer side panel.

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

@@ -3,7 +3,6 @@ package hudson.model;
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 
 import java.io.IOException;
 import java.net.InetAddress;

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

@@ -4,7 +4,6 @@ import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.scm.SCMDescriptor;
 import jenkins.ExtensionFilter;
-import jenkins.model.Jenkins;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -23,7 +23,6 @@
  */
 package hudson.model;
 
-import hudson.util.HttpResponses;
 
 import java.io.IOException;
 

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

@@ -28,7 +28,6 @@ import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.scm.SCM;
-import jenkins.model.Jenkins;
 
 import java.io.IOException;
 import javax.annotation.Nonnull;

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

@@ -23,7 +23,6 @@
  */
 package hudson.model;
 
-import hudson.slaves.SlaveComputer;
 
 /**
  * A listener for task related events from executors.

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

@@ -39,7 +39,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

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

@@ -47,9 +47,7 @@ import java.io.File;
 import java.io.IOException;
 import java.text.NumberFormat;
 import java.text.ParseException;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import static hudson.Util.fixEmpty;
 import javax.annotation.CheckForNull;

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

@@ -23,7 +23,6 @@
  */
 package hudson.model;
 
-import hudson.model.listeners.ItemListener;
 import java.io.IOException;
 import java.util.Collection;
 import java.io.File;

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

@@ -27,7 +27,6 @@ import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.labels.LabelAtom;
-import jenkins.model.Jenkins;
 
 import java.util.Collection;
 

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

@@ -25,11 +25,9 @@ package hudson.model;
 
 import hudson.init.Initializer;
 import hudson.triggers.SafeTimerTask;
-import hudson.triggers.Trigger;
 import hudson.ExtensionPoint;
 import hudson.Extension;
 import hudson.ExtensionList;
-import jenkins.model.Jenkins;
 import jenkins.util.Timer;
 
 import java.util.concurrent.TimeUnit;

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

@@ -64,7 +64,6 @@ import hudson.model.queue.CauseOfBlockage.BecauseNodeIsOffline;
 import hudson.model.queue.CauseOfBlockage.BecauseLabelIsOffline;
 import hudson.model.queue.CauseOfBlockage.BecauseNodeIsBusy;
 import hudson.model.queue.WorkUnitContext;
-import hudson.security.ACL;
 import jenkins.security.QueueItemAuthenticatorProvider;
 import jenkins.util.Timer;
 import hudson.triggers.SafeTimerTask;

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

@@ -25,7 +25,6 @@ package hudson.model;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /**
  * Represents things that {@link hudson.model.Queue.Executable} uses while running.

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

@@ -45,7 +45,6 @@ import hudson.model.Run.RunExecution;
 import hudson.model.listeners.RunListener;
 import hudson.model.listeners.SaveableListener;
 import hudson.model.queue.Executables;
-import hudson.model.queue.SubTask;
 import hudson.search.SearchIndexBuilder;
 import hudson.security.ACL;
 import hudson.security.AccessControlled;
@@ -53,7 +52,6 @@ import hudson.security.Permission;
 import hudson.security.PermissionGroup;
 import hudson.security.PermissionScope;
 import hudson.tasks.BuildWrapper;
-import hudson.util.FlushProofOutputStream;
 import hudson.util.FormApply;
 import hudson.util.LogTaskListener;
 import hudson.util.ProcessTree;
@@ -105,7 +103,6 @@ import jenkins.model.PeepholePermalink;
 import jenkins.model.RunAction2;
 import jenkins.model.StandardArtifactManager;
 import jenkins.model.lazy.BuildReference;
-import jenkins.model.lazy.LazyBuildMixIn;
 import jenkins.util.VirtualFile;
 import jenkins.util.io.OnMaster;
 import net.sf.json.JSONObject;

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

@@ -39,7 +39,6 @@ import jenkins.model.RunIdMigrator;
 import jenkins.model.lazy.AbstractLazyLoadRunMap;
 import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.*;
 import jenkins.model.lazy.BuildReference;
-import jenkins.model.lazy.LazyBuildMixIn;
 import org.apache.commons.collections.comparators.ReverseComparator;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;

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

@@ -24,7 +24,6 @@
 package hudson.model;
 
 import hudson.BulkChange;
-import hudson.model.listeners.SaveableListener;
 import java.io.IOException;
 
 /**

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

@@ -33,7 +33,6 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.Serializable;
-import java.util.Formatter;
 
 /**
  * Receives events that happen during some lengthy operation

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

@@ -3,7 +3,6 @@ package hudson.model;
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 import java.util.Collection;
 import java.util.Collections;
 import jenkins.model.TransientActionFactory;

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

@@ -25,7 +25,6 @@ package hudson.model;
 
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -27,7 +27,6 @@ import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.tasks.BuildStep;
-import jenkins.model.Jenkins;
 
 import java.util.Collection;
 import jenkins.model.TransientActionFactory;

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

@@ -2,7 +2,6 @@ package hudson.model;
 
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -35,7 +35,6 @@ import hudson.Indenter;
 import hudson.Util;
 import hudson.model.Descriptor.FormException;
 import hudson.model.labels.LabelAtomPropertyDescriptor;
-import hudson.model.listeners.ItemListener;
 import hudson.scm.ChangeLogSet;
 import hudson.scm.ChangeLogSet.Entry;
 import hudson.search.CollectionSearchIndex;

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

@@ -32,7 +32,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 /**

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

@@ -3,7 +3,6 @@ package hudson.model;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.FilePath;
-import jenkins.model.Jenkins;
 
 public abstract class WorkspaceListener implements ExtensionPoint {
     

core/src/main/java/hudson/model/listeners/SCMPollListener.java

@@ -26,7 +26,6 @@ package hudson.model.listeners;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.scm.PollingResult;
-import jenkins.model.Jenkins;
 import hudson.model.AbstractProject;
 import hudson.model.TaskListener;
 

core/src/main/java/hudson/model/queue/LoadPredictor.java

@@ -28,7 +28,6 @@ import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.Computer;
 import hudson.model.Executor;
-import jenkins.model.Jenkins;
 
 import java.util.ArrayList;
 import java.util.Collections;

core/src/main/java/hudson/model/queue/MappingWorksheet.java

@@ -25,7 +25,6 @@ package hudson.model.queue;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import hudson.model.AbstractProject;
 import hudson.model.Computer;
 import hudson.model.Executor;
 import hudson.model.Label;

core/src/main/java/hudson/model/queue/QueueListener.java

@@ -2,14 +2,12 @@ package hudson.model.queue;
 
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import hudson.model.Computer;
 import hudson.model.Queue;
 import hudson.model.Queue.BlockedItem;
 import hudson.model.Queue.BuildableItem;
 import hudson.model.Queue.Item;
 import hudson.model.Queue.LeftItem;
 import hudson.model.Queue.WaitingItem;
-import jenkins.model.Jenkins;
 
 import java.util.concurrent.Executor;
 

core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java

@@ -27,9 +27,7 @@ package hudson.model.queue;
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import hudson.model.Queue.Item;
 import hudson.slaves.Cloud;
-import jenkins.model.Jenkins;
 import hudson.model.Node;
 import hudson.model.Queue;
 import hudson.model.Queue.BuildableItem;

core/src/main/java/hudson/model/queue/ScheduleResult.java

 package hudson.model.queue;
 
-import hudson.model.Action;
 import hudson.model.Queue;
 import hudson.model.Queue.Item;
-import hudson.model.Queue.Task;
 import hudson.model.Queue.WaitingItem;
 import javax.annotation.CheckForNull;
 

core/src/main/java/hudson/model/queue/SubTaskContributor.java

@@ -27,7 +27,6 @@ import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.AbstractProject;
-import jenkins.model.Jenkins;
 
 import java.util.Collection;
 import java.util.Collections;

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

@@ -12,7 +12,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 

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

@@ -26,7 +26,6 @@ package hudson.node_monitors;
 import hudson.Util;
 import hudson.model.Computer;
 import hudson.model.Descriptor;
-import hudson.model.Run;
 import jenkins.model.Jenkins;
 import hudson.model.ComputerSet;
 import hudson.model.AdministrativeMonitor;

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

@@ -27,7 +27,6 @@ import hudson.Functions;
 import jenkins.MasterToSlaveFileCallable;
 import hudson.remoting.VirtualChannel;
 import hudson.Util;
-import hudson.slaves.OfflineCause;
 import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace;
 
 import java.io.File;

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

@@ -10,7 +10,6 @@ import jenkins.model.Jenkins;
 import java.io.IOException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import jenkins.util.Timer;
 

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

@@ -25,7 +25,6 @@ package hudson.node_monitors;
 
 import hudson.Util;
 import hudson.Extension;
-import hudson.slaves.OfflineCause;
 import hudson.model.Computer;
 import hudson.remoting.Callable;
 import jenkins.security.MasterToSlaveCallable;

core/src/main/java/hudson/os/solaris/ZFSInstaller.java

@@ -32,7 +32,6 @@ import hudson.os.SU;
 import hudson.model.AdministrativeMonitor;
 import jenkins.model.Jenkins;
 import hudson.model.TaskListener;
-import hudson.remoting.Callable;
 import hudson.util.ForkOutputStream;
 import hudson.util.HudsonIsRestarting;
 import hudson.util.StreamTaskListener;

core/src/main/java/hudson/scm/ChangeLogAnnotator.java

@@ -34,7 +34,6 @@ import hudson.model.Run;
 import hudson.scm.ChangeLogSet.Entry;
 import hudson.util.CopyOnWriteList;
 import java.util.logging.Logger;
-import jenkins.model.Jenkins;
 
 /**
  * Performs mark up on changelog messages to be displayed.

core/src/main/java/hudson/scm/PollingResult.java

@@ -7,7 +7,6 @@ import hudson.FilePath;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.Serializable;
 
 /**

core/src/main/java/hudson/search/SearchFactory.java

@@ -3,7 +3,6 @@ package hudson.search;
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 
 /**
  * Creates a {@link Search} instance for a {@link SearchableModelObject}.

core/src/main/java/hudson/security/BasicAuthenticationFilter.java

@@ -28,8 +28,6 @@ import jenkins.model.Jenkins;
 import hudson.util.Scrambler;
 import jenkins.security.ApiTokenProperty;
 import org.acegisecurity.context.SecurityContextHolder;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;

core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java

@@ -24,8 +24,6 @@
 package hudson.security;
 
 import hudson.Functions;
-import jenkins.model.Jenkins;
-import hudson.TcpSlaveAgentListener;
 
 import com.google.common.base.Strings;
 import org.acegisecurity.AuthenticationException;

core/src/main/java/hudson/security/PermissionAdder.java

@@ -26,7 +26,6 @@ package hudson.security;
 
 import hudson.ExtensionPoint;
 import hudson.model.User;
-import jenkins.model.Jenkins;
 
 /**
  * Service which can add permissions for a given user to the configured authorization strategy.

core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java

@@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Date;
-import java.util.logging.Level;
 
 /**
  * {@link TokenBasedRememberMeServices} with modification so as not to rely

core/src/main/java/hudson/security/csrf/CrumbExclusion.java

@@ -7,7 +7,6 @@ package hudson.security.csrf;
 
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;

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

@@ -5,8 +5,6 @@ import hudson.ExtensionPoint;
 import hudson.model.Label;
 import hudson.model.Node;
 import hudson.model.queue.CauseOfBlockage;
-import jenkins.model.Jenkins;
-import org.jvnet.localizer.Localizable;
 
 import java.util.Collection;
 

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

@@ -23,10 +23,6 @@
  */
 package hudson.slaves;
 
-import hudson.model.Computer;
-import hudson.model.Node;
-import hudson.model.Queue;
-import jenkins.model.Jenkins;
 
 import javax.annotation.concurrent.GuardedBy;
 import java.io.IOException;

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

@@ -31,10 +31,7 @@ import hudson.FilePath;
 import hudson.model.Computer;
 import hudson.model.Node;
 import hudson.model.TaskListener;
-import org.jenkinsci.remoting.CallableDecorator;
 import hudson.remoting.Channel;
-import hudson.remoting.ChannelBuilder;
-import jenkins.model.Jenkins;
 
 import java.io.IOException;
 

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

@@ -39,7 +39,6 @@ import hudson.model.BuildListener;
 import hudson.model.Environment;
 import jenkins.model.Jenkins;
 import hudson.model.Node;
-import hudson.model.Queue;
 import hudson.model.Queue.Task;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;

core/src/main/java/hudson/tasks/BuildStep.java

@@ -46,7 +46,6 @@ import java.util.List;
 import java.util.AbstractList;
 import java.util.Iterator;
 import java.util.WeakHashMap;
-import jenkins.model.Jenkins;
 import jenkins.security.QueueItemAuthenticator;
 import org.acegisecurity.Authentication;
 

core/src/main/java/hudson/tasks/CommandInterpreter.java

@@ -25,14 +25,12 @@ package hudson.tasks;
 
 import hudson.FilePath;
 import hudson.Launcher;
-import hudson.Launcher.ProcStarter;
 import hudson.Proc;
 import hudson.Util;
 import hudson.EnvVars;
 import hudson.model.AbstractBuild;
 import hudson.model.BuildListener;
 import hudson.model.Node;
-import hudson.model.Result;
 import hudson.model.TaskListener;
 import hudson.remoting.ChannelClosedException;
 

core/src/main/java/hudson/tasks/UserNameResolver.java

@@ -27,7 +27,6 @@ import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionListView;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 import hudson.model.User;
 
 import java.util.List;

core/src/main/java/hudson/tools/JDKInstaller.java

@@ -34,7 +34,6 @@ import hudson.model.DownloadService.Downloadable;
 import hudson.model.JDK;
 import hudson.model.Node;
 import hudson.model.TaskListener;
-import hudson.remoting.Callable;
 import hudson.util.ArgumentListBuilder;
 import hudson.util.FormValidation;
 import hudson.util.HttpResponses;

core/src/main/java/hudson/tools/ToolLocationTranslator.java

@@ -26,7 +26,6 @@ package hudson.tools;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.slaves.NodeSpecific;
-import jenkins.model.Jenkins;
 import hudson.model.Node;
 import hudson.model.TaskListener;
 

core/src/main/java/hudson/triggers/SafeTimerTask.java

@@ -29,7 +29,6 @@ import hudson.security.ACL;
 import java.util.TimerTask;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import jenkins.util.Timer;
 import org.acegisecurity.context.SecurityContext;
 import org.acegisecurity.context.SecurityContextHolder;
 

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

@@ -27,7 +27,6 @@ import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.AbstractProject;
-import jenkins.model.Jenkins;
 
 /**
  * Provides the alternative text to be rendered in the UI.

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

@@ -24,7 +24,6 @@
  */
 package hudson.util;
 
-import hudson.FilePath;
 import hudson.Launcher;
 import hudson.Util;
 

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

@@ -33,7 +33,6 @@ import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 
 import static java.util.Arrays.asList;

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

@@ -3,9 +3,7 @@ package hudson.util;
 import hudson.Util;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.Stack;

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

@@ -28,7 +28,6 @@ import jenkins.model.Jenkins;
 import hudson.triggers.SafeTimerTask;
 import jenkins.util.Timer;
 import org.apache.commons.io.FileUtils;
-import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 

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

@@ -24,7 +24,6 @@
 
 package hudson.util;
 
-import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 

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

@@ -31,9 +31,7 @@ import java.net.UnknownHostException;
 
 import org.apache.commons.httpclient.ConnectTimeoutException;
 import org.apache.commons.httpclient.params.HttpConnectionParams; 
-import org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory;
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.commons.httpclient.protocol.ReflectionSocketFactory;
 
 /**
  * A SecureProtocolSocketFactory that creates sockets without binding to a specific interface.

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

@@ -23,7 +23,6 @@
  */
 package hudson.util;
 
-import hudson.Functions;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 

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

@@ -26,8 +26,6 @@ package hudson.util;
 
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
-import hudson.util.ProcessTree.OSProcess;
 
 import java.io.IOException;
 import java.io.Serializable;

core/src/main/java/hudson/util/io/TarArchiver.java

@@ -25,18 +25,14 @@
 package hudson.util.io;
 
 import hudson.Functions;
-import hudson.org.apache.tools.tar.TarOutputStream;
 import hudson.os.PosixException;
 import hudson.util.FileVisitor;
 import hudson.util.IOUtils;
-import org.apache.tools.tar.TarEntry;
 
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.lang.reflect.Field;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 

core/src/main/java/hudson/util/jna/GNUCLibrary.java

@@ -30,7 +30,6 @@ import com.sun.jna.Native;
 import com.sun.jna.Memory;
 import com.sun.jna.NativeLong;
 import com.sun.jna.ptr.IntByReference;
-import hudson.os.PosixAPI;
 import jnr.posix.POSIX;
 import org.jvnet.libpam.impl.CLibrary.passwd;
 

core/src/main/java/hudson/views/GlobalDefaultViewConfiguration.java

@@ -24,9 +24,6 @@
 package hudson.views;
 
 import hudson.Extension;
-import hudson.markup.MarkupFormatter;
-import hudson.security.AuthorizationStrategy;
-import hudson.security.SecurityRealm;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;

core/src/main/java/jenkins/AgentProtocol.java

@@ -4,7 +4,6 @@ import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.TcpSlaveAgentListener;
-import jenkins.model.Jenkins;
 
 import java.io.IOException;
 import java.net.Socket;

core/src/main/java/jenkins/ExtensionFilter.java

@@ -31,7 +31,6 @@ import hudson.model.AdministrativeMonitor;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
 import hudson.model.DescriptorVisibilityFilter;
-import jenkins.model.Jenkins;
 
 /**
  * Filters out {@link ExtensionComponent}s discovered by {@link ExtensionFinder}s,

core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java

@@ -8,7 +8,6 @@ import hudson.security.ACL;
 import hudson.util.StreamTaskListener;
 import jenkins.model.Jenkins;
 import jenkins.security.RekeySecretAdminMonitor;
-import org.apache.commons.io.output.NullOutputStream;
 
 import java.io.File;
 import java.io.IOException;

core/src/main/java/jenkins/management/NodesLink.java

@@ -27,7 +27,6 @@ package jenkins.management;
 import hudson.Extension;
 import hudson.model.ManagementLink;
 import jenkins.management.Messages;
-import jenkins.model.Jenkins;
 
 /**
  * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>

core/src/main/java/jenkins/model/ArtifactManager.java

@@ -26,7 +26,6 @@ package jenkins.model;
 
 import hudson.FilePath;
 import hudson.Launcher;
-import hudson.model.AbstractBuild;
 import hudson.model.BuildListener;
 import hudson.model.Run;
 import hudson.model.TaskListener;

core/src/main/java/jenkins/model/BuildDiscarder.java

@@ -9,7 +9,6 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 import com.thoughtworks.xstream.mapper.Mapper;
 import hudson.ExtensionPoint;
 import hudson.model.AbstractDescribableImpl;
-import hudson.model.AbstractProject;
 import hudson.model.Job;
 import hudson.model.Run;
 import hudson.tasks.LogRotator;

core/src/main/java/jenkins/model/CauseOfInterruption.java

@@ -25,7 +25,6 @@ package jenkins.model;
 
 import hudson.console.ModelHyperlinkNote;
 import hudson.model.Executor;
-import hudson.model.Result;
 import hudson.model.TaskListener;
 import hudson.model.User;
 import org.kohsuke.stapler.export.Exported;

core/src/main/java/jenkins/model/DependencyDeclarer.java

@@ -29,7 +29,6 @@ import hudson.tasks.BuildWrapper;
 import hudson.tasks.Builder;
 import hudson.tasks.Publisher;
 import hudson.triggers.Trigger;
-import hudson.util.DescribableList;
 
 /**
  * Marker interface for project-associated objects that can participate

core/src/main/java/jenkins/model/DirectlyModifiableTopLevelItemGroup.java

@@ -24,9 +24,7 @@
 
 package jenkins.model;
 
-import hudson.model.Item;
 import hudson.model.TopLevelItem;
-import hudson.model.listeners.ItemListener;
 import java.io.IOException;
 
 /**

core/src/main/java/jenkins/model/Nodes.java

@@ -27,7 +27,6 @@ import hudson.BulkChange;
 import hudson.Util;
 import hudson.XmlFile;
 import hudson.model.Computer;
-import hudson.model.ItemGroupMixIn;
 import hudson.model.Node;
 import hudson.model.Queue;
 import hudson.model.Saveable;

core/src/main/java/jenkins/model/RunIdMigrator.java

@@ -28,7 +28,6 @@ import hudson.Extension;
 import hudson.Util;
 import hudson.model.Job;
 import hudson.model.RootAction;
-import hudson.model.Run;
 import hudson.util.AtomicFileWriter;
 import hudson.util.StreamTaskListener;
 import java.io.File;

core/src/main/java/jenkins/model/TransientFingerprintFacetFactory.java

@@ -27,7 +27,6 @@ import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.Fingerprint;
 
-import java.util.Collection;
 import java.util.List;
 
 /**

core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java

@@ -31,11 +31,9 @@ import hudson.model.OverallLoadStatistics;
 import hudson.model.Queue;
 import hudson.model.Queue.Task;
 import hudson.model.queue.SubTask;
-import hudson.model.queue.Tasks;
 import hudson.util.Iterators;
 
 import java.util.Iterator;
-import java.util.List;
 
 /**
  * {@link LoadStatistics} that track the "free roam" jobs (whose {@link Task#getAssignedLabel()} is null)

core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java

@@ -25,7 +25,6 @@
 package jenkins.model.lazy;
 
 import hudson.Extension;
-import hudson.model.AbstractItem;
 import hudson.model.Item;
 import hudson.model.ItemGroup;
 import hudson.model.Job;
@@ -33,7 +32,6 @@ import hudson.model.Queue;
 import hudson.model.Run;
 import hudson.model.RunMap;
 import hudson.model.listeners.ItemListener;
-import hudson.model.queue.SubTask;
 import hudson.widgets.BuildHistoryWidget;
 import hudson.widgets.HistoryWidget;
 import java.io.File;

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

@@ -24,11 +24,8 @@
 
 package jenkins.model.queue;
 
-import hudson.model.Computer;
 import hudson.model.Executor;
-import hudson.model.ExecutorListener;
 import hudson.model.OneOffExecutor;
-import hudson.model.Queue.Executable;
 import hudson.model.Queue.FlyweightTask;
 import hudson.model.Resource;
 import hudson.model.ResourceActivity;
@@ -36,7 +33,6 @@ import hudson.model.ResourceController;
 import hudson.model.ResourceList;
 import javax.annotation.CheckForNull;
 import javax.annotation.concurrent.GuardedBy;
-import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 

core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java

@@ -9,7 +9,6 @@ import hudson.model.TaskListener;
 import hudson.util.IOUtils;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;

core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java

@@ -2,7 +2,6 @@ package jenkins.security;
 
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 import org.acegisecurity.Authentication;
 
 import javax.servlet.ServletException;

core/src/main/java/jenkins/security/ConfidentialKey.java

@@ -3,7 +3,6 @@ package jenkins.security;
 import hudson.scm.SCM;
 import hudson.tasks.Builder;
 import hudson.util.Secret;
-import jenkins.slaves.JnlpSlaveAgentProtocol;
 
 import javax.annotation.CheckForNull;
 import java.io.IOException;

core/src/main/java/jenkins/security/ConfidentialStore.java

@@ -2,7 +2,6 @@ package jenkins.security;
 
 import hudson.Extension;
 import hudson.Lookup;
-import hudson.init.InitMilestone;
 import hudson.util.Secret;
 import hudson.util.Service;
 import jenkins.model.Jenkins;
@@ -11,7 +10,6 @@ import org.kohsuke.MetaInfServices;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.io.IOException;
-import java.security.SecureRandom;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;

core/src/main/java/jenkins/security/MasterToSlaveCallable.java

 package jenkins.security;
 
 import hudson.remoting.Callable;
-import org.jenkinsci.remoting.Role;
 import org.jenkinsci.remoting.RoleChecker;
 
-import java.util.Collection;
 
 /**
  * Convenient {@link Callable} meant to be run on slave.

core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java

@@ -2,14 +2,11 @@ package jenkins.security;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
-import hudson.model.AbstractProject;
-import hudson.security.ACL;
 import hudson.util.DescribableList;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
-import org.acegisecurity.Authentication;
 import org.kohsuke.stapler.StaplerRequest;
 
 import java.io.IOException;

core/src/main/java/jenkins/security/SecurityListener.java

@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nonnull;
-import jenkins.model.Jenkins;
 import org.acegisecurity.GrantedAuthority;
 import org.acegisecurity.userdetails.UserDetails;
 

core/src/main/java/jenkins/security/SlaveToMasterCallable.java

 package jenkins.security;
 
 import hudson.remoting.Callable;
-import org.jenkinsci.remoting.Role;
 import org.jenkinsci.remoting.RoleChecker;
 
-import java.util.Collection;
 
 /**
  * Convenient {@link Callable} that are meant to run on the master (sent by slave/CLI/etc).

core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java

@@ -3,7 +3,6 @@ package jenkins.slaves;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.Slave;
-import jenkins.model.Jenkins;
 
 import java.io.IOException;
 import java.util.Properties;

core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java

@@ -6,7 +6,6 @@ import org.jenkinsci.remoting.nio.NioChannelHub;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.Socket;
-import java.util.Properties;
 
 /**
  * {@link JnlpSlaveAgentProtocol} Version 2.

core/src/main/java/jenkins/slaves/WorkspaceLocator.java

@@ -5,7 +5,6 @@ import hudson.ExtensionPoint;
 import hudson.FilePath;
 import hudson.model.Node;
 import hudson.model.TopLevelItem;
-import jenkins.model.Jenkins;
 
 /**
  * Allow extensions to override workspace locations

core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java

@@ -2,7 +2,6 @@ package jenkins.slaves.restarter;
 
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
 
 import java.io.Serializable;
 import java.util.logging.Logger;

core/src/main/java/jenkins/slaves/systemInfo/SlaveSystemInfo.java

@@ -3,7 +3,6 @@ package jenkins.slaves.systemInfo;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.Computer;
-import jenkins.model.Jenkins;
 
 /**
  * Extension point that contributes to the system information page of {@link Computer}.

core/src/main/java/jenkins/tasks/SimpleBuildStep.java

@@ -28,19 +28,13 @@ import hudson.AbortException;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
-import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.Action;
-import hudson.model.BuildListener;
-import hudson.model.Computer;
-import hudson.model.Executor;
 import hudson.model.InvisibleAction;
 import hudson.model.Job;
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import hudson.tasks.BuildStep;
-import hudson.tasks.BuildStepDescriptor;
-import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Builder;
 import hudson.tasks.Publisher;
 import java.io.IOException;

core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java

@@ -33,7 +33,6 @@ import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.Action;
 import hudson.model.BuildListener;
-import hudson.model.Computer;
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import hudson.tasks.BuildWrapper;

core/src/main/java/jenkins/util/ProgressiveRendering.java

@@ -25,7 +25,6 @@
 package jenkins.util;
 
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-import hudson.model.AbstractItem;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

core/src/main/java/jenkins/util/xstream/XStreamDOM.java

@@ -38,14 +38,10 @@ import com.thoughtworks.xstream.io.xml.XmlFriendlyReplacer;
 import com.thoughtworks.xstream.io.xml.XppDriver;
 import hudson.Util;
 import hudson.util.VariableResolver;
-import hudson.util.XStream2;
-import org.apache.commons.io.IOUtils;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashMap;

core/src/test/java/hudson/UtilTest.java

@@ -30,7 +30,6 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicReference;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -39,7 +38,6 @@ import java.io.InputStream;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.*;
 

core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java

@@ -27,7 +27,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 import hudson.model.ViewGroup;

core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java

 package hudson.model;
 
 import hudson.util.FormValidation;
-import jenkins.model.Jenkins;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

core/src/test/java/hudson/model/ItemsTest.java

@@ -3,11 +3,7 @@ package hudson.model;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.*;

core/src/test/java/hudson/os/SUTester.java

 package hudson.os;
 
-import hudson.remoting.Callable;
 import hudson.util.StreamTaskListener;
 import jenkins.security.MasterToSlaveCallable;
 

core/src/test/java/hudson/scheduler/CronTabTest.java

@@ -27,7 +27,6 @@ import antlr.ANTLRException;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.TimeZone;
 import java.util.GregorianCalendar;
 import java.util.Locale;
 

core/src/test/java/jenkins/model/JDKNameTest.java

@@ -23,14 +23,12 @@
  */
 package jenkins.model;
 
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import hudson.model.JDK;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.jvnet.hudson.test.Issue;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)

core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java

@@ -23,17 +23,14 @@
  */
 package jenkins.model;
 
-import java.io.IOException;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
 
 /**
  * Tests for {@link JenkinsLocationConfiguration}.

core/src/test/java/jenkins/slaves/DefaultJnlpSlaveReceiverTest.java

@@ -4,7 +4,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;

test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java

@@ -124,7 +124,6 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import javax.annotation.Nonnull;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 
@@ -141,7 +140,6 @@ import org.acegisecurity.GrantedAuthority;
 import org.acegisecurity.userdetails.UserDetails;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
@@ -190,7 +188,6 @@ import com.gargoylesoftware.htmlunit.javascript.HtmlUnitContextFactory;
 import com.gargoylesoftware.htmlunit.javascript.host.xml.XMLHttpRequest;
 import com.gargoylesoftware.htmlunit.xml.XmlPage;
 
-import java.net.HttpURLConnection;
 
 import jenkins.model.JenkinsLocationConfiguration;
 

test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java

@@ -126,7 +126,6 @@ import java.lang.management.ThreadInfo;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.SocketTimeoutException;
 import java.net.URISyntaxException;

test/src/main/java/org/jvnet/hudson/test/MockQueueItemAuthenticator.java

@@ -27,11 +27,9 @@ package org.jvnet.hudson.test;
 import hudson.Extension;
 import hudson.model.Item;
 import hudson.model.Queue;
-import hudson.model.User;
 import java.util.Map;
 import javax.inject.Inject;
 import jenkins.security.QueueItemAuthenticator;
-import jenkins.security.QueueItemAuthenticatorConfiguration;
 import jenkins.security.QueueItemAuthenticatorDescriptor;
 import org.acegisecurity.Authentication;
 

test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java

@@ -23,7 +23,6 @@
  */
 package org.jvnet.hudson.test;
 
-import hudson.model.Computer;
 
 import java.io.IOException;
 import javax.annotation.CheckForNull;

test/src/main/java/org/jvnet/hudson/test/WithoutJenkins.java

 package org.jvnet.hudson.test;
 
-import org.apache.commons.io.FileUtils;
 import org.jvnet.hudson.test.recipes.Recipe;
 import org.jvnet.hudson.test.recipes.WithPlugin;
 
-import java.io.File;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-import java.net.URL;
 
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 

test/src/main/java/org/jvnet/hudson/test/recipes/LocalData.java

@@ -29,7 +29,6 @@ import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.HudsonHomeLoader.Local;
 import org.jvnet.hudson.test.JenkinsRecipe;
 
-import hudson.util.JenkinsReloadFailed;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Target;

test/src/main/java/org/jvnet/hudson/test/recipes/WithPlugin.java

@@ -28,7 +28,6 @@ import org.jvnet.hudson.test.JenkinsRecipe;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.apache.commons.io.FileUtils;
 
-import hudson.util.JenkinsReloadFailed;
 
 import java.io.File;
 import java.lang.annotation.Documented;

test/src/main/java/org/jvnet/hudson/test/recipes/WithTimeout.java

@@ -26,17 +26,13 @@ package org.jvnet.hudson.test.recipes;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.JenkinsRecipe;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.apache.commons.io.FileUtils;
 
-import hudson.util.JenkinsReloadFailed;
 
-import java.io.File;
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
-import java.net.URL;
 
 /**
  * Times out the test after the specified number of seconds.

test/src/test/java/hudson/ClassicPluginStrategyTest.java

@@ -26,7 +26,6 @@ package hudson;
 
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.HudsonTestCase;
-import org.jvnet.hudson.test.LenientRunnable;
 import org.jvnet.hudson.test.recipes.LocalData;
 
 import java.net.URL;

test/src/test/java/hudson/cli/CreateViewCommandTest.java

@@ -26,8 +26,6 @@ package hudson.cli;
 
 import static hudson.cli.CLICommandInvoker.Matcher.failedWith;
 import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput;
-import static hudson.cli.CLICommandInvoker.Matcher.hasNoErrorOutput;
-import static hudson.cli.CLICommandInvoker.Matcher.succeeded;
 import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;

test/src/test/java/hudson/cli/GetNodeCommandTest.java

@@ -30,9 +30,7 @@ import static hudson.cli.CLICommandInvoker.Matcher.hasNoErrorOutput;
 import static hudson.cli.CLICommandInvoker.Matcher.succeeded;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
-import static org.hamcrest.text.IsEmptyString.isEmptyString;
 import hudson.model.Computer;
 import jenkins.model.Jenkins;
 

test/src/test/java/hudson/cli/ReloadJobCommandTest.java

@@ -30,7 +30,6 @@ import hudson.model.Job;
 import hudson.tasks.Shell;
 import jenkins.model.Jenkins;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;

test/src/test/java/hudson/cli/UpdateViewCommandTest.java

@@ -26,8 +26,6 @@ package hudson.cli;
 
 import static hudson.cli.CLICommandInvoker.Matcher.failedWith;
 import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput;
-import static hudson.cli.CLICommandInvoker.Matcher.hasNoErrorOutput;
-import static hudson.cli.CLICommandInvoker.Matcher.succeeded;
 import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;

test/src/test/java/hudson/console/ExceptionAnnotationTest.java

@@ -10,7 +10,6 @@ import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestBuilder;
 
-import java.io.IOException;
 
 /**
  * @author Kohsuke Kawaguchi

test/src/test/java/hudson/console/UrlAnnotatorTest.java

@@ -14,7 +14,6 @@ import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestBuilder;
 
-import java.io.IOException;
 
 /**
  * @author Kohsuke Kawaguchi

test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java

@@ -25,7 +25,6 @@
 package hudson.diagnosis;
 
 import hudson.XmlFile;
-import hudson.model.Executor;
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
 import hudson.model.InvisibleAction;
@@ -41,11 +40,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import hudson.model.ItemGroup;
-import hudson.model.Job;
-import hudson.model.Run;
 import hudson.model.Saveable;
-import hudson.model.listeners.SaveableListener;
 import jenkins.model.Jenkins;
 import jenkins.model.lazy.BuildReference;
 import static org.junit.Assert.*;
@@ -61,7 +56,6 @@ import org.jvnet.hudson.test.MemoryAssert;
 import org.jvnet.hudson.test.recipes.LocalData;
 import org.kohsuke.stapler.Stapler;
 
-import javax.annotation.Nonnull;
 
 public class OldDataMonitorTest {
 

test/src/test/java/hudson/logging/LogRecorderManagerTest.java

@@ -28,7 +28,6 @@ import org.jvnet.hudson.test.Url;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import hudson.model.Computer;
-import hudson.remoting.Callable;
 import hudson.remoting.VirtualChannel;
 import java.util.List;
 

test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java

@@ -48,7 +48,6 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.JenkinsRule.DummySecurityRealm;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.mockito.Mock;

test/src/test/java/hudson/model/DirectlyModifiableViewTest.java

@@ -28,7 +28,6 @@ import static org.junit.Assert.*;
 import java.io.IOException;
 import java.net.URL;
 
-import javax.annotation.Nonnull;
 
 import com.gargoylesoftware.htmlunit.WebRequest;
 import org.hamcrest.Matchers;

test/src/test/java/hudson/model/FreestyleJobPublisherTest.java

@@ -15,11 +15,8 @@ import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**

test/src/test/java/hudson/model/GetEnvironmentOutsideBuildTest.java

@@ -4,7 +4,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import java.io.IOException;
-import java.io.StringReader;
 
 import hudson.EnvVars;
 import hudson.matrix.MatrixProject;

test/src/test/java/hudson/model/LabelLoadStatisticsQueueLengthTest.java

@@ -15,11 +15,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.SleepBuilder;
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertEquals;

test/src/test/java/hudson/model/QueueTest.java

@@ -100,7 +100,6 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.FileUtils;
 
-import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.*;
 

test/src/test/java/hudson/model/UserTest.java

@@ -25,7 +25,6 @@
 package hudson.model;
 
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.ScriptException;
 import com.gargoylesoftware.htmlunit.WebAssert;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;

test/src/test/java/hudson/slaves/DummyCloudImpl.java

@@ -35,8 +35,6 @@ import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
-import hudson.util.DescribableList;
-import jenkins.model.Jenkins;
 import org.jvnet.hudson.test.JenkinsRule;
 
 import javax.xml.ws.Provider;

test/src/test/java/hudson/tasks/FingerprinterTest.java

@@ -47,7 +47,6 @@ import static org.junit.Assert.*;
 
 import hudson.util.StreamTaskListener;
 import jenkins.model.Jenkins;
-import org.hamcrest.Matchers;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;

test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java

@@ -42,7 +42,6 @@ import java.io.IOException;
 
 import jenkins.model.Jenkins;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

test/src/test/java/hudson/util/FormFieldValidatorTest.java

@@ -23,7 +23,6 @@
  */
 package hudson.util;
 
-import static org.junit.Assert.fail;
 
 import com.gargoylesoftware.htmlunit.WebResponseListener;
 import hudson.model.FreeStyleProject;

test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java

@@ -40,7 +40,6 @@ import hudson.tasks.BuildTrigger;
 import hudson.tasks.BuildTriggerTest;
 import hudson.triggers.Trigger;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -53,10 +52,8 @@ import org.acegisecurity.Authentication;
 
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.core.IsNot.not;
-import static org.hamcrest.core.IsNull.nullValue;
 import static org.junit.Assert.*;
 
-import org.hamcrest.core.IsNull;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;