[JENKINS-44751] Shut-up Findbugs. Oh and remove unused imports.

jenkinsci · Jul 28, 2017 · 2b0e123 · 2b0e123
1 parent 3256676
commit 2b0e123
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/MergeWithGitSCMExtension.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/MergeWithGitSCMExtension.java
@@ -25,25 +25,10 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import hudson.model.Run;
-import hudson.model.TaskListener;
-import hudson.plugins.git.GitException;
-import hudson.plugins.git.GitSCM;
-import hudson.plugins.git.Revision;
-import hudson.plugins.git.extensions.GitSCMExtension;
-import hudson.plugins.git.extensions.impl.PreBuildMerge;
-import hudson.plugins.git.util.MergeRecord;
-import java.io.IOException;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.ObjectStreamException;
-import org.apache.commons.lang.StringUtils;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.jenkinsci.plugins.gitclient.CheckoutCommand;
-import org.jenkinsci.plugins.gitclient.GitClient;
-import org.jenkinsci.plugins.gitclient.MergeCommand;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
  * Retained for data migration.
@@ -52,6 +37,7 @@
  */
 @Deprecated
 @Restricted(DoNotUse.class)
+@SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS")
 public class MergeWithGitSCMExtension extends jenkins.plugins.git.MergeWithGitSCMExtension {
 
     MergeWithGitSCMExtension(@NonNull String baseName, @CheckForNull String baseHash) {