diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java index dc136e67c6..99e2401848 100644 --- a/core/src/main/java/hudson/DescriptorExtensionList.java +++ b/core/src/main/java/hudson/DescriptorExtensionList.java @@ -41,10 +41,7 @@ import java.util.Iterator; import java.util.logging.Level; import java.util.logging.Logger; import java.util.concurrent.CopyOnWriteArrayList; -import java.lang.reflect.Type; -import java.lang.reflect.ParameterizedType; -import org.jvnet.tiger_types.Types; import org.kohsuke.stapler.Stapler; import net.sf.json.JSONObject; diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index a404126899..e3f66950e2 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -25,7 +25,6 @@ package hudson; import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider; import com.thoughtworks.xstream.core.JVM; -import com.sun.jna.Native; import hudson.model.Hudson; import hudson.model.User; import hudson.triggers.SafeTimerTask; @@ -41,7 +40,6 @@ import hudson.util.IncompatibleAntVersionDetected; import hudson.util.HudsonFailedToLoad; import hudson.util.ChartUtil; import hudson.util.AWTProblem; -import hudson.util.JNADoublyLoaded; import org.jvnet.localizer.LocaleProvider; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java index be84a39802..b91c31fd4c 100644 --- a/core/src/main/java/hudson/console/AnnotatedLargeText.java +++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java @@ -45,7 +45,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.Charset; import java.security.GeneralSecurityException; diff --git a/core/src/main/java/hudson/init/InitializerFinder.java b/core/src/main/java/hudson/init/InitializerFinder.java index d228ce8cab..3203e77eac 100644 --- a/core/src/main/java/hudson/init/InitializerFinder.java +++ b/core/src/main/java/hudson/init/InitializerFinder.java @@ -40,7 +40,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.logging.Level; import java.util.logging.Logger; import hudson.model.Hudson; diff --git a/core/src/main/java/hudson/init/impl/GroovyInitScript.java b/core/src/main/java/hudson/init/impl/GroovyInitScript.java index e5d37998d1..b8d2907715 100644 --- a/core/src/main/java/hudson/init/impl/GroovyInitScript.java +++ b/core/src/main/java/hudson/init/impl/GroovyInitScript.java @@ -31,11 +31,9 @@ import java.io.IOException; import java.net.URL; import java.util.logging.Logger; -import hudson.FilePath; import hudson.model.Hudson; import static hudson.init.InitMilestone.JOB_LOADED; import hudson.init.Initializer; -import org.apache.commons.io.FileUtils; /** * Run the initialization script, if it exists. diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java index 2b7b68a5f9..c2f9748176 100644 --- a/core/src/main/java/hudson/logging/LogRecorderManager.java +++ b/core/src/main/java/hudson/logging/LogRecorderManager.java @@ -30,7 +30,6 @@ import static hudson.init.InitMilestone.PLUGINS_PREPARED; import hudson.model.AbstractModelObject; import hudson.model.Hudson; import hudson.model.RSS; -import hudson.model.Failure; import hudson.tasks.Mailer; import hudson.util.CopyOnWriteMap; import org.apache.commons.io.filefilter.WildcardFileFilter; diff --git a/core/src/main/java/hudson/matrix/Axis.java b/core/src/main/java/hudson/matrix/Axis.java index 56b13d7dc3..cd0a3387e1 100644 --- a/core/src/main/java/hudson/matrix/Axis.java +++ b/core/src/main/java/hudson/matrix/Axis.java @@ -27,7 +27,6 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.Util; import hudson.model.AbstractDescribableImpl; -import hudson.model.Descriptor; import hudson.model.Hudson; import hudson.util.QuotedStringTokenizer; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/matrix/AxisList.java b/core/src/main/java/hudson/matrix/AxisList.java index fd63ae97ea..79f15cfb63 100644 --- a/core/src/main/java/hudson/matrix/AxisList.java +++ b/core/src/main/java/hudson/matrix/AxisList.java @@ -25,16 +25,13 @@ package hudson.matrix; import com.thoughtworks.xstream.XStream; import hudson.Util; -import hudson.model.Label; import hudson.util.RobustCollectionConverter; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; import java.util.Arrays; -import java.util.Set; /** * List of {@link Axis}. diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index e366882e02..7735423a01 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -81,8 +81,6 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import static hudson.Util.*; - /** * {@link Job} that allows you to run multiple different configurations * from a single setting. diff --git a/core/src/main/java/hudson/model/Api.java b/core/src/main/java/hudson/model/Api.java index 07105dbd33..053b8228ef 100644 --- a/core/src/main/java/hudson/model/Api.java +++ b/core/src/main/java/hudson/model/Api.java @@ -44,7 +44,6 @@ import java.io.OutputStream; import java.io.StringReader; import java.io.StringWriter; import java.util.List; -import java.util.logging.Logger; /** * Used to expose remote access API for ".../api/" diff --git a/core/src/main/java/hudson/model/BooleanParameterValue.java b/core/src/main/java/hudson/model/BooleanParameterValue.java index 2acb1d5681..f03caa935e 100755 --- a/core/src/main/java/hudson/model/BooleanParameterValue.java +++ b/core/src/main/java/hudson/model/BooleanParameterValue.java @@ -28,7 +28,6 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.export.Exported; import java.util.Locale; -import java.util.Map; import hudson.util.VariableResolver; diff --git a/core/src/main/java/hudson/model/BuildTimelineWidget.java b/core/src/main/java/hudson/model/BuildTimelineWidget.java index c191d9f617..ca1e226893 100644 --- a/core/src/main/java/hudson/model/BuildTimelineWidget.java +++ b/core/src/main/java/hudson/model/BuildTimelineWidget.java @@ -24,14 +24,11 @@ package hudson.model; import hudson.util.RunList; -import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; import org.koshuke.stapler.simile.timeline.Event; import org.koshuke.stapler.simile.timeline.TimelineEventList; -import javax.servlet.ServletException; import java.io.IOException; import java.util.Date; diff --git a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java index 1dae77d6a5..8227121478 100755 --- a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java +++ b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java @@ -6,12 +6,10 @@ import org.kohsuke.stapler.export.Exported; import org.apache.commons.lang.StringUtils; import net.sf.json.JSONObject; import hudson.Extension; -import hudson.cli.CLICommand; import java.util.ArrayList; import java.util.List; import java.util.Arrays; -import java.io.IOException; /** * @author huybrechts diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java index 0e918e1424..98817a388b 100644 --- a/core/src/main/java/hudson/model/DownloadService.java +++ b/core/src/main/java/hudson/model/DownloadService.java @@ -30,7 +30,6 @@ import hudson.util.IOUtils; import hudson.util.QuotedStringTokenizer; import hudson.util.TextFile; import hudson.util.TimeUnit2; -import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.Stapler; import java.io.File; diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index bdb6750436..fc5bcf105b 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -167,7 +167,6 @@ import org.kohsuke.stapler.StaplerProxy; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.WebApp; -import org.kohsuke.stapler.WebMethod; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.framework.adjunct.AdjunctManager; diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java index 715b6e4a56..983f2e4407 100644 --- a/core/src/main/java/hudson/model/ItemGroupMixIn.java +++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java @@ -29,7 +29,6 @@ import hudson.security.AccessControlled; import hudson.util.CopyOnWriteMap; import hudson.util.Function1; import hudson.util.IOUtils; -import org.kohsuke.stapler.Ancestor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -39,7 +38,6 @@ import java.io.File; import java.io.FileFilter; import java.io.IOException; import java.io.InputStream; -import java.util.List; import java.util.Map; /** diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java index d3d4df5f35..275aeb77b8 100644 --- a/core/src/main/java/hudson/model/Items.java +++ b/core/src/main/java/hudson/model/Items.java @@ -26,13 +26,10 @@ package hudson.model; import com.thoughtworks.xstream.XStream; import hudson.DescriptorExtensionList; import hudson.Extension; -import hudson.scm.RepositoryBrowser; import hudson.matrix.MatrixProject; import hudson.matrix.MatrixConfiguration; import hudson.XmlFile; import hudson.matrix.Axis; -import hudson.matrix.MatrixConfiguration; -import hudson.matrix.MatrixProject; import hudson.util.DescriptorList; import hudson.util.XStream2; diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 29b0b64a84..8991cf7c25 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -63,8 +63,6 @@ import java.io.IOException; import java.io.StringWriter; import java.io.PrintWriter; import java.net.URLEncoder; -import java.util.AbstractList; -import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/hudson/model/JobParameterValue.java b/core/src/main/java/hudson/model/JobParameterValue.java index 94a9f8ca37..f9638e098c 100644 --- a/core/src/main/java/hudson/model/JobParameterValue.java +++ b/core/src/main/java/hudson/model/JobParameterValue.java @@ -27,7 +27,6 @@ import hudson.EnvVars; import org.kohsuke.stapler.DataBoundConstructor; import java.util.Locale; -import java.util.Map; public class JobParameterValue extends ParameterValue { public final Job job; diff --git a/core/src/main/java/hudson/model/LoadBalancer.java b/core/src/main/java/hudson/model/LoadBalancer.java index 231b97fa34..afd715884f 100644 --- a/core/src/main/java/hudson/model/LoadBalancer.java +++ b/core/src/main/java/hudson/model/LoadBalancer.java @@ -29,7 +29,6 @@ import hudson.model.queue.MappingWorksheet.ExecutorChunk; import hudson.model.queue.MappingWorksheet.Mapping; import hudson.util.ConsistentHash; import hudson.util.ConsistentHash.Hash; -import hudson.matrix.MatrixConfiguration; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/model/ParameterValue.java b/core/src/main/java/hudson/model/ParameterValue.java index 57c4c8ac68..502b45705c 100644 --- a/core/src/main/java/hudson/model/ParameterValue.java +++ b/core/src/main/java/hudson/model/ParameterValue.java @@ -26,7 +26,6 @@ package hudson.model; import hudson.EnvVars; import hudson.Util; -import hudson.slaves.OfflineCause; import hudson.tasks.BuildWrapper; import hudson.tasks.Builder; import hudson.util.VariableResolver; diff --git a/core/src/main/java/hudson/model/Result.java b/core/src/main/java/hudson/model/Result.java index 9349114b02..676785bc70 100644 --- a/core/src/main/java/hudson/model/Result.java +++ b/core/src/main/java/hudson/model/Result.java @@ -25,7 +25,6 @@ package hudson.model; import com.thoughtworks.xstream.converters.SingleValueConverter; import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; -import hudson.Extension; import hudson.cli.declarative.OptionHandlerExtension; import hudson.util.EditDistance; import org.kohsuke.args4j.CmdLineException; @@ -35,8 +34,6 @@ import org.kohsuke.args4j.spi.*; import org.kohsuke.stapler.export.CustomExportedBean; import java.io.Serializable; -import java.net.URI; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/model/RunParameterDefinition.java b/core/src/main/java/hudson/model/RunParameterDefinition.java index decc29a9f4..6528abf16f 100644 --- a/core/src/main/java/hudson/model/RunParameterDefinition.java +++ b/core/src/main/java/hudson/model/RunParameterDefinition.java @@ -29,9 +29,6 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.Exported; import hudson.Extension; -import hudson.cli.CLICommand; - -import java.io.IOException; public class RunParameterDefinition extends SimpleParameterDefinition { diff --git a/core/src/main/java/hudson/model/StringParameterValue.java b/core/src/main/java/hudson/model/StringParameterValue.java index 00364d2022..c3bf472099 100644 --- a/core/src/main/java/hudson/model/StringParameterValue.java +++ b/core/src/main/java/hudson/model/StringParameterValue.java @@ -28,7 +28,6 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.export.Exported; import java.util.Locale; -import java.util.Map; import hudson.util.VariableResolver; diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index f9be250402..67ee3bc46a 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -42,7 +42,6 @@ import hudson.util.RunList; import hudson.widgets.Widget; import java.io.IOException; -import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; diff --git a/core/src/main/java/hudson/model/labels/LabelAtom.java b/core/src/main/java/hudson/model/labels/LabelAtom.java index 114434c454..240b4f4036 100644 --- a/core/src/main/java/hudson/model/labels/LabelAtom.java +++ b/core/src/main/java/hudson/model/labels/LabelAtom.java @@ -35,7 +35,6 @@ import hudson.model.Descriptor.FormException; import hudson.model.Failure; import hudson.model.Hudson; import hudson.model.Label; -import hudson.model.Messages; import hudson.model.Saveable; import hudson.model.listeners.SaveableListener; import hudson.util.DescribableList; diff --git a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java index 6515332d48..933267d7a9 100644 --- a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java +++ b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java @@ -28,8 +28,6 @@ import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Action; import hudson.model.Hudson; -import hudson.slaves.NodeDescriptor; -import hudson.slaves.NodePropertyDescriptor; import org.kohsuke.stapler.export.ExportedBean; import java.util.Collection; diff --git a/core/src/main/java/hudson/model/listeners/RunListener.java b/core/src/main/java/hudson/model/listeners/RunListener.java index 5f75e6dc90..6e0a150e31 100644 --- a/core/src/main/java/hudson/model/listeners/RunListener.java +++ b/core/src/main/java/hudson/model/listeners/RunListener.java @@ -26,12 +26,9 @@ package hudson.model.listeners; import hudson.ExtensionPoint; import hudson.ExtensionListView; import hudson.Extension; -import hudson.DescriptorExtensionList; import hudson.ExtensionList; -import hudson.scm.RepositoryBrowser; import hudson.model.Run; import hudson.model.TaskListener; -import hudson.model.Descriptor; import hudson.model.Hudson; import hudson.util.CopyOnWriteList; import org.jvnet.tiger_types.Types; diff --git a/core/src/main/java/hudson/model/listeners/SaveableListener.java b/core/src/main/java/hudson/model/listeners/SaveableListener.java index 37f230d7d4..3917a4c77e 100644 --- a/core/src/main/java/hudson/model/listeners/SaveableListener.java +++ b/core/src/main/java/hudson/model/listeners/SaveableListener.java @@ -25,13 +25,11 @@ package hudson.model.listeners; import hudson.ExtensionPoint; -import hudson.ExtensionListView; import hudson.Extension; import hudson.ExtensionList; import hudson.XmlFile; import hudson.model.Hudson; import hudson.model.Saveable; -import hudson.util.CopyOnWriteList; /** * Receives notifications about save actions on {@link Saveable} objects in Hudson. diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java index d5c57fa524..4e87e18f50 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java @@ -23,7 +23,6 @@ */ package hudson.node_monitors; -import hudson.Functions.ThreadGroupMap; import hudson.model.Computer; import hudson.model.Descriptor; import hudson.model.Hudson; diff --git a/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java b/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java index 98d4c546af..7e46896c2a 100644 --- a/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java +++ b/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java @@ -24,7 +24,6 @@ package hudson.node_monitors; import hudson.model.Computer; -import hudson.model.Descriptor.FormException; import hudson.remoting.Callable; import hudson.Extension; import net.sf.json.JSONObject; diff --git a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java index 764056db59..b8b38e9283 100644 --- a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java +++ b/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.model.Descriptor.FormException; import hudson.slaves.OfflineCause; import hudson.model.Computer; import hudson.remoting.Callable; diff --git a/core/src/main/java/hudson/scm/RepositoryBrowsers.java b/core/src/main/java/hudson/scm/RepositoryBrowsers.java index 3568984230..3c5dd86c0e 100644 --- a/core/src/main/java/hudson/scm/RepositoryBrowsers.java +++ b/core/src/main/java/hudson/scm/RepositoryBrowsers.java @@ -24,9 +24,7 @@ package hudson.scm; import hudson.model.Descriptor; -import hudson.model.Hudson; import hudson.model.Descriptor.FormException; -import hudson.scm.browsers.*; import hudson.util.DescriptorList; import hudson.Extension; import org.kohsuke.stapler.StaplerRequest; @@ -35,7 +33,6 @@ import java.util.ArrayList; import java.util.List; import net.sf.json.JSONObject; -import net.sf.json.JSONArray; /** * List of all installed {@link RepositoryBrowsers}. diff --git a/core/src/main/java/hudson/scm/SCMS.java b/core/src/main/java/hudson/scm/SCMS.java index aec68f43d8..351d1b6a47 100644 --- a/core/src/main/java/hudson/scm/SCMS.java +++ b/core/src/main/java/hudson/scm/SCMS.java @@ -23,12 +23,9 @@ */ package hudson.scm; -import hudson.model.Descriptor; -import hudson.model.Hudson; import hudson.model.AbstractProject; import hudson.model.Descriptor.FormException; import hudson.util.DescriptorList; -import hudson.DescriptorExtensionList; import hudson.Extension; import java.util.List; diff --git a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java b/core/src/main/java/hudson/security/BasicAuthenticationFilter.java index 14a0d10550..abf9c1a583 100644 --- a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java +++ b/core/src/main/java/hudson/security/BasicAuthenticationFilter.java @@ -25,7 +25,6 @@ package hudson.security; import hudson.model.Hudson; import hudson.util.Scrambler; -import org.acegisecurity.Authentication; import org.acegisecurity.GrantedAuthorityImpl; import org.acegisecurity.context.SecurityContextHolder; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java b/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java index 74797a0ea2..d21768b557 100644 --- a/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java @@ -26,7 +26,6 @@ package hudson.security; import hudson.model.Descriptor; import hudson.model.Hudson; import hudson.model.Job; -import hudson.model.TopLevelItem; import hudson.util.RobustReflectionConverter; import hudson.Extension; import com.thoughtworks.xstream.io.HierarchicalStreamReader; diff --git a/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java b/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java index e34f677195..6850fec53e 100644 --- a/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java +++ b/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java @@ -29,8 +29,6 @@ import hudson.model.Action; import hudson.model.Project; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; -import hudson.model.Run; -import hudson.model.CheckPoint; import hudson.Launcher; import java.io.IOException; diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java index 3b59f8baa8..c30d56469a 100644 --- a/core/src/main/java/hudson/triggers/Trigger.java +++ b/core/src/main/java/hudson/triggers/Trigger.java @@ -30,7 +30,6 @@ import hudson.ExtensionPoint; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.init.Initializer; -import hudson.init.InitMilestone; import static hudson.init.InitMilestone.JOB_LOADED; import hudson.model.AbstractProject; import hudson.model.Action; diff --git a/core/src/main/java/hudson/triggers/Triggers.java b/core/src/main/java/hudson/triggers/Triggers.java index c9a97f85c9..746ced5028 100644 --- a/core/src/main/java/hudson/triggers/Triggers.java +++ b/core/src/main/java/hudson/triggers/Triggers.java @@ -23,13 +23,11 @@ */ package hudson.triggers; -import hudson.model.Descriptor; import hudson.model.Item; import hudson.util.DescriptorList; import hudson.Extension; import java.util.List; -import java.util.ArrayList; /** * List of all installed {@link Trigger}s. diff --git a/core/src/main/java/hudson/util/ClasspathBuilder.java b/core/src/main/java/hudson/util/ClasspathBuilder.java index aaebd69fdf..e8bfafecc2 100644 --- a/core/src/main/java/hudson/util/ClasspathBuilder.java +++ b/core/src/main/java/hudson/util/ClasspathBuilder.java @@ -2,7 +2,6 @@ package hudson.util; import hudson.FilePath; import hudson.Util; -import hudson.remoting.Channel; import hudson.remoting.Which; import java.io.Serializable; diff --git a/core/src/main/java/hudson/util/CopyOnWriteList.java b/core/src/main/java/hudson/util/CopyOnWriteList.java index 7cee5824eb..2bffc09f66 100644 --- a/core/src/main/java/hudson/util/CopyOnWriteList.java +++ b/core/src/main/java/hudson/util/CopyOnWriteList.java @@ -38,7 +38,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Arrays; -import java.util.logging.Level; import java.util.logging.Logger; import static java.util.logging.Level.WARNING; diff --git a/core/src/main/java/hudson/util/ReflectionUtils.java b/core/src/main/java/hudson/util/ReflectionUtils.java index 854bf2751b..fb914acf53 100644 --- a/core/src/main/java/hudson/util/ReflectionUtils.java +++ b/core/src/main/java/hudson/util/ReflectionUtils.java @@ -28,7 +28,6 @@ import org.kohsuke.stapler.ClassDescriptor; import java.beans.PropertyDescriptor; import java.lang.annotation.Annotation; -import java.lang.reflect.Array; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/core/src/test/java/hudson/ChannelTestCase.java b/core/src/test/java/hudson/ChannelTestCase.java index c1f3a8c8c4..decfceee34 100644 --- a/core/src/test/java/hudson/ChannelTestCase.java +++ b/core/src/test/java/hudson/ChannelTestCase.java @@ -2,8 +2,6 @@ package hudson; import junit.framework.TestCase; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; import java.io.IOException; import java.util.concurrent.Future; import java.util.concurrent.Callable; diff --git a/core/src/test/java/hudson/os/DCOMSandbox.java b/core/src/test/java/hudson/os/DCOMSandbox.java index 877c51a2f3..4c1bcdd4bd 100644 --- a/core/src/test/java/hudson/os/DCOMSandbox.java +++ b/core/src/test/java/hudson/os/DCOMSandbox.java @@ -2,12 +2,10 @@ package hudson.os; import ndr.NdrObject; import ndr.NetworkDataRepresentation; -import org.jinterop.dcom.common.JISystem; import org.jinterop.dcom.transport.JIComTransportFactory; import rpc.Endpoint; import rpc.Stub; -import java.io.IOException; import java.util.Properties; /** diff --git a/core/src/test/java/hudson/tasks/junit/TestResultTest.java b/core/src/test/java/hudson/tasks/junit/TestResultTest.java index ef6eabaf5e..87f1b4558e 100644 --- a/core/src/test/java/hudson/tasks/junit/TestResultTest.java +++ b/core/src/test/java/hudson/tasks/junit/TestResultTest.java @@ -32,7 +32,6 @@ import java.net.URISyntaxException; import java.util.Collection; import java.util.List; import junit.framework.TestCase; -import static org.junit.Assert.*; /** * diff --git a/remoting/src/test/java/hudson/remoting/ChannelRunner.java b/remoting/src/test/java/hudson/remoting/ChannelRunner.java index 6bfaf46218..1472b3c6b1 100644 --- a/remoting/src/test/java/hudson/remoting/ChannelRunner.java +++ b/remoting/src/test/java/hudson/remoting/ChannelRunner.java @@ -27,8 +27,6 @@ import hudson.remoting.Channel.Mode; import junit.framework.Assert; import java.io.IOException; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; import java.io.File; import java.io.OutputStream; import java.io.FileOutputStream; diff --git a/test/src/main/java/org/jvnet/hudson/test/ComputerConnectorTester.java b/test/src/main/java/org/jvnet/hudson/test/ComputerConnectorTester.java index 872039bad1..d69d2279ff 100644 --- a/test/src/main/java/org/jvnet/hudson/test/ComputerConnectorTester.java +++ b/test/src/main/java/org/jvnet/hudson/test/ComputerConnectorTester.java @@ -25,7 +25,6 @@ package org.jvnet.hudson.test; import hudson.Extension; import hudson.model.AbstractDescribableImpl; -import hudson.model.Describable; import hudson.model.Descriptor; import hudson.slaves.ComputerConnector; import hudson.slaves.ComputerConnectorDescriptor; diff --git a/test/src/test/java/hudson/ClassicPluginStrategyTest.java b/test/src/test/java/hudson/ClassicPluginStrategyTest.java index 8af56a2a99..2c5cb4375b 100644 --- a/test/src/test/java/hudson/ClassicPluginStrategyTest.java +++ b/test/src/test/java/hudson/ClassicPluginStrategyTest.java @@ -28,7 +28,6 @@ import hudson.PluginWrapper; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.recipes.LocalData; -import java.io.File; import java.net.URL; import java.util.Enumeration; diff --git a/test/src/test/java/hudson/ExtensionListTest.java b/test/src/test/java/hudson/ExtensionListTest.java index 659df8bb14..e70dbc1192 100644 --- a/test/src/test/java/hudson/ExtensionListTest.java +++ b/test/src/test/java/hudson/ExtensionListTest.java @@ -7,8 +7,6 @@ import hudson.model.Hudson; import hudson.util.DescriptorList; import java.util.List; -import java.util.Set; -import java.util.HashSet; import java.util.Collection; /** diff --git a/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java b/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java index 00e9132211..e7c30606fa 100755 --- a/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java +++ b/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java @@ -1,7 +1,6 @@ package hudson.maven; import hudson.model.Result; -import hudson.tasks.Maven.MavenInstallation; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.ExtractResourceSCM; diff --git a/test/src/test/java/hudson/maven/MavenEmptyModuleTest.java b/test/src/test/java/hudson/maven/MavenEmptyModuleTest.java index 22674ad47d..86e33b9d2f 100644 --- a/test/src/test/java/hudson/maven/MavenEmptyModuleTest.java +++ b/test/src/test/java/hudson/maven/MavenEmptyModuleTest.java @@ -7,11 +7,8 @@ import org.jvnet.hudson.test.ExtractResourceSCM; import hudson.Launcher; import hudson.model.BuildListener; -import hudson.model.Result; import java.io.IOException; -import java.util.List; -import java.util.Map; /** * @author Andrew Bayer diff --git a/test/src/test/java/hudson/maven/MavenJellyTest.java b/test/src/test/java/hudson/maven/MavenJellyTest.java index bdf0d700e3..d9e553e176 100644 --- a/test/src/test/java/hudson/maven/MavenJellyTest.java +++ b/test/src/test/java/hudson/maven/MavenJellyTest.java @@ -23,12 +23,10 @@ */ package hudson.maven; -import hudson.model.Hudson; import hudson.remoting.Which; import junit.framework.Test; import junit.framework.TestCase; import org.jvnet.hudson.test.JellyTestSuiteBuilder; -import java.io.File; /** * Runs Jelly checks on maven-plugin. diff --git a/test/src/test/java/hudson/maven/MavenOptsTest.java b/test/src/test/java/hudson/maven/MavenOptsTest.java index 3898130d04..0a6e70bb7f 100644 --- a/test/src/test/java/hudson/maven/MavenOptsTest.java +++ b/test/src/test/java/hudson/maven/MavenOptsTest.java @@ -4,16 +4,9 @@ import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.ExtractResourceSCM; import hudson.EnvVars; -import hudson.Launcher; -import hudson.model.BuildListener; import hudson.model.Result; -import hudson.util.NullStream; import hudson.tasks.Maven.MavenInstallation; -import java.io.IOException; -import java.io.PrintWriter; - - /** * @author Andrew Bayer */ diff --git a/test/src/test/java/hudson/maven/ModuleDependencyLocator.java b/test/src/test/java/hudson/maven/ModuleDependencyLocator.java index e19164eb84..b0f9d2b664 100644 --- a/test/src/test/java/hudson/maven/ModuleDependencyLocator.java +++ b/test/src/test/java/hudson/maven/ModuleDependencyLocator.java @@ -26,15 +26,12 @@ package hudson.maven; import hudson.ExtensionPoint; import hudson.ExtensionList; import hudson.Extension; -import hudson.scm.ChangeLogAnnotator; import hudson.model.Hudson; import org.apache.maven.project.MavenProject; import java.util.Collection; import java.util.HashSet; -import java.util.List; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; /** * Extension point in Hudson to find additional dependencies from {@link MavenProject}. diff --git a/test/src/test/java/hudson/pages/SystemConfigurationTestCase.java b/test/src/test/java/hudson/pages/SystemConfigurationTestCase.java index 5db5ec074a..543de69684 100644 --- a/test/src/test/java/hudson/pages/SystemConfigurationTestCase.java +++ b/test/src/test/java/hudson/pages/SystemConfigurationTestCase.java @@ -23,7 +23,6 @@ */ package hudson.pages; -import static com.gargoylesoftware.htmlunit.WebAssert.assertElementPresent; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.PageDecorator; diff --git a/test/src/test/java/hudson/security/CliAuthenticationTest.java b/test/src/test/java/hudson/security/CliAuthenticationTest.java index 8691518d26..6b7516f66b 100644 --- a/test/src/test/java/hudson/security/CliAuthenticationTest.java +++ b/test/src/test/java/hudson/security/CliAuthenticationTest.java @@ -2,7 +2,6 @@ package hudson.security; import hudson.cli.CLI; import hudson.cli.CLICommand; -import hudson.cli.CliManagerImpl; import hudson.cli.ClientAuthenticationCache; import hudson.cli.LoginCommand; import hudson.cli.LogoutCommand; @@ -13,10 +12,6 @@ import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.TestExtension; import junit.framework.Assert; -import java.io.IOException; -import java.util.Arrays; -import java.util.Locale; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/security/LoginTest.java b/test/src/test/java/hudson/security/LoginTest.java index 88ef816819..62d3d35696 100644 --- a/test/src/test/java/hudson/security/LoginTest.java +++ b/test/src/test/java/hudson/security/LoginTest.java @@ -7,7 +7,6 @@ import org.jvnet.hudson.test.recipes.PresetData; import org.jvnet.hudson.test.recipes.PresetData.DataSet; import org.xml.sax.SAXException; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URL; diff --git a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java index 16bd550f81..26f807d0f5 100644 --- a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java +++ b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java @@ -1,17 +1,12 @@ package hudson.slaves; -import hudson.model.Build; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; -import hudson.model.Hudson; -import hudson.model.JDK; import hudson.model.Node; import hudson.model.ParametersDefinitionProperty; import hudson.model.Result; import hudson.model.StringParameterDefinition; import hudson.slaves.EnvironmentVariablesNodeProperty.Entry; -import hudson.tasks.Maven; -import hudson.tasks.Maven.MavenInstallation; import java.io.IOException; import java.util.Collections; @@ -21,7 +16,6 @@ import junit.framework.Assert; import org.jvnet.hudson.test.CaptureEnvironmentBuilder; import org.jvnet.hudson.test.HudsonTestCase; -import org.jvnet.hudson.test.HudsonTestCase.WebClient; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; diff --git a/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java b/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java index 6974f7bd6c..b5c086d97f 100644 --- a/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java +++ b/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java @@ -33,8 +33,6 @@ import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Messages; import hudson.model.Node; -import hudson.model.Node.Mode; -import hudson.model.Project; import hudson.model.Result; import hudson.model.Queue.BuildableItem; import hudson.model.Queue.Task; diff --git a/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java b/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java index 87c3935907..dde867d72d 100644 --- a/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java +++ b/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java @@ -2,21 +2,16 @@ package hudson.tasks; import hudson.EnvVars; import hudson.model.labels.LabelAtom; -import hudson.tools.ToolProperty; import hudson.maven.MavenModuleSet; import hudson.maven.MavenModuleSetBuild; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.JDK; -import hudson.model.Label; import hudson.model.Result; import hudson.slaves.DumbSlave; import hudson.tasks.Ant.AntInstallation; import hudson.tasks.Maven.MavenInstallation; -import java.io.File; -import java.util.Collections; - import org.apache.tools.ant.taskdefs.condition.Os; import org.jvnet.hudson.test.ExtractResourceSCM; import org.jvnet.hudson.test.HudsonTestCase; diff --git a/test/src/test/java/hudson/tasks/MavenTest.java b/test/src/test/java/hudson/tasks/MavenTest.java index d1d4f5c294..08cf5c9f4d 100644 --- a/test/src/test/java/hudson/tasks/MavenTest.java +++ b/test/src/test/java/hudson/tasks/MavenTest.java @@ -52,7 +52,6 @@ import org.jvnet.hudson.test.HudsonTestCase; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlButton; -import com.gargoylesoftware.htmlunit.html.HtmlInput; import hudson.model.FreeStyleBuild; import hudson.model.PasswordParameterDefinition; import org.jvnet.hudson.test.ExtractResourceSCM; diff --git a/test/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java b/test/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java index 6ebb139408..5743cd10dd 100644 --- a/test/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java +++ b/test/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java @@ -7,7 +7,6 @@ import hudson.model.FreeStyleProject; import hudson.tasks.Ant; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.SingleFileSCM; -import org.mozilla.javascript.tools.debugger.Dim; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java b/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java index 6132dbb6bd..5e1b2e87d6 100644 --- a/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java +++ b/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java @@ -26,12 +26,9 @@ package hudson.tasks.junit; import hudson.FilePath; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; -import hudson.model.Hudson; import hudson.slaves.DumbSlave; import hudson.tasks.test.TestObject; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.concurrent.TimeUnit; import org.jvnet.hudson.test.HudsonTestCase; diff --git a/test/src/test/java/hudson/tasks/junit/TestResultLinksTest.java b/test/src/test/java/hudson/tasks/junit/TestResultLinksTest.java index 485ad46626..efba492228 100644 --- a/test/src/test/java/hudson/tasks/junit/TestResultLinksTest.java +++ b/test/src/test/java/hudson/tasks/junit/TestResultLinksTest.java @@ -24,23 +24,15 @@ package hudson.tasks.junit; import org.jvnet.hudson.test.HudsonTestCase; -import hudson.FilePath; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; -import hudson.model.Hudson; import hudson.model.Result; -import hudson.slaves.DumbSlave; -import hudson.tasks.test.TestObject; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.concurrent.TimeUnit; -import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.TouchBuilder; import org.jvnet.hudson.test.recipes.LocalData; -import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.Page; diff --git a/test/src/test/java/hudson/tasks/junit/TestResultPublishingTest.java b/test/src/test/java/hudson/tasks/junit/TestResultPublishingTest.java index d0936f7a35..84bf596018 100644 --- a/test/src/test/java/hudson/tasks/junit/TestResultPublishingTest.java +++ b/test/src/test/java/hudson/tasks/junit/TestResultPublishingTest.java @@ -27,8 +27,10 @@ import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.*; import com.gargoylesoftware.htmlunit.xml.XmlPage; import hudson.FilePath; -import hudson.Functions; -import hudson.model.*; +import hudson.model.FreeStyleBuild; +import hudson.model.FreeStyleProject; +import hudson.model.Project; +import hudson.model.Run; import hudson.slaves.DumbSlave; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.HudsonTestCase; diff --git a/test/src/test/java/hudson/tasks/test/TestResultExtensionTest.java b/test/src/test/java/hudson/tasks/test/TestResultExtensionTest.java index 1b261ff60e..c6cc57b29f 100644 --- a/test/src/test/java/hudson/tasks/test/TestResultExtensionTest.java +++ b/test/src/test/java/hudson/tasks/test/TestResultExtensionTest.java @@ -31,9 +31,7 @@ import hudson.model.AbstractBuild; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.TouchBuilder; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; /** diff --git a/test/src/test/java/hudson/tools/ToolLocationTest.java b/test/src/test/java/hudson/tools/ToolLocationTest.java index 2365765cbc..0c156fdb5a 100644 --- a/test/src/test/java/hudson/tools/ToolLocationTest.java +++ b/test/src/test/java/hudson/tools/ToolLocationTest.java @@ -7,8 +7,6 @@ import hudson.tasks.Ant; import hudson.model.JDK; import hudson.model.Hudson; -import static junit.framework.Assert.*; - import java.util.Arrays; /** diff --git a/test/src/test/java/hudson/triggers/SCMTriggerTest.java b/test/src/test/java/hudson/triggers/SCMTriggerTest.java index 8839619e0d..403a2e9376 100644 --- a/test/src/test/java/hudson/triggers/SCMTriggerTest.java +++ b/test/src/test/java/hudson/triggers/SCMTriggerTest.java @@ -33,7 +33,6 @@ import hudson.model.BuildListener; import hudson.model.Cause; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; -import hudson.model.Hudson; import hudson.model.TaskListener; import hudson.model.Cause.UserCause; import hudson.scm.NullSCM; diff --git a/test/src/test/java/lib/form/ExpandableTextboxTest.java b/test/src/test/java/lib/form/ExpandableTextboxTest.java index e3acb0b27e..a2b1522a6d 100644 --- a/test/src/test/java/lib/form/ExpandableTextboxTest.java +++ b/test/src/test/java/lib/form/ExpandableTextboxTest.java @@ -31,8 +31,6 @@ import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.HudsonTestCase; import org.w3c.dom.NodeList; -import java.net.URL; - /** * @author Kohsuke Kawaguchi */