diff --git a/core/src/main/java/hudson/DependencyRunner.java b/core/src/main/java/hudson/DependencyRunner.java index bd4282f8c209bc8012d02ceb2ff16b913725c41b..acf035676910ad3ac77f6e4b3164ed7358fc0f39 100644 --- a/core/src/main/java/hudson/DependencyRunner.java +++ b/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; diff --git a/core/src/main/java/hudson/ExtensionFinder.java b/core/src/main/java/hudson/ExtensionFinder.java index 4f0719da59ac5254c5d1bc6cae1a53a6544a90dc..86f8c1b4c1bd0fc0ca1db0a1d3c102ba9fc782ee 100644 --- a/core/src/main/java/hudson/ExtensionFinder.java +++ b/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; diff --git a/core/src/main/java/hudson/ExtensionListView.java b/core/src/main/java/hudson/ExtensionListView.java index 95ea80068c636ffc393785fb27f53ce7e4517961..59b81ffd95869297d20ea67694b923652235812d 100644 --- a/core/src/main/java/hudson/ExtensionListView.java +++ b/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; diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index 3c6303733dd89fc45f35ef38b08d7f45662bccd4..9690c39cd0d03cef537a76aa399c7ed2bced97b1 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/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; diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java index 974fc2cba7734ae877a4c75844104c784275c4be..5be9397699f83c37d694fb9caceb8527df5caa27 100644 --- a/core/src/main/java/hudson/Launcher.java +++ b/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; diff --git a/core/src/main/java/hudson/LauncherDecorator.java b/core/src/main/java/hudson/LauncherDecorator.java index 3bd5f7d0212b56bb87be7ebe56d1e5bda08c96c7..86f69fe496a2e3f6cfabe3cb8ddbe15bcc3fe0f0 100644 --- a/core/src/main/java/hudson/LauncherDecorator.java +++ b/core/src/main/java/hudson/LauncherDecorator.java @@ -1,6 +1,5 @@ package hudson; -import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.Executor; import hudson.tasks.BuildWrapper; diff --git a/core/src/main/java/hudson/PluginManagerStaplerOverride.java b/core/src/main/java/hudson/PluginManagerStaplerOverride.java index 2de4ef90eded8ad8f59c48c5fcedde7316b47d3a..3103ba181835d9ba31bab32fb6581f9aee82b9a9 100644 --- a/core/src/main/java/hudson/PluginManagerStaplerOverride.java +++ b/core/src/main/java/hudson/PluginManagerStaplerOverride.java @@ -1,8 +1,6 @@ package hudson; -import jenkins.model.Jenkins; -import javax.annotation.CheckForNull; import javax.annotation.Nonnull; /** diff --git a/core/src/main/java/hudson/UDPBroadcastFragment.java b/core/src/main/java/hudson/UDPBroadcastFragment.java index 9e7039f739566cba48c4ad53001d67447cb75730..069320298d1bdc4652a715832b21c3b341b81ce8 100644 --- a/core/src/main/java/hudson/UDPBroadcastFragment.java +++ b/core/src/main/java/hudson/UDPBroadcastFragment.java @@ -23,7 +23,6 @@ */ package hudson; -import jenkins.model.Jenkins; import java.net.SocketAddress; diff --git a/core/src/main/java/hudson/URLConnectionDecorator.java b/core/src/main/java/hudson/URLConnectionDecorator.java index d6aad07b7081e76a3a2ab81b317ff1a22b2489f0..f3794f4e33ea03467ea36486b0d4b32067104856 100644 --- a/core/src/main/java/hudson/URLConnectionDecorator.java +++ b/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; diff --git a/core/src/main/java/hudson/cli/BuildCommand.java b/core/src/main/java/hudson/cli/BuildCommand.java index 39df01901ad1fe0a916afd00b704bed6cbf7c17f..5a018aeeb70d50b41e4ee94f3175c603f2779b44 100644 --- a/core/src/main/java/hudson/cli/BuildCommand.java +++ b/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; diff --git a/core/src/main/java/hudson/cli/CliTransportAuthenticator.java b/core/src/main/java/hudson/cli/CliTransportAuthenticator.java index 0db90cce10c8a57cb7bb9b56b4d63060cf625afd..f561a50eddf21c362f130fdf1c445f8003ceaa62 100644 --- a/core/src/main/java/hudson/cli/CliTransportAuthenticator.java +++ b/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. diff --git a/core/src/main/java/hudson/cli/CommandDuringBuild.java b/core/src/main/java/hudson/cli/CommandDuringBuild.java index dfa65f487ae5de60b985039fb204575a8d3b18c0..3834238a41fafb0b9f951e30880bca5144709ccc 100644 --- a/core/src/main/java/hudson/cli/CommandDuringBuild.java +++ b/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; diff --git a/core/src/main/java/hudson/cli/DeleteNodeCommand.java b/core/src/main/java/hudson/cli/DeleteNodeCommand.java index 81e7a74003bfea63f839482dfc4e963c551bc695..5f52957aadca3a1f5e0ff6a0fda1dc14d73d87e2 100644 --- a/core/src/main/java/hudson/cli/DeleteNodeCommand.java +++ b/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; diff --git a/core/src/main/java/hudson/cli/GroovyCommand.java b/core/src/main/java/hudson/cli/GroovyCommand.java index 7866e2f7228d6fde0ea480631c52676da97702fc..a77f41fd92057bf0c9561759646c3abe8e080881 100644 --- a/core/src/main/java/hudson/cli/GroovyCommand.java +++ b/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. diff --git a/core/src/main/java/hudson/cli/ReloadJobCommand.java b/core/src/main/java/hudson/cli/ReloadJobCommand.java index f1c114e4b63271a651f69f16cfe54d43fc963e5d..a8905b79e0c17df9fa857fa226332bf201b04765 100644 --- a/core/src/main/java/hudson/cli/ReloadJobCommand.java +++ b/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; diff --git a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java index 0aeedb4a37303b7875d1b5178181d79eccabc96c..c7767a796e7d81c48b989b629a89ca33b57dd607 100644 --- a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java +++ b/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; diff --git a/core/src/main/java/hudson/cli/SetBuildResultCommand.java b/core/src/main/java/hudson/cli/SetBuildResultCommand.java index 7666d590a5f7147f33b08f7b15b4a08235e3800a..82756472c7b3ac09f7b6276e472512d4ad8df314 100644 --- a/core/src/main/java/hudson/cli/SetBuildResultCommand.java +++ b/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; diff --git a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java index fe7ed1f690b8fa4aa486a2cc0ae9cd689fa91ac4..a96daf60f9ca8c510232bb3f045735376350e203 100644 --- a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java +++ b/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; diff --git a/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java b/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java index b4e63de84a60ec4c0e9ca4837827ba16d551627a..9ae2a74df492f1388f925a16323074eca53f4858 100644 --- a/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java +++ b/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; diff --git a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java b/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java index bb4e8e50401e9292932cf948995d4bb21029ebcb..3b7c7d653f4440b34ddad1f5cad4de7bc5c2c2c5 100644 --- a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java +++ b/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; diff --git a/core/src/main/java/hudson/init/Terminator.java b/core/src/main/java/hudson/init/Terminator.java index 72a2c9025b6f4e1e1d2417bcb0f9e998c57aedb8..7cea40031c9052d93fe64291e72c0f38ac5ec6a4 100644 --- a/core/src/main/java/hudson/init/Terminator.java +++ b/core/src/main/java/hudson/init/Terminator.java @@ -1,7 +1,6 @@ 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; diff --git a/core/src/main/java/hudson/init/impl/GroovyInitScript.java b/core/src/main/java/hudson/init/impl/GroovyInitScript.java index 621d52ce635f59c8d09bc4f198a3a24e4b90b88f..1d184cffc6494e79597f543e0d8c4e68229b01ba 100644 --- a/core/src/main/java/hudson/init/impl/GroovyInitScript.java +++ b/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.*; diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java index 6a558594532ca65ad95372afecb3cd692c3ea835..0e489277e50ad2d9d486e1ca5ac2212d3673f04d 100644 --- a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java +++ b/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; diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java index 81c9486e3fa8fd0f6ce3d4b9c4ec111faaf5e06b..17ec36ee169ce16bfb67fdebc6ebcc6bd4b51fd5 100644 --- a/core/src/main/java/hudson/logging/LogRecorder.java +++ b/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; diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index c017c716e79018e80881a3c7cfd689044d6bd26f..e9c4626706c6cb564cb4f2b6e260bf8ef541f709 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/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; diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index fd0d6d06d00bad0c21eadb0bf71942d36384c7ba..f0f300805ea6c25ed8718c1be0f147429414cc7c 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/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; diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java index a8e555409214ac44570ffbd1384d8c53b887630d..0bdc8a97bc18b9cab09dbca8e559273e67cf2ae4 100644 --- a/core/src/main/java/hudson/model/AdministrativeMonitor.java +++ b/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; diff --git a/core/src/main/java/hudson/model/AperiodicWork.java b/core/src/main/java/hudson/model/AperiodicWork.java index 56b0804da1ec2f949193a67c93d99e23db88ea70..fbd4f2c4f7a3da987d57e4f61168d453647ff667 100644 --- a/core/src/main/java/hudson/model/AperiodicWork.java +++ b/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; diff --git a/core/src/main/java/hudson/model/AsyncAperiodicWork.java b/core/src/main/java/hudson/model/AsyncAperiodicWork.java index f46dd33b61d835eec945fec60f76975809d9c3de..9111e5fd474d5536879c86180272737fe26aa67c 100644 --- a/core/src/main/java/hudson/model/AsyncAperiodicWork.java +++ b/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 diff --git a/core/src/main/java/hudson/model/BuildStepListener.java b/core/src/main/java/hudson/model/BuildStepListener.java index a37cb8f67abfa6f37622d042ff09038207f4a6dd..e0ee3efe29ce12313b1ff81abfbc11c51d7d0905 100644 --- a/core/src/main/java/hudson/model/BuildStepListener.java +++ b/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. diff --git a/core/src/main/java/hudson/model/BuildVariableContributor.java b/core/src/main/java/hudson/model/BuildVariableContributor.java index 15baad759088c83ce5deb3cde44e56e7b4103e68..83046baa5440d2c5f7c489db65c040ce54da5009 100644 --- a/core/src/main/java/hudson/model/BuildVariableContributor.java +++ b/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; diff --git a/core/src/main/java/hudson/model/ComputerPanelBox.java b/core/src/main/java/hudson/model/ComputerPanelBox.java index f7def3d04f2321cd73a179015d06508c1c593aff..94ee1aaa3ca938aa8412999f65cbae7c2cbf7337 100644 --- a/core/src/main/java/hudson/model/ComputerPanelBox.java +++ b/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. diff --git a/core/src/main/java/hudson/model/ComputerPinger.java b/core/src/main/java/hudson/model/ComputerPinger.java index d924ab63b4fea091b3eeccd7033044f0addb2016..ecf81abceb7a430c81e1bfa61dccd8ce413652cd 100644 --- a/core/src/main/java/hudson/model/ComputerPinger.java +++ b/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; diff --git a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java index 0a435c6fda0777b070e0b3b24814767bbd800fe1..bd5cbfd36ebd0649c0f115a50c60946a59e3eb2f 100644 --- a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java +++ b/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; diff --git a/core/src/main/java/hudson/model/DirectlyModifiableView.java b/core/src/main/java/hudson/model/DirectlyModifiableView.java index bdc651341b59219520c6ebe8baaa277aab34aa52..b799d2bd9e978d97b06b21f62aca9790deec7b90 100644 --- a/core/src/main/java/hudson/model/DirectlyModifiableView.java +++ b/core/src/main/java/hudson/model/DirectlyModifiableView.java @@ -23,7 +23,6 @@ */ package hudson.model; -import hudson.util.HttpResponses; import java.io.IOException; diff --git a/core/src/main/java/hudson/model/EnvironmentContributor.java b/core/src/main/java/hudson/model/EnvironmentContributor.java index d6d630bcb56c47eab192fed8f09a078255757301..77ea159b309b3efa7fcd55a81b811ffaf8e5f4b3 100644 --- a/core/src/main/java/hudson/model/EnvironmentContributor.java +++ b/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; diff --git a/core/src/main/java/hudson/model/ExecutorListener.java b/core/src/main/java/hudson/model/ExecutorListener.java index 3c5e221f17f277d8bc2a9c53a3e587e36039f9cd..678a0ca702ad54314630fa972a5e663160deedc7 100644 --- a/core/src/main/java/hudson/model/ExecutorListener.java +++ b/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. diff --git a/core/src/main/java/hudson/model/FullDuplexHttpChannel.java b/core/src/main/java/hudson/model/FullDuplexHttpChannel.java index 6372b60ed21b917ec65346f035e188f8f5078e87..e96718890143765294d6319a62d6d1a3a429db31 100644 --- a/core/src/main/java/hudson/model/FullDuplexHttpChannel.java +++ b/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; diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 17b5721a4568db28e3811365c94b15c796bf2eda..9792d38e1c60722e65095a9c85bccb09b0da450d 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/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; diff --git a/core/src/main/java/hudson/model/ItemGroup.java b/core/src/main/java/hudson/model/ItemGroup.java index ace90e16b4354ec2f98dd022e7dce4d9cced37f6..0de4fa477bd3fda285bd390f787c80fdbe961398 100644 --- a/core/src/main/java/hudson/model/ItemGroup.java +++ b/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; diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java index d3e204fec037a3991bb12034aac84f71153c44a1..8c2b390e6a4e37c85c66dd070f75d302e803b862 100644 --- a/core/src/main/java/hudson/model/ItemGroupMixIn.java +++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java @@ -31,7 +31,6 @@ import hudson.util.CopyOnWriteMap; import hudson.util.Function1; import hudson.util.IOUtils; import jenkins.model.Jenkins; -import org.acegisecurity.AccessDeniedException; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/LabelFinder.java b/core/src/main/java/hudson/model/LabelFinder.java index 4db50bd26335cf0bd17dec5a38c0a51b99183e5c..cd612b6c7beccb7c710bd60e3883f0ec82428245 100644 --- a/core/src/main/java/hudson/model/LabelFinder.java +++ b/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; diff --git a/core/src/main/java/hudson/model/PeriodicWork.java b/core/src/main/java/hudson/model/PeriodicWork.java index c3a1bf4953583f46ce1647b706dd7872dfc8f9be..95de4fb3042d34eecf530154468943b661608f07 100644 --- a/core/src/main/java/hudson/model/PeriodicWork.java +++ b/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; diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index c265e477df46da5efb794f1ce4897734cfa5b7d5..c055f5b60181aa6347605ff56c464fe64ef03be3 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/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; diff --git a/core/src/main/java/hudson/model/Resource.java b/core/src/main/java/hudson/model/Resource.java index e92287f8145c379c009b77462ffc51d7da9aa63a..caef6428bc5006669e0a63b23cdc758085b5d65a 100644 --- a/core/src/main/java/hudson/model/Resource.java +++ b/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. diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 54255e779d4534d169c2b3b362b868287763265a..c4f64ccade01e20f12bf0274cc113b79229cc510 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/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; diff --git a/core/src/main/java/hudson/model/RunMap.java b/core/src/main/java/hudson/model/RunMap.java index 1f923e0910b633893c38e97f607c3821a9da68d0..3142dc764388ca6b904e53bc8886118ef102c43f 100644 --- a/core/src/main/java/hudson/model/RunMap.java +++ b/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; diff --git a/core/src/main/java/hudson/model/Saveable.java b/core/src/main/java/hudson/model/Saveable.java index a27d35e27dd235b0341280545bf5838ccb8893a6..79e361cc26ae7b501905b5fe3293b048c868940f 100644 --- a/core/src/main/java/hudson/model/Saveable.java +++ b/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; /** diff --git a/core/src/main/java/hudson/model/TaskListener.java b/core/src/main/java/hudson/model/TaskListener.java index 2338724b9797148070670df3edf4f746f230e2b0..3ff26c0fff416beb2f6ab635239748b43d639869 100644 --- a/core/src/main/java/hudson/model/TaskListener.java +++ b/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 diff --git a/core/src/main/java/hudson/model/TransientBuildActionFactory.java b/core/src/main/java/hudson/model/TransientBuildActionFactory.java index 0ac332823f2fcb33c4c6c173dc8e23b32d57c3e2..dfac20cb07808ac000edb1a8807f616c3c77b59b 100644 --- a/core/src/main/java/hudson/model/TransientBuildActionFactory.java +++ b/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; diff --git a/core/src/main/java/hudson/model/TransientComputerActionFactory.java b/core/src/main/java/hudson/model/TransientComputerActionFactory.java index 37fc369e95f51612f2939dd69b21ca0bc237a4e1..3a77db8c5260e77310a790ace88eb8af6c5d5351 100644 --- a/core/src/main/java/hudson/model/TransientComputerActionFactory.java +++ b/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; diff --git a/core/src/main/java/hudson/model/TransientProjectActionFactory.java b/core/src/main/java/hudson/model/TransientProjectActionFactory.java index 35acbaebb9a7b5cda30ac662a1d3d4888da8566b..23fd0a138c78d1e357f45aa09fd425c5fe7f62c9 100644 --- a/core/src/main/java/hudson/model/TransientProjectActionFactory.java +++ b/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; diff --git a/core/src/main/java/hudson/model/TransientViewActionFactory.java b/core/src/main/java/hudson/model/TransientViewActionFactory.java index 43633bac2d84154343dcea184e6ea2cce2d2d10e..edf9a1c85afce7fccad49c6feda2b6595db3245c 100644 --- a/core/src/main/java/hudson/model/TransientViewActionFactory.java +++ b/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; diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index d55aebd3f4ebfa083151a79ac00ac8c7efc36202..ce7910cb5520a25bf1f70f7fb55b818b64d6de11 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/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; diff --git a/core/src/main/java/hudson/model/ViewGroupMixIn.java b/core/src/main/java/hudson/model/ViewGroupMixIn.java index 3134ae06d26e53c9c46ff21d75b1b40d65971be7..e390005edbb57e186f8afadd96b02616ef6935dd 100644 --- a/core/src/main/java/hudson/model/ViewGroupMixIn.java +++ b/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; /** diff --git a/core/src/main/java/hudson/model/WorkspaceListener.java b/core/src/main/java/hudson/model/WorkspaceListener.java index 9635a42192407ac8262dd64c12671446205aa5be..94d37d41441833998e655823bbc00fd0ce7d772e 100644 --- a/core/src/main/java/hudson/model/WorkspaceListener.java +++ b/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 { diff --git a/core/src/main/java/hudson/model/listeners/SCMPollListener.java b/core/src/main/java/hudson/model/listeners/SCMPollListener.java index 7b7b94ba4034124554fae662b39c4461b3dc1d10..55dd8d558930c0ace3445c18f84a2658d4743bf7 100644 --- a/core/src/main/java/hudson/model/listeners/SCMPollListener.java +++ b/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; diff --git a/core/src/main/java/hudson/model/queue/LoadPredictor.java b/core/src/main/java/hudson/model/queue/LoadPredictor.java index cb2070b59640c53a06e20c22a41cd225a341aa79..2fc4bf8d657c6aaaf0bd6e587d6fa6f6dcb1b6fd 100644 --- a/core/src/main/java/hudson/model/queue/LoadPredictor.java +++ b/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; diff --git a/core/src/main/java/hudson/model/queue/MappingWorksheet.java b/core/src/main/java/hudson/model/queue/MappingWorksheet.java index 0e21fa31ad72268b5c0e0ad6d8ae431fc7b16a5d..4ef5af3c8c9fb4f15a52c18e8edb17ee649f5446 100644 --- a/core/src/main/java/hudson/model/queue/MappingWorksheet.java +++ b/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; diff --git a/core/src/main/java/hudson/model/queue/QueueListener.java b/core/src/main/java/hudson/model/queue/QueueListener.java index 527a9485b4dc0a82616ad9a3723bfae740fa5ac3..50fbf35e274f8b3f9a059a4042debaa33209acd8 100644 --- a/core/src/main/java/hudson/model/queue/QueueListener.java +++ b/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; diff --git a/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java b/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java index 78ac2c527eb33d75647ff00a6defce4f7cff3d2e..cd5c5d5b0cc9a743d41b71e4e360c1ba72a06cce 100644 --- a/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java +++ b/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; diff --git a/core/src/main/java/hudson/model/queue/ScheduleResult.java b/core/src/main/java/hudson/model/queue/ScheduleResult.java index 95ebf0394ac4ad07784630bc881ff40dcf7d6142..0ba9b08944fba2d6797e54441321430476c4acbd 100644 --- a/core/src/main/java/hudson/model/queue/ScheduleResult.java +++ b/core/src/main/java/hudson/model/queue/ScheduleResult.java @@ -1,9 +1,7 @@ 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; diff --git a/core/src/main/java/hudson/model/queue/SubTaskContributor.java b/core/src/main/java/hudson/model/queue/SubTaskContributor.java index b61a19ea3384cf2241188386eb92cc3a9e7282ab..313b863601c4d918f55cee0ef2591364c056b51b 100644 --- a/core/src/main/java/hudson/model/queue/SubTaskContributor.java +++ b/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; diff --git a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java index 7a0a0237fd88f80a1d10e71e356c8f633d21d350..054c6e08d77f50555a8faff5913c0132d233d851 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java +++ b/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; diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java index 3875eb12a88225ffd539b4d983642eff6dac38f7..c79d4ea918e63392e2e08c056278955079db9e05 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java +++ b/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; diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java index 67d33c7227a57da7df9560eafcb2376784e00dac..3fb829710001a9e9d138057be74882ab62cefef1 100644 --- a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java +++ b/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; diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java b/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java index 41573e5d0f6cc08225467c1f1c8970185dce979c..9f3b5f19ff4a678c6ead27abab19da59c39f0529 100644 --- a/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java +++ b/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; diff --git a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java index 69da2e6bcddc404dbdd75d506c91eed55c3e2576..7c7991a2e8cfde7df5f99f9bc650bca2466abcef 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.slaves.OfflineCause; import hudson.model.Computer; import hudson.remoting.Callable; import jenkins.security.MasterToSlaveCallable; diff --git a/core/src/main/java/hudson/os/solaris/ZFSInstaller.java b/core/src/main/java/hudson/os/solaris/ZFSInstaller.java index 17a3bb48ac264566530a1d7e462ec4e049911b40..94ff9638d85123b81a87a36918243f134b5dd440 100644 --- a/core/src/main/java/hudson/os/solaris/ZFSInstaller.java +++ b/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; diff --git a/core/src/main/java/hudson/scm/ChangeLogAnnotator.java b/core/src/main/java/hudson/scm/ChangeLogAnnotator.java index ebe0227ea952b8da9e88c0bfba8e097021c13e56..d393995f931764a2b81ea21ce3ea99127c192904 100644 --- a/core/src/main/java/hudson/scm/ChangeLogAnnotator.java +++ b/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. diff --git a/core/src/main/java/hudson/scm/PollingResult.java b/core/src/main/java/hudson/scm/PollingResult.java index a5ec21fb4079b51b9bb17357a92f945a003baeac..39b3a0caba817158fc398b612127250641c05e7b 100644 --- a/core/src/main/java/hudson/scm/PollingResult.java +++ b/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; /** diff --git a/core/src/main/java/hudson/search/SearchFactory.java b/core/src/main/java/hudson/search/SearchFactory.java index 850672ffe9fc8ba61609a5ec8c865284f4217903..0e1290addb6a21eb0c4116e3c45ae4620230d427 100644 --- a/core/src/main/java/hudson/search/SearchFactory.java +++ b/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}. diff --git a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java b/core/src/main/java/hudson/security/BasicAuthenticationFilter.java index 8d18afff06274a2f6e1be20ea75f85b0a7f2de1d..c31876a6d1ac0df3588e0a7e4b25d8fc27ff22b0 100644 --- a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java +++ b/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; diff --git a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java index 30f386eb1fa086e1183a7092aa96fdcc81b033cf..b590dce40842558b814c84d65a179261b08374f7 100644 --- a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java +++ b/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; diff --git a/core/src/main/java/hudson/security/PermissionAdder.java b/core/src/main/java/hudson/security/PermissionAdder.java index 9c6186e667eca5486ed1944be4ee74f5e3da19f4..1e963fa0702ce7be4ea14619937c111e7d67725a 100644 --- a/core/src/main/java/hudson/security/PermissionAdder.java +++ b/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. diff --git a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java index 8b47e324a0147baf815d565da6f3f9ae02b496ab..6ae4d1c42626f5c8dc58b2201122751b644c4e43 100644 --- a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java +++ b/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 diff --git a/core/src/main/java/hudson/security/csrf/CrumbExclusion.java b/core/src/main/java/hudson/security/csrf/CrumbExclusion.java index 688e2a9822db91a2b58167d25ffea9c73e2fd3ed..8b48ec4dca24cbda6ffde4adc389b7f919a63cb5 100644 --- a/core/src/main/java/hudson/security/csrf/CrumbExclusion.java +++ b/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; diff --git a/core/src/main/java/hudson/slaves/CloudProvisioningListener.java b/core/src/main/java/hudson/slaves/CloudProvisioningListener.java index 0041ebfefcb631dd3c7a04732d23823db52b8b6d..7789824d5f9ae777de5822cab951d9bb094c7a70 100644 --- a/core/src/main/java/hudson/slaves/CloudProvisioningListener.java +++ b/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; diff --git a/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java b/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java index 8dece9422349d483463076868def1f8f76f22d0a..054a13b6ac5e9a77732da7d025ef0e2c2fdb8b05 100644 --- a/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java +++ b/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; diff --git a/core/src/main/java/hudson/slaves/ComputerListener.java b/core/src/main/java/hudson/slaves/ComputerListener.java index 96e1abe937c8c140511e4b7ce86df785baa5d480..01c0cfab6e97f863032cf5e6d0d2b14cd7b08325 100644 --- a/core/src/main/java/hudson/slaves/ComputerListener.java +++ b/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; diff --git a/core/src/main/java/hudson/slaves/NodeProperty.java b/core/src/main/java/hudson/slaves/NodeProperty.java index 7f71adebef227b98150a9807c2770dc15d58f15a..b87a57fe8874394d41d990bbbed7f72db5a8d95a 100644 --- a/core/src/main/java/hudson/slaves/NodeProperty.java +++ b/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; diff --git a/core/src/main/java/hudson/tasks/BuildStep.java b/core/src/main/java/hudson/tasks/BuildStep.java index 83b351673bb52dc60c87f0ffe4e528616e93c096..783b1c414e7084503d0b69b53cb9e65aa2f8bab8 100644 --- a/core/src/main/java/hudson/tasks/BuildStep.java +++ b/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; diff --git a/core/src/main/java/hudson/tasks/CommandInterpreter.java b/core/src/main/java/hudson/tasks/CommandInterpreter.java index bfab1c639d7583331f65255379e41f1685985eeb..982ecadb3f46c12edd6e3ebaf43c6b0eedf0a6b8 100644 --- a/core/src/main/java/hudson/tasks/CommandInterpreter.java +++ b/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; diff --git a/core/src/main/java/hudson/tasks/UserNameResolver.java b/core/src/main/java/hudson/tasks/UserNameResolver.java index 49e518a6c60bcea84d8cd6b113ba798600644998..5aa7af3768737af85d837bc70f75e7c0cc89a17f 100644 --- a/core/src/main/java/hudson/tasks/UserNameResolver.java +++ b/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; diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java index 8248d416a4a3862248637bf7954787e1ae8a36b8..3ad212a0dba427a13781b36d961574285b78a128 100644 --- a/core/src/main/java/hudson/tools/JDKInstaller.java +++ b/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; diff --git a/core/src/main/java/hudson/tools/ToolLocationTranslator.java b/core/src/main/java/hudson/tools/ToolLocationTranslator.java index 09350475077fc6265a3158b30ccc54a33f730079..47194ef37f57b90220408fa9045ab7d945189531 100644 --- a/core/src/main/java/hudson/tools/ToolLocationTranslator.java +++ b/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; diff --git a/core/src/main/java/hudson/triggers/SafeTimerTask.java b/core/src/main/java/hudson/triggers/SafeTimerTask.java index e47dfc61e62b52872beaede1f3a03317cf5f5bfe..08a6e16dcd3f66609fe83154f8ce13507bf37760 100644 --- a/core/src/main/java/hudson/triggers/SafeTimerTask.java +++ b/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; diff --git a/core/src/main/java/hudson/util/AlternativeUiTextProvider.java b/core/src/main/java/hudson/util/AlternativeUiTextProvider.java index 9b4aa3b458530478e5f7e0c7445aafe070d495d0..45605bb7626df713495a30d34d9b91210166b789 100644 --- a/core/src/main/java/hudson/util/AlternativeUiTextProvider.java +++ b/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. diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java index d89744a413ca08db2c6154856bb80963c4524e49..e9edd17b1eaa2f42ea06e705c3c07c8918df4877 100644 --- a/core/src/main/java/hudson/util/ArgumentListBuilder.java +++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java @@ -24,7 +24,6 @@ */ package hudson.util; -import hudson.FilePath; import hudson.Launcher; import hudson.Util; diff --git a/core/src/main/java/hudson/util/ComboBoxModel.java b/core/src/main/java/hudson/util/ComboBoxModel.java index 48351bc16b5acacc1fc729dafc6516e5f5b8a6d5..f39f9bc555319eb6aed33a0f3c965e23dab4f700 100644 --- a/core/src/main/java/hudson/util/ComboBoxModel.java +++ b/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; diff --git a/core/src/main/java/hudson/util/CyclicGraphDetector.java b/core/src/main/java/hudson/util/CyclicGraphDetector.java index 74f7fdeb48afc155a1aa7ecfd22ffc087cb25c50..7e0bf2029db3de6b84bf54c2148aa68d2333582f 100644 --- a/core/src/main/java/hudson/util/CyclicGraphDetector.java +++ b/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; diff --git a/core/src/main/java/hudson/util/DoubleLaunchChecker.java b/core/src/main/java/hudson/util/DoubleLaunchChecker.java index 6642022abfa56d4cc26435a4e28818a3492c6ed8..801b9fe5c657b9a9173d50186e9d8df7f43dea38 100644 --- a/core/src/main/java/hudson/util/DoubleLaunchChecker.java +++ b/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; diff --git a/core/src/main/java/hudson/util/NamingThreadFactory.java b/core/src/main/java/hudson/util/NamingThreadFactory.java index e55b7dd4a5c9f05129e6b2a93fecca62e3f00c0b..a1994a0433b04174e68ee0f7bbc86dbe84e31443 100644 --- a/core/src/main/java/hudson/util/NamingThreadFactory.java +++ b/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; diff --git a/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java b/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java index d23660b4e4aa90f7babe1f88a925da4e52dd0bd3..18a3e3e76173b60abd175993ab108c51888746b7 100644 --- a/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java +++ b/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. diff --git a/core/src/main/java/hudson/util/NoTempDir.java b/core/src/main/java/hudson/util/NoTempDir.java index b45aff8d4feacd48f6a1ddece06fc991b0a33dc5..10cfceb5ac04e446d2bb0c45c1836a8b2130a341 100644 --- a/core/src/main/java/hudson/util/NoTempDir.java +++ b/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; diff --git a/core/src/main/java/hudson/util/ProcessKiller.java b/core/src/main/java/hudson/util/ProcessKiller.java index 81cb4b91a959e6e8205218105789661cdd377fee..1aeb8f7815ed65631348b730244b880f21ba9b80 100644 --- a/core/src/main/java/hudson/util/ProcessKiller.java +++ b/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; diff --git a/core/src/main/java/hudson/util/io/TarArchiver.java b/core/src/main/java/hudson/util/io/TarArchiver.java index 600a16cba67faf106568089f383d269cde9423ac..3411310fdbc4f8b9f943b9b730f13d6de5ac6ce7 100644 --- a/core/src/main/java/hudson/util/io/TarArchiver.java +++ b/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; diff --git a/core/src/main/java/hudson/util/jna/GNUCLibrary.java b/core/src/main/java/hudson/util/jna/GNUCLibrary.java index 28cdfabb5f6544c49dbe0dbf4d1223ad61581aeb..d555c8c4d18e1fa0ecc4a65c0ebb4b3870499a2d 100644 --- a/core/src/main/java/hudson/util/jna/GNUCLibrary.java +++ b/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; diff --git a/core/src/main/java/hudson/views/GlobalDefaultViewConfiguration.java b/core/src/main/java/hudson/views/GlobalDefaultViewConfiguration.java index 65e020a06c8d69e79aaee674b3c143e17daf51c3..934920b3e82e9dd09affbaf8c662ea8dc4144cef 100644 --- a/core/src/main/java/hudson/views/GlobalDefaultViewConfiguration.java +++ b/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; diff --git a/core/src/main/java/jenkins/AgentProtocol.java b/core/src/main/java/jenkins/AgentProtocol.java index 68ad9ace8a8a39e1789756d2135030849c5c03f4..667f881cde13b604c043ddeb8b08c9ee3f82181d 100644 --- a/core/src/main/java/jenkins/AgentProtocol.java +++ b/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; diff --git a/core/src/main/java/jenkins/ExtensionFilter.java b/core/src/main/java/jenkins/ExtensionFilter.java index 6b20d805e25f87b62a4901f3b34ccb9b292c4561..1f3ec5c8865f0bc0873f8c50f8315950f4a813e1 100644 --- a/core/src/main/java/jenkins/ExtensionFilter.java +++ b/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, diff --git a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java b/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java index 766f036bbbb2d99874ca68756be58121cb05d6e5..50d4e6cbebd205c6c30b58cc16d6ea41e586f0f5 100644 --- a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java +++ b/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; diff --git a/core/src/main/java/jenkins/management/NodesLink.java b/core/src/main/java/jenkins/management/NodesLink.java index 5bff1b525308a8de6e623cef1440cccc4b54f9a2..11ea4698570997af6e601eb5c38e7e799630ca7d 100644 --- a/core/src/main/java/jenkins/management/NodesLink.java +++ b/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 Nicolas De Loof diff --git a/core/src/main/java/jenkins/model/ArtifactManager.java b/core/src/main/java/jenkins/model/ArtifactManager.java index bb5fde97e2fe250e1f99396bea55b1b9241f95fb..eeca67143c5d3debbfaec7bcf9f053d4963acea7 100644 --- a/core/src/main/java/jenkins/model/ArtifactManager.java +++ b/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; diff --git a/core/src/main/java/jenkins/model/BuildDiscarder.java b/core/src/main/java/jenkins/model/BuildDiscarder.java index 72e6552aa9da40251d2557c301b0927bf2b97abf..8e4c3abadc57c506a42e8957f59151223106fdf2 100644 --- a/core/src/main/java/jenkins/model/BuildDiscarder.java +++ b/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; diff --git a/core/src/main/java/jenkins/model/CauseOfInterruption.java b/core/src/main/java/jenkins/model/CauseOfInterruption.java index dbec0221acf76c59495279c6e88370334d92df0d..90da391dbcb43cfba9f73864fd6c1eea93d33d04 100644 --- a/core/src/main/java/jenkins/model/CauseOfInterruption.java +++ b/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; diff --git a/core/src/main/java/jenkins/model/DependencyDeclarer.java b/core/src/main/java/jenkins/model/DependencyDeclarer.java index a6cb2c52c61ee54787d5101ade9927a44caf61a7..5d53d472685b7e546e74db064a477f66c5e2fbe4 100644 --- a/core/src/main/java/jenkins/model/DependencyDeclarer.java +++ b/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 diff --git a/core/src/main/java/jenkins/model/DirectlyModifiableTopLevelItemGroup.java b/core/src/main/java/jenkins/model/DirectlyModifiableTopLevelItemGroup.java index f08d3f3faf0249883baaa70c51631a240e700460..1d80e5d7b068460c2590cd9f9cc89cc7c2bfb653 100644 --- a/core/src/main/java/jenkins/model/DirectlyModifiableTopLevelItemGroup.java +++ b/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; /** diff --git a/core/src/main/java/jenkins/model/Nodes.java b/core/src/main/java/jenkins/model/Nodes.java index 9c199a6b1dc5cdaa683b4de1367a80a45cace03a..f11affc06becdc4a14dd5b1eec6a6a4cf98b6a9a 100644 --- a/core/src/main/java/jenkins/model/Nodes.java +++ b/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; diff --git a/core/src/main/java/jenkins/model/RunIdMigrator.java b/core/src/main/java/jenkins/model/RunIdMigrator.java index 88dc17b90026101b0a75a3abdca21bd1b8bab760..94d378633a228cbecd5b21b2576a3a1d1ed216e9 100644 --- a/core/src/main/java/jenkins/model/RunIdMigrator.java +++ b/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; diff --git a/core/src/main/java/jenkins/model/TransientFingerprintFacetFactory.java b/core/src/main/java/jenkins/model/TransientFingerprintFacetFactory.java index 96cf7ebec4af2886c97685ba5e2a58e417de13ca..5e7826cbdde3a9bcaf475da1b239909bc100857f 100644 --- a/core/src/main/java/jenkins/model/TransientFingerprintFacetFactory.java +++ b/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; /** diff --git a/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java b/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java index 008e5d2c743ef198de75121be00ec6cab23bc365..cf4abda2819725bc3d2eb55df949fd478633c227 100644 --- a/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java +++ b/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) diff --git a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java index 99c48f820b1357a39f3636603852eb09a04577e1..b206035c386d30fce003f96b06820dbbfb0ede45 100644 --- a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java +++ b/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; diff --git a/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java b/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java index e75a12e295085e8c04a14eae4388d3a420e7add8..d53fc768c3421d09470e7fb938c69b8d63ad94f6 100644 --- a/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java +++ b/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; diff --git a/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java index 4e5b9ed3229d0d56e92ca1f400290c3b361738cd..39690a04725dce102185039a7a75b02a3e8035e1 100644 --- a/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java +++ b/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; diff --git a/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java b/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java index bd6a9bd7e8b4a5c408c689be27f063ff5a29bfd8..ade67de48a51a28443255c1c31b7c82fae483099 100644 --- a/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java +++ b/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; diff --git a/core/src/main/java/jenkins/security/ConfidentialKey.java b/core/src/main/java/jenkins/security/ConfidentialKey.java index a0167f478d680e5fe1b8931170cb8ca044384fea..a9ac452768dce7218e539bdcf13890670b84d63b 100644 --- a/core/src/main/java/jenkins/security/ConfidentialKey.java +++ b/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; diff --git a/core/src/main/java/jenkins/security/ConfidentialStore.java b/core/src/main/java/jenkins/security/ConfidentialStore.java index 9b3efdbec6956319f2b2f0eb26eea771789d6d47..1c747b32c87d76e2c34607dcbdf493e255cbf628 100644 --- a/core/src/main/java/jenkins/security/ConfidentialStore.java +++ b/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; diff --git a/core/src/main/java/jenkins/security/MasterToSlaveCallable.java b/core/src/main/java/jenkins/security/MasterToSlaveCallable.java index 8be5b98305c1eed129da241c454a76ce49b3ce4e..29837e973ad5656ebb30b8f4b31771007126ae1c 100644 --- a/core/src/main/java/jenkins/security/MasterToSlaveCallable.java +++ b/core/src/main/java/jenkins/security/MasterToSlaveCallable.java @@ -1,10 +1,8 @@ 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. diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java index 05e00097c9bd3841171ed5c9572206ef1bc31569..9bc8ef0017109efa79588218dbd411e0fa7c1ebf 100644 --- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java +++ b/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; diff --git a/core/src/main/java/jenkins/security/SecurityListener.java b/core/src/main/java/jenkins/security/SecurityListener.java index 992b3bb0c1234a1928bd13e7268ffe458213b759..7cec8c0eea4afa72f446c03d781d80592c0a5443 100644 --- a/core/src/main/java/jenkins/security/SecurityListener.java +++ b/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; diff --git a/core/src/main/java/jenkins/security/SlaveToMasterCallable.java b/core/src/main/java/jenkins/security/SlaveToMasterCallable.java index 61265cbdea54544055eaa09eaa91136258c73c8a..2a3a35a42b21df6712be665a65dc7a82e236a27c 100644 --- a/core/src/main/java/jenkins/security/SlaveToMasterCallable.java +++ b/core/src/main/java/jenkins/security/SlaveToMasterCallable.java @@ -1,10 +1,8 @@ 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). diff --git a/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java b/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java index 914447332f66447e1ec8657d0956df1a8c81c33d..b9ab82e4a3e717427b3ba5e0178da6a620cee7f8 100644 --- a/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java +++ b/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; diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java index cee4b6cbad8568e0221366f8f01cbe9a0ce4fa34..292cb0f3db02c5aa415c6b43f8e556ab86c4aa9d 100644 --- a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java +++ b/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. diff --git a/core/src/main/java/jenkins/slaves/WorkspaceLocator.java b/core/src/main/java/jenkins/slaves/WorkspaceLocator.java index ff40093b6cbc7a1fc83ebd3b0c1727b64a6a4e69..7c7cb382587073ce35716b56726cbeea226c6aea 100644 --- a/core/src/main/java/jenkins/slaves/WorkspaceLocator.java +++ b/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 diff --git a/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java b/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java index 506c1a6806d413ddf4872931dab3d190555834e1..84e88202c9c53525db977847bd0fd768a7ecc5a4 100644 --- a/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java +++ b/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; diff --git a/core/src/main/java/jenkins/slaves/systemInfo/SlaveSystemInfo.java b/core/src/main/java/jenkins/slaves/systemInfo/SlaveSystemInfo.java index 6b39684f7552c2e4ed73ff491e043eb2e8f95cf0..16a5352d09aad470496420168cc9d4e267a1b79e 100644 --- a/core/src/main/java/jenkins/slaves/systemInfo/SlaveSystemInfo.java +++ b/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}. diff --git a/core/src/main/java/jenkins/tasks/SimpleBuildStep.java b/core/src/main/java/jenkins/tasks/SimpleBuildStep.java index 50b2fb8ca79951c9efd3af3f260276af890c5009..89b16dd593d2135f28e2af4322b981635cbf8650 100644 --- a/core/src/main/java/jenkins/tasks/SimpleBuildStep.java +++ b/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; diff --git a/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java b/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java index e2da11b2bf9327a40b3111ee9d7ae1312e2d9384..df9ba97c96a097bacd2c1a7ea93ee6bd6ed06acc 100644 --- a/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java +++ b/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; diff --git a/core/src/main/java/jenkins/util/ProgressiveRendering.java b/core/src/main/java/jenkins/util/ProgressiveRendering.java index 11cd35c0e28207fb55d52220b2b76a0047d2c82c..103081a29df4ebccaf65dae4ffa483c3c67cbb03 100644 --- a/core/src/main/java/jenkins/util/ProgressiveRendering.java +++ b/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; diff --git a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java index c5aad8c95c15d7fb62f4725954400deee707db40..4fa5e4d04c9b35d836507a3c809225b94f538d27 100644 --- a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java +++ b/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; diff --git a/core/src/test/java/hudson/UtilTest.java b/core/src/test/java/hudson/UtilTest.java index 6757940a68ec950e3a9daf837eafb8c1aadbf88f..f413ffe9d9498f836e0cbbca087605bf70701ab7 100644 --- a/core/src/test/java/hudson/UtilTest.java +++ b/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.*; diff --git a/core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java b/core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java index 841efa79fee5322708ca31084381c2707313a258..f6dd1d4b395c2b339ab6936f88989c47a82fb855 100644 --- a/core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java +++ b/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; diff --git a/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java b/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java index 74ac53e23826dc61b36757c35f6d33757cee57f9..0414e8a784cdd95a5887c8d9cbd6478127a2c378 100644 --- a/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java +++ b/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java @@ -1,7 +1,6 @@ package hudson.model; import hudson.util.FormValidation; -import jenkins.model.Jenkins; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/hudson/model/ItemsTest.java b/core/src/test/java/hudson/model/ItemsTest.java index 690507ce4f31871b898ac88524fcb3f3df521520..fbccf4cba679ff267fbe70d688b0d35e048d657e 100644 --- a/core/src/test/java/hudson/model/ItemsTest.java +++ b/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.*; diff --git a/core/src/test/java/hudson/os/SUTester.java b/core/src/test/java/hudson/os/SUTester.java index c89d447c0ca26af384bffd7bfcb542aaccf88d9e..12d43f9787481433ceb30e658917067e5109be2a 100644 --- a/core/src/test/java/hudson/os/SUTester.java +++ b/core/src/test/java/hudson/os/SUTester.java @@ -1,6 +1,5 @@ package hudson.os; -import hudson.remoting.Callable; import hudson.util.StreamTaskListener; import jenkins.security.MasterToSlaveCallable; diff --git a/core/src/test/java/hudson/scheduler/CronTabTest.java b/core/src/test/java/hudson/scheduler/CronTabTest.java index 6ddf85912853977ecb0d715fe5c1bbf7daa7a790..e2acaf53ba33a0ad8cc4da2c1a42fa4052ec0202 100644 --- a/core/src/test/java/hudson/scheduler/CronTabTest.java +++ b/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; diff --git a/core/src/test/java/jenkins/model/JDKNameTest.java b/core/src/test/java/jenkins/model/JDKNameTest.java index 491689aaef803095b83b0d542f09743d66698f30..e2474910550402989fc7307357cd401ceec196b3 100644 --- a/core/src/test/java/jenkins/model/JDKNameTest.java +++ b/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) diff --git a/core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java b/core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java index bc9c3ffecc9816402da4a1e5e801b733abffc24e..8d5dd3b08d3c9130c7c51d4aacacc76a6a90e168 100644 --- a/core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java +++ b/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}. diff --git a/core/src/test/java/jenkins/slaves/DefaultJnlpSlaveReceiverTest.java b/core/src/test/java/jenkins/slaves/DefaultJnlpSlaveReceiverTest.java index 9cc6425d34b11b1017b8291896b5df2705d6b273..6fae787118cbd84646cd3d40b09edc0c4fb9b7b9 100644 --- a/core/src/test/java/jenkins/slaves/DefaultJnlpSlaveReceiverTest.java +++ b/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; diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index dc394fd38e48cbeea10ab8bda27fb65cb850c1a8..9afb80e6061e5dcb1ff789fe97277cc5c78acd09 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/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; diff --git a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java index c036358adb53a3f2d634df9144a5a86a13d11bd5..c58951f490b02cb408a7d60f365cf85565a640b1 100644 --- a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java +++ b/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; diff --git a/test/src/main/java/org/jvnet/hudson/test/MockQueueItemAuthenticator.java b/test/src/main/java/org/jvnet/hudson/test/MockQueueItemAuthenticator.java index c0202908c9c388c4f509812b30ac7613b42e057a..7c8324598fa6c2a4d8b76c1b0c2be45cca9ca006 100644 --- a/test/src/main/java/org/jvnet/hudson/test/MockQueueItemAuthenticator.java +++ b/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; diff --git a/test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java b/test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java index 4a42e00fb841faa42ba8724b7ecafc50cc561dec..1a14fc406cb4347338679fd24dd49a4390528544 100644 --- a/test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java +++ b/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; diff --git a/test/src/main/java/org/jvnet/hudson/test/WithoutJenkins.java b/test/src/main/java/org/jvnet/hudson/test/WithoutJenkins.java index 64d4a01c0c09f6cf1d33d12bba5157a25693030f..da18322b4c55cf518f9437af63447e5054af0afc 100644 --- a/test/src/main/java/org/jvnet/hudson/test/WithoutJenkins.java +++ b/test/src/main/java/org/jvnet/hudson/test/WithoutJenkins.java @@ -1,16 +1,12 @@ 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; diff --git a/test/src/main/java/org/jvnet/hudson/test/recipes/LocalData.java b/test/src/main/java/org/jvnet/hudson/test/recipes/LocalData.java index 1de601185261bd10bd0203a313115a3b623ccad8..d346b4e00a8d29b9a3e4f8b41747e274d3920d82 100644 --- a/test/src/main/java/org/jvnet/hudson/test/recipes/LocalData.java +++ b/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; diff --git a/test/src/main/java/org/jvnet/hudson/test/recipes/WithPlugin.java b/test/src/main/java/org/jvnet/hudson/test/recipes/WithPlugin.java index 9700e1785198c4ddae72f79da1dbdc985380371c..9d9d56cc03ed82141dc49920e4edd16b4be76c3e 100644 --- a/test/src/main/java/org/jvnet/hudson/test/recipes/WithPlugin.java +++ b/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; diff --git a/test/src/main/java/org/jvnet/hudson/test/recipes/WithTimeout.java b/test/src/main/java/org/jvnet/hudson/test/recipes/WithTimeout.java index ccc513ce3c34e03bec8dc233dc2d6cd96ec5abf1..b93d14dc36dbce615e41a8c2863d0b783b2cab95 100644 --- a/test/src/main/java/org/jvnet/hudson/test/recipes/WithTimeout.java +++ b/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. diff --git a/test/src/test/java/hudson/ClassicPluginStrategyTest.java b/test/src/test/java/hudson/ClassicPluginStrategyTest.java index aba40066a28f01859e96019ae95905741a8365bd..a0cfe146dea108efc99fe33baee6f34f2000badc 100644 --- a/test/src/test/java/hudson/ClassicPluginStrategyTest.java +++ b/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; diff --git a/test/src/test/java/hudson/cli/CreateViewCommandTest.java b/test/src/test/java/hudson/cli/CreateViewCommandTest.java index bb0ff91e8346e22abf5cd324638fa87181b20081..5ed9af5f6a2c16dd5c7a7298784f620220fbd9be 100644 --- a/test/src/test/java/hudson/cli/CreateViewCommandTest.java +++ b/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; diff --git a/test/src/test/java/hudson/cli/GetNodeCommandTest.java b/test/src/test/java/hudson/cli/GetNodeCommandTest.java index b80b4fb1f35bfafe4c6d7721f02be29d0c990ec1..e6d2c8ac084dd1741c89c23b2386dacffd396fc1 100644 --- a/test/src/test/java/hudson/cli/GetNodeCommandTest.java +++ b/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; diff --git a/test/src/test/java/hudson/cli/ReloadJobCommandTest.java b/test/src/test/java/hudson/cli/ReloadJobCommandTest.java index 257a0c2b8033cfe73e87e1667b4e5df256eba0d1..ff99a88e958408e0d48042770fa8ad61ee6d28e8 100644 --- a/test/src/test/java/hudson/cli/ReloadJobCommandTest.java +++ b/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; diff --git a/test/src/test/java/hudson/cli/UpdateViewCommandTest.java b/test/src/test/java/hudson/cli/UpdateViewCommandTest.java index 299367f31ba5404d89c057b2562c2a5ba57bd805..937c2e7bac3f8926cc7c3b8f70712f669521cf03 100644 --- a/test/src/test/java/hudson/cli/UpdateViewCommandTest.java +++ b/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; diff --git a/test/src/test/java/hudson/console/ExceptionAnnotationTest.java b/test/src/test/java/hudson/console/ExceptionAnnotationTest.java index 0c757f2afd6bbcaf562edd74effce83b51fadc3a..3ec7bd0e17f4dfedceab8d99bb05d39c7c08317b 100644 --- a/test/src/test/java/hudson/console/ExceptionAnnotationTest.java +++ b/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 diff --git a/test/src/test/java/hudson/console/UrlAnnotatorTest.java b/test/src/test/java/hudson/console/UrlAnnotatorTest.java index 35f4d059ebb53cc1ab0de462ec56c48e1f68c06f..ea743df6a97995b2067db4bf726b23b112943277 100644 --- a/test/src/test/java/hudson/console/UrlAnnotatorTest.java +++ b/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 diff --git a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java index 30f279f090553af9e0b625538216e6466fb38a91..b67f0e0371324fe85188e1f7a72531d80e7927e7 100644 --- a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java +++ b/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 { diff --git a/test/src/test/java/hudson/logging/LogRecorderManagerTest.java b/test/src/test/java/hudson/logging/LogRecorderManagerTest.java index 0a7e215dbef63c334c99292a435968ac05cd0f48..8d203c2b729d305384515c844f5cb3aa2c919028 100644 --- a/test/src/test/java/hudson/logging/LogRecorderManagerTest.java +++ b/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; diff --git a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java b/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java index 30677a1535078e24f8cf33abe6ead5818c04567d..dec8e9d7663cd60564f1b47ec7c0e3e043b38750 100644 --- a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java +++ b/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; diff --git a/test/src/test/java/hudson/model/DirectlyModifiableViewTest.java b/test/src/test/java/hudson/model/DirectlyModifiableViewTest.java index 459862efa623c3c824252764c68ed989b3aee9ae..ae8df8002c36620d660e6322c2a69d6c31ccee98 100644 --- a/test/src/test/java/hudson/model/DirectlyModifiableViewTest.java +++ b/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; diff --git a/test/src/test/java/hudson/model/FreestyleJobPublisherTest.java b/test/src/test/java/hudson/model/FreestyleJobPublisherTest.java index d7a5799e94c2f64ba6ae3cd9eabfa1faa6715a3a..72f8432b238cbc8a6a16627983200fa5ccb8e8aa 100644 --- a/test/src/test/java/hudson/model/FreestyleJobPublisherTest.java +++ b/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; /** diff --git a/test/src/test/java/hudson/model/GetEnvironmentOutsideBuildTest.java b/test/src/test/java/hudson/model/GetEnvironmentOutsideBuildTest.java index 1096f1b867dc50b2a610d761de37df15e2a7f68f..969aa71339bc695ef38e1ebf28fd2ae6343eacc4 100644 --- a/test/src/test/java/hudson/model/GetEnvironmentOutsideBuildTest.java +++ b/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; diff --git a/test/src/test/java/hudson/model/ItemGroupMixInTest.java b/test/src/test/java/hudson/model/ItemGroupMixInTest.java index 0eb876d9257bfb82c2fbae8325195bf37d7d5ffc..33a325764b061d005d3911322a1263a7f8280d97 100644 --- a/test/src/test/java/hudson/model/ItemGroupMixInTest.java +++ b/test/src/test/java/hudson/model/ItemGroupMixInTest.java @@ -44,7 +44,6 @@ import org.jvnet.hudson.test.recipes.LocalData; import java.io.File; import java.util.Collection; -import java.util.Iterator; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/test/src/test/java/hudson/model/LabelLoadStatisticsQueueLengthTest.java b/test/src/test/java/hudson/model/LabelLoadStatisticsQueueLengthTest.java index 29e61479c9b496ac056f03feb51e5ddf3765f4ef..59b1f36752256779ebd9a03cdbf77a9dce076dc3 100644 --- a/test/src/test/java/hudson/model/LabelLoadStatisticsQueueLengthTest.java +++ b/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; diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java index 3cc1ebf8721c86afe08e9567f9843d3b8344b1a2..0bd2bd2db50a2002cedfc97fa46b64bac50b470e 100644 --- a/test/src/test/java/hudson/model/QueueTest.java +++ b/test/src/test/java/hudson/model/QueueTest.java @@ -91,7 +91,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.*; diff --git a/test/src/test/java/hudson/model/UserTest.java b/test/src/test/java/hudson/model/UserTest.java index a823b210984ad4e367e7e32b7f68007c1642afb6..6a92fab52488fd455385f26df55f9d5a20d56ff7 100644 --- a/test/src/test/java/hudson/model/UserTest.java +++ b/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; diff --git a/test/src/test/java/hudson/slaves/DummyCloudImpl.java b/test/src/test/java/hudson/slaves/DummyCloudImpl.java index 132c22e9eb0f295c2d14a2545ad2ad929cfaa823..95281cd9b9e9b2e00f64ca6e61e45d3b3cb7bec7 100644 --- a/test/src/test/java/hudson/slaves/DummyCloudImpl.java +++ b/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; diff --git a/test/src/test/java/hudson/tasks/FingerprinterTest.java b/test/src/test/java/hudson/tasks/FingerprinterTest.java index c1ac17d21c5d301e80439e7496f0c3d636a710cc..611bd048a8d3eca808294b08b16fa236aba7f356 100644 --- a/test/src/test/java/hudson/tasks/FingerprinterTest.java +++ b/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; diff --git a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java b/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java index 6f9ddf287cf96760f8c3457626680689c7c348d0..1bba877c8bc600c053c162e4bc037f47fd2fa3b6 100644 --- a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java +++ b/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; diff --git a/test/src/test/java/hudson/util/FormFieldValidatorTest.java b/test/src/test/java/hudson/util/FormFieldValidatorTest.java index 2bb203b0784b5a70473363c42dd34e3061a7371e..3aaabd067c2ed68b56d4132f200d353cac4393c6 100644 --- a/test/src/test/java/hudson/util/FormFieldValidatorTest.java +++ b/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; diff --git a/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java b/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java index 439fb4a33493e57570baad5143db716de46eb72f..f26496f97f7d4285de5398c3b4d462763ca355fe 100644 --- a/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java +++ b/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;