diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 9dda49e0cd..3ce68f3487 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -125,7 +125,6 @@ import java.net.URL; import java.net.URLClassLoader; import java.net.URLConnection; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index cde7c9b6f5..8866bf6769 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -61,7 +61,6 @@ import java.net.URL; import java.nio.file.Files; import java.nio.file.InvalidPathException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; diff --git a/core/src/main/java/hudson/cli/BuildCommand.java b/core/src/main/java/hudson/cli/BuildCommand.java index 42611e90fb..dc6917b596 100644 --- a/core/src/main/java/hudson/cli/BuildCommand.java +++ b/core/src/main/java/hudson/cli/BuildCommand.java @@ -49,7 +49,6 @@ import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.Option; -import java.util.Collections; import java.util.Map; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java index b3480b7029..ece1d3fd18 100644 --- a/core/src/main/java/hudson/model/Fingerprint.java +++ b/core/src/main/java/hudson/model/Fingerprint.java @@ -46,7 +46,6 @@ import hudson.util.XStream2; import jenkins.fingerprints.FileFingerprintStorage; import jenkins.fingerprints.FingerprintStorage; -import jenkins.fingerprints.GlobalFingerprintConfiguration; import jenkins.model.FingerprintFacet; import jenkins.model.Jenkins; import jenkins.model.TransientFingerprintFacetFactory; diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java index d2865ef9dc..a92dce8a97 100644 --- a/core/src/main/java/hudson/model/Label.java +++ b/core/src/main/java/hudson/model/Label.java @@ -64,7 +64,6 @@ import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.Stack; import java.util.TreeSet; import java.util.stream.Collectors; import java.util.stream.StreamSupport; diff --git a/core/src/main/java/hudson/model/LoadBalancer.java b/core/src/main/java/hudson/model/LoadBalancer.java index 22a4b4097c..bd1d0b7c63 100644 --- a/core/src/main/java/hudson/model/LoadBalancer.java +++ b/core/src/main/java/hudson/model/LoadBalancer.java @@ -31,7 +31,6 @@ import hudson.model.queue.MappingWorksheet; import hudson.model.queue.MappingWorksheet.ExecutorChunk; import hudson.model.queue.MappingWorksheet.Mapping; import hudson.util.ConsistentHash; -import hudson.util.ConsistentHash.Hash; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java index 524f6bd331..3f017caee2 100644 --- a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java +++ b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java @@ -29,7 +29,6 @@ import hudson.FilePath; import hudson.Functions; import jenkins.util.SystemProperties; import hudson.Util; -import hudson.slaves.WorkspaceList; import java.io.IOException; import java.util.ArrayList; import java.util.Date; diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java index e7bd30cc27..412f51ba1d 100644 --- a/core/src/main/java/hudson/util/ProcessTree.java +++ b/core/src/main/java/hudson/util/ProcessTree.java @@ -48,7 +48,6 @@ import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.File; -import java.io.FileFilter; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/hudson/util/RingBufferLogHandler.java b/core/src/main/java/hudson/util/RingBufferLogHandler.java index 0e0b88f77b..159cf61e0a 100644 --- a/core/src/main/java/hudson/util/RingBufferLogHandler.java +++ b/core/src/main/java/hudson/util/RingBufferLogHandler.java @@ -23,9 +23,6 @@ */ package hudson.util; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.util.AbstractList; import java.util.List; import java.util.logging.Handler; diff --git a/core/src/main/java/jenkins/model/IdStrategy.java b/core/src/main/java/jenkins/model/IdStrategy.java index dafa0700a6..2352f6c53e 100644 --- a/core/src/main/java/jenkins/model/IdStrategy.java +++ b/core/src/main/java/jenkins/model/IdStrategy.java @@ -27,7 +27,6 @@ import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; -import hudson.util.CaseInsensitiveComparator; import org.apache.commons.lang.StringUtils; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; diff --git a/core/src/main/java/jenkins/security/s2m/MasterKillSwitchWarning.java b/core/src/main/java/jenkins/security/s2m/MasterKillSwitchWarning.java index 75d2b0ad3e..e2042beab8 100644 --- a/core/src/main/java/jenkins/security/s2m/MasterKillSwitchWarning.java +++ b/core/src/main/java/jenkins/security/s2m/MasterKillSwitchWarning.java @@ -2,7 +2,6 @@ package jenkins.security.s2m; import hudson.Extension; import hudson.model.AdministrativeMonitor; -import org.apache.tools.ant.taskdefs.condition.IsSet; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.QueryParameter; diff --git a/core/src/main/java/jenkins/slaves/systemInfo/SlaveSystemInfo.java b/core/src/main/java/jenkins/slaves/systemInfo/SlaveSystemInfo.java index 69e32120bc..fb3ac639dc 100644 --- a/core/src/main/java/jenkins/slaves/systemInfo/SlaveSystemInfo.java +++ b/core/src/main/java/jenkins/slaves/systemInfo/SlaveSystemInfo.java @@ -3,9 +3,7 @@ package jenkins.slaves.systemInfo; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Computer; -import hudson.model.ManageJenkinsAction; import hudson.security.Permission; -import jenkins.model.Jenkins; /** * Extension point that contributes to the system information page of {@link Computer}. diff --git a/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java b/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java index 06383e134a..f05fcf72be 100644 --- a/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java +++ b/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java @@ -31,7 +31,6 @@ import org.jaxen.XPathFunctionContext; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Locale; diff --git a/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java b/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java index db619d69cc..7bd62fc814 100644 --- a/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java +++ b/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java @@ -26,7 +26,6 @@ package org.acegisecurity.context; import hudson.model.User; import hudson.security.ACL; -import org.acegisecurity.Authentication; /** * @deprecated Use {@link ACL#as(User)} or {@link org.springframework.security.core.context.SecurityContext}. diff --git a/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java index 4edb89d8b0..ad56d529c0 100644 --- a/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java +++ b/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java @@ -24,7 +24,6 @@ package org.acegisecurity.providers; -import hudson.security.ACL; import org.acegisecurity.Authentication; import org.acegisecurity.GrantedAuthority; import org.acegisecurity.userdetails.UserDetails; diff --git a/core/src/main/java/org/jenkins/ui/icon/IconType.java b/core/src/main/java/org/jenkins/ui/icon/IconType.java index 99f68c2696..9837902c0b 100644 --- a/core/src/main/java/org/jenkins/ui/icon/IconType.java +++ b/core/src/main/java/org/jenkins/ui/icon/IconType.java @@ -24,7 +24,6 @@ package org.jenkins.ui.icon; import org.apache.commons.jelly.JellyContext; -import org.kohsuke.stapler.Stapler; /** * Icon type. diff --git a/core/src/main/java/org/springframework/dao/DataAccessException.java b/core/src/main/java/org/springframework/dao/DataAccessException.java index d3220ff361..c1ad8e62ab 100644 --- a/core/src/main/java/org/springframework/dao/DataAccessException.java +++ b/core/src/main/java/org/springframework/dao/DataAccessException.java @@ -26,7 +26,6 @@ package org.springframework.dao; import hudson.security.UserMayOrMayNotExistException2; import org.springframework.core.NestedRuntimeException; -import org.springframework.security.core.userdetails.UsernameNotFoundException; /** * @deprecated no replacement diff --git a/core/src/test/java/hudson/model/FingerprintTest.java b/core/src/test/java/hudson/model/FingerprintTest.java index 368339b64c..47a553acea 100644 --- a/core/src/test/java/hudson/model/FingerprintTest.java +++ b/core/src/test/java/hudson/model/FingerprintTest.java @@ -23,12 +23,10 @@ */ package hudson.model; -import hudson.Util; import hudson.model.Fingerprint.RangeSet; import java.io.File; import jenkins.fingerprints.FileFingerprintStorage; -import jenkins.model.FingerprintFacet; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/core/src/test/java/hudson/slaves/CloudProvisioningListenerTest.java b/core/src/test/java/hudson/slaves/CloudProvisioningListenerTest.java index 641706f887..c4b95ecc44 100644 --- a/core/src/test/java/hudson/slaves/CloudProvisioningListenerTest.java +++ b/core/src/test/java/hudson/slaves/CloudProvisioningListenerTest.java @@ -4,9 +4,7 @@ import hudson.model.Messages; import hudson.model.queue.CauseOfBlockage; import org.junit.Test; import org.jvnet.hudson.test.Issue; -import org.jvnet.localizer.Localizable; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/core/src/test/java/hudson/util/XStream2Test.java b/core/src/test/java/hudson/util/XStream2Test.java index e32f5d3e26..e6d7253486 100644 --- a/core/src/test/java/hudson/util/XStream2Test.java +++ b/core/src/test/java/hudson/util/XStream2Test.java @@ -36,7 +36,6 @@ import com.google.common.collect.ImmutableMap; import com.thoughtworks.xstream.XStreamException; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.mapper.CannotResolveClassException; -import com.thoughtworks.xstream.security.ForbiddenClassException; import hudson.model.Result; import hudson.model.Run; import java.io.StringReader; diff --git a/test/src/test/java/hudson/PluginTest.java b/test/src/test/java/hudson/PluginTest.java index f73a550a54..f90aab2ab9 100644 --- a/test/src/test/java/hudson/PluginTest.java +++ b/test/src/test/java/hudson/PluginTest.java @@ -27,7 +27,6 @@ package hudson; import hudson.model.UpdateCenter; import jenkins.model.Jenkins; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.Future; diff --git a/test/src/test/java/hudson/cli/RunRangeCommandTest.java b/test/src/test/java/hudson/cli/RunRangeCommandTest.java index e4cb7fc0c7..3fb55eea7e 100644 --- a/test/src/test/java/hudson/cli/RunRangeCommandTest.java +++ b/test/src/test/java/hudson/cli/RunRangeCommandTest.java @@ -34,7 +34,6 @@ import org.junit.ClassRule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.io.IOException; import java.util.List; import static hudson.cli.CLICommandInvoker.Matcher.failedWith; diff --git a/test/src/test/java/hudson/diagnosis/TooManyJobsButNoViewTest.java b/test/src/test/java/hudson/diagnosis/TooManyJobsButNoViewTest.java index dff96e1ec8..076a719d4a 100644 --- a/test/src/test/java/hudson/diagnosis/TooManyJobsButNoViewTest.java +++ b/test/src/test/java/hudson/diagnosis/TooManyJobsButNoViewTest.java @@ -13,7 +13,6 @@ import java.net.URL; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertNotNull; diff --git a/test/src/test/java/hudson/init/InitMilestoneTest.java b/test/src/test/java/hudson/init/InitMilestoneTest.java index 97088a4ebd..073502f1f5 100644 --- a/test/src/test/java/hudson/init/InitMilestoneTest.java +++ b/test/src/test/java/hudson/init/InitMilestoneTest.java @@ -1,6 +1,5 @@ package hudson.init; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/model/AbstractProjectTest.java b/test/src/test/java/hudson/model/AbstractProjectTest.java index 4688970eb3..a2ee086ee5 100644 --- a/test/src/test/java/hudson/model/AbstractProjectTest.java +++ b/test/src/test/java/hudson/model/AbstractProjectTest.java @@ -55,7 +55,6 @@ import hudson.util.OneShotEvent; import hudson.util.StreamTaskListener; import java.io.OutputStream; -import java.lang.reflect.Array; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; diff --git a/test/src/test/java/hudson/model/ComputerTest.java b/test/src/test/java/hudson/model/ComputerTest.java index d6cb0e84a3..e4280ff56b 100644 --- a/test/src/test/java/hudson/model/ComputerTest.java +++ b/test/src/test/java/hudson/model/ComputerTest.java @@ -39,7 +39,6 @@ import java.io.File; import java.net.HttpURLConnection; import java.nio.charset.StandardCharsets; -import hudson.model.labels.LabelAtom; import jenkins.model.Jenkins; import hudson.slaves.DumbSlave; import hudson.slaves.OfflineCause; diff --git a/test/src/test/java/hudson/model/FingerprintTest.java b/test/src/test/java/hudson/model/FingerprintTest.java index 869ef32b2e..eedcc9f8c2 100644 --- a/test/src/test/java/hudson/model/FingerprintTest.java +++ b/test/src/test/java/hudson/model/FingerprintTest.java @@ -36,7 +36,6 @@ import hudson.tasks.Fingerprinter; import java.io.File; import java.io.IOException; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/test/src/test/java/hudson/model/ItemGroupMixInTest.java b/test/src/test/java/hudson/model/ItemGroupMixInTest.java index 419bb88a01..3e44222c7b 100644 --- a/test/src/test/java/hudson/model/ItemGroupMixInTest.java +++ b/test/src/test/java/hudson/model/ItemGroupMixInTest.java @@ -38,7 +38,6 @@ import org.apache.commons.io.FileUtils; import java.io.ByteArrayInputStream; import java.io.IOException; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/test/src/test/java/hudson/model/UpdateSiteTest.java b/test/src/test/java/hudson/model/UpdateSiteTest.java index 9fbae8a7ae..a5b94b21d0 100644 --- a/test/src/test/java/hudson/model/UpdateSiteTest.java +++ b/test/src/test/java/hudson/model/UpdateSiteTest.java @@ -25,7 +25,6 @@ package hudson.model; import hudson.PluginWrapper; -import hudson.PluginWrapper.Dependency; import hudson.model.UpdateSite.Data; import hudson.util.FormValidation; import hudson.util.PersistedList; diff --git a/test/src/test/java/hudson/model/UserTest.java b/test/src/test/java/hudson/model/UserTest.java index 850aac07cc..c46a730535 100644 --- a/test/src/test/java/hudson/model/UserTest.java +++ b/test/src/test/java/hudson/model/UserTest.java @@ -80,7 +80,6 @@ import org.jvnet.hudson.test.recipes.LocalData; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; diff --git a/test/src/test/java/hudson/model/queue/LoadPredictorTest.java b/test/src/test/java/hudson/model/queue/LoadPredictorTest.java index ae4ddf5d3b..399a066abd 100644 --- a/test/src/test/java/hudson/model/queue/LoadPredictorTest.java +++ b/test/src/test/java/hudson/model/queue/LoadPredictorTest.java @@ -23,13 +23,11 @@ */ package hudson.model.queue; -import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import hudson.model.Action; import hudson.model.Computer; import hudson.model.Executor; import hudson.model.Node; diff --git a/test/src/test/java/hudson/security/SecurityRealmTest.java b/test/src/test/java/hudson/security/SecurityRealmTest.java index 73d38a1950..7e9a66c07a 100644 --- a/test/src/test/java/hudson/security/SecurityRealmTest.java +++ b/test/src/test/java/hudson/security/SecurityRealmTest.java @@ -42,7 +42,6 @@ import java.util.Collections; import java.util.Date; import java.util.Random; import jenkins.model.Jenkins; -import org.acegisecurity.Authentication; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; diff --git a/test/src/test/java/hudson/security/WhoAmITest.java b/test/src/test/java/hudson/security/WhoAmITest.java index b2087d085b..4fec99a95f 100644 --- a/test/src/test/java/hudson/security/WhoAmITest.java +++ b/test/src/test/java/hudson/security/WhoAmITest.java @@ -29,7 +29,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.User; import jenkins.model.Jenkins; import jenkins.security.ApiTokenProperty; -import jenkins.security.apitoken.ApiTokenStore; import jenkins.security.apitoken.TokenUuidAndPlainValue; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerSEC1704Test.java b/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerSEC1704Test.java index 35fa9ae30f..769370bedf 100644 --- a/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerSEC1704Test.java +++ b/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerSEC1704Test.java @@ -6,24 +6,15 @@ package hudson.security.csrf; -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.WebResponse; -import com.gargoylesoftware.htmlunit.html.DomElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import hudson.model.FreeStyleProject; -import hudson.model.User; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.JenkinsRule.WebClient; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; /** * diff --git a/test/src/test/java/hudson/tasks/BuildTriggerTest.java b/test/src/test/java/hudson/tasks/BuildTriggerTest.java index ee1f393228..17e76f1ea3 100644 --- a/test/src/test/java/hudson/tasks/BuildTriggerTest.java +++ b/test/src/test/java/hudson/tasks/BuildTriggerTest.java @@ -85,9 +85,6 @@ import org.jvnet.hudson.test.TestBuilder; import org.jvnet.hudson.test.MockBuilder; import org.jvnet.hudson.test.MockQueueItemAuthenticator; import org.jvnet.hudson.test.ToolInstallations; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.core.context.SecurityContextHolder; import org.xml.sax.SAXException; public class BuildTriggerTest { diff --git a/test/src/test/java/hudson/tasks/CommandInterpreterTest.java b/test/src/test/java/hudson/tasks/CommandInterpreterTest.java index 1e90ddc07b..72263544a7 100644 --- a/test/src/test/java/hudson/tasks/CommandInterpreterTest.java +++ b/test/src/test/java/hudson/tasks/CommandInterpreterTest.java @@ -3,7 +3,6 @@ package hudson.tasks; import hudson.FilePath; import hudson.model.AbstractProject; import hudson.model.FreeStyleProject; -import org.hamcrest.MatcherAssert; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/tools/InstallerTranslatorTest.java b/test/src/test/java/hudson/tools/InstallerTranslatorTest.java index e6df77e970..25cbef83f9 100644 --- a/test/src/test/java/hudson/tools/InstallerTranslatorTest.java +++ b/test/src/test/java/hudson/tools/InstallerTranslatorTest.java @@ -31,7 +31,6 @@ import hudson.model.JDK; import hudson.model.Node; import hudson.slaves.DumbSlave; import hudson.slaves.JNLPLauncher; -import hudson.slaves.NodeProperty; import hudson.slaves.RetentionStrategy; import hudson.tasks.BatchFile; import hudson.tasks.Shell; diff --git a/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java b/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java index 67aef2f7b5..3885d1e103 100644 --- a/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java +++ b/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java @@ -51,7 +51,6 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/test/src/test/java/hudson/views/StatusFilterTest.java b/test/src/test/java/hudson/views/StatusFilterTest.java index 8a13a67b19..b5c4859be2 100644 --- a/test/src/test/java/hudson/views/StatusFilterTest.java +++ b/test/src/test/java/hudson/views/StatusFilterTest.java @@ -1,7 +1,6 @@ package hudson.views; import hudson.model.FreeStyleProject; -import hudson.model.ListView; import hudson.model.TopLevelItem; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/jenkins/ExtensionFilterTest.java b/test/src/test/java/jenkins/ExtensionFilterTest.java index 227add1324..d5cb126c29 100644 --- a/test/src/test/java/jenkins/ExtensionFilterTest.java +++ b/test/src/test/java/jenkins/ExtensionFilterTest.java @@ -8,7 +8,6 @@ import hudson.ExtensionComponent; import hudson.console.ConsoleAnnotatorFactory; import hudson.model.PageDecorator; import jenkins.install.SetupWizard; -import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/jenkins/install/InstallStateTest.java b/test/src/test/java/jenkins/install/InstallStateTest.java index da33779dd1..c3920019a2 100644 --- a/test/src/test/java/jenkins/install/InstallStateTest.java +++ b/test/src/test/java/jenkins/install/InstallStateTest.java @@ -29,7 +29,6 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/test/src/test/java/jenkins/model/JenkinsManagePermissionTest.java b/test/src/test/java/jenkins/model/JenkinsManagePermissionTest.java index 5405564076..cd8a490896 100644 --- a/test/src/test/java/jenkins/model/JenkinsManagePermissionTest.java +++ b/test/src/test/java/jenkins/model/JenkinsManagePermissionTest.java @@ -20,7 +20,6 @@ import org.jvnet.hudson.test.recipes.WithPlugin; import hudson.PluginWrapper; import hudson.cli.CLICommandInvoker; import hudson.cli.DisablePluginCommand; -import hudson.lifecycle.RestartNotSupportedException; import hudson.model.Descriptor; import hudson.model.MyView; import hudson.model.User; @@ -29,23 +28,17 @@ import hudson.security.HudsonPrivateSecurityRealm; import hudson.security.ProjectMatrixAuthorizationStrategy; import hudson.tasks.Shell; -import jenkins.security.ApiTokenProperty; - import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoErrorOutput; import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static hudson.cli.CLICommandInvoker.Matcher.succeeded; /** * As Jenkins.MANAGE can be enabled on startup with jenkins.security.ManagePermission property, we need a test class diff --git a/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java b/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java index 7368140592..eee20517fe 100644 --- a/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java +++ b/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java @@ -45,7 +45,6 @@ import org.jvnet.hudson.test.JenkinsRule.WebClient; import java.util.Collection; import java.util.List; -import java.util.concurrent.Callable; import java.util.function.Predicate; import java.util.stream.Collectors; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java b/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java index 630b47651e..2124e4b2e1 100644 --- a/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java +++ b/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java @@ -48,14 +48,12 @@ import hudson.scm.ChangeLogParser; import hudson.scm.SCM; import hudson.scm.SCMRevisionState; import hudson.slaves.ComputerLauncher; -import hudson.slaves.NodeProperty; import hudson.slaves.RetentionStrategy; import hudson.slaves.SlaveComputer; import hudson.tasks.BuildWrapperDescriptor; import hudson.tasks.Maven; import hudson.tasks.Shell; import hudson.tasks.Maven.MavenInstallation; -import jenkins.model.Jenkins; import java.io.File; import java.io.IOException; diff --git a/test/src/test/java/jenkins/tasks/filters/impl/RetainVariablesLocalRuleTest.java b/test/src/test/java/jenkins/tasks/filters/impl/RetainVariablesLocalRuleTest.java index b2bc601842..912cfdc338 100644 --- a/test/src/test/java/jenkins/tasks/filters/impl/RetainVariablesLocalRuleTest.java +++ b/test/src/test/java/jenkins/tasks/filters/impl/RetainVariablesLocalRuleTest.java @@ -35,7 +35,6 @@ import hudson.model.StringParameterDefinition; import hudson.model.StringParameterValue; import hudson.tasks.BatchFile; import hudson.tasks.Shell; -import jenkins.tasks.filters.EnvVarsFilterGlobalConfiguration; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java b/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java index cedbfe591e..2815fbce50 100644 --- a/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java +++ b/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java @@ -43,7 +43,6 @@ import java.util.HashMap; import java.util.Map; import jenkins.model.Jenkins; import jenkins.security.QueueItemAuthenticatorConfiguration; -import org.acegisecurity.Authentication; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.IsNot.not; diff --git a/test/src/test/java/jenkins/widgets/HistoryPageFilterCaseSensitiveSearchTest.java b/test/src/test/java/jenkins/widgets/HistoryPageFilterCaseSensitiveSearchTest.java index 58b422e813..043475384c 100644 --- a/test/src/test/java/jenkins/widgets/HistoryPageFilterCaseSensitiveSearchTest.java +++ b/test/src/test/java/jenkins/widgets/HistoryPageFilterCaseSensitiveSearchTest.java @@ -14,7 +14,6 @@ import org.mockito.Mockito; import com.google.common.collect.ImmutableList; import hudson.model.Job; import hudson.model.ModelObject; -import hudson.model.Queue; import hudson.model.Result; import hudson.model.Run; import hudson.model.User;