Permalink
Browse files

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

  • Loading branch information...
stephenc committed Jul 28, 2017
1 parent ed08e75 commit 527d1b853bd8083983ddbbe1dce07a200a5e936e
Showing with 2 additions and 16 deletions.
  1. +2 −16 src/main/java/org/jenkinsci/plugin/gitea/MergeWithGitSCMExtension.java
@@ -25,32 +25,18 @@
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.
* @deprecated use {@link jenkins.plugins.git.MergeWithGitSCMExtension}
*/
@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) {

0 comments on commit 527d1b8

Please sign in to comment.