Merge pull request #751 from res0nance/cleanup

MarkEWaite · web-flow · commit 744900523397 · 2019-12-20T11:07:26.000-07:00
Cleanup some deprecated code and TODOs
diff --git a/src/main/java/hudson/plugins/git/GitChangeSet.java b/src/main/java/hudson/plugins/git/GitChangeSet.java
@@ -1,6 +1,7 @@
 package hudson.plugins.git;
 
 import hudson.MarkupText;
+import hudson.Plugin;
 import hudson.model.User;
 import hudson.plugins.git.GitSCM.DescriptorImpl;
 import hudson.scm.ChangeLogAnnotator;
@@ -18,6 +19,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -409,13 +411,13 @@ public User findOrCreateUser(String csAuthor, String csAuthorEmail, boolean crea
                 // Avoid exception from User.get("", false)
                 return User.getUnknown();
             }
-            user = User.get(csAuthorEmail, false);
+            user = User.get(csAuthorEmail, false, Collections.emptyMap());
 
             if (user == null) {
                 try {
-                    user = User.get(csAuthorEmail, !useExistingAccountWithSameEmail);
+                    user = User.get(csAuthorEmail, !useExistingAccountWithSameEmail, Collections.emptyMap());
                     boolean setUserDetails = true;
-                    if (user == null && useExistingAccountWithSameEmail && hasHudsonTasksMailer()) {
+                    if (user == null && useExistingAccountWithSameEmail && hasMailerPlugin()) {
                         for(User existingUser : User.getAll()) {
                             if (csAuthorEmail.equalsIgnoreCase(getMail(existingUser))) {
                                 user = existingUser;
@@ -425,11 +427,11 @@ public User findOrCreateUser(String csAuthor, String csAuthorEmail, boolean crea
                         }
                     }
                     if (user == null) {
-                        user = User.get(csAuthorEmail, true);
+                        user = User.get(csAuthorEmail, true, Collections.emptyMap());
                     }
                     if (setUserDetails) {
                         user.setFullName(csAuthor);
-                        if (hasHudsonTasksMailer())
+                        if (hasMailerPlugin())
                             setMail(user, csAuthorEmail);
                         user.save();
                     }
@@ -442,7 +444,7 @@ public User findOrCreateUser(String csAuthor, String csAuthorEmail, boolean crea
                 // Avoid exception from User.get("", false)
                 return User.getUnknown();
             }
-            user = User.get(csAuthor, false);
+            user = User.get(csAuthor, false, Collections.emptyMap());
 
             if (user == null) {
                 if (csAuthorEmail == null || csAuthorEmail.isEmpty()) {
@@ -452,14 +454,14 @@ public User findOrCreateUser(String csAuthor, String csAuthorEmail, boolean crea
                 // don't mess us up.
                 String[] emailParts = csAuthorEmail.split("@");
                 if (emailParts.length > 0) {
-                    user = User.get(emailParts[0], true);
+                    user = User.get(emailParts[0], true, Collections.emptyMap());
                 } else {
                     return User.getUnknown();
                 }
             }
         }
         // set email address for user if none is already available
-        if (fixEmpty(csAuthorEmail) != null && hasHudsonTasksMailer() && !hasMail(user)) {
+        if (fixEmpty(csAuthorEmail) != null && hasMailerPlugin() && !hasMail(user)) {
             try {
                 setMail(user, csAuthorEmail);
             } catch (IOException e) {
@@ -489,14 +491,12 @@ private boolean hasMail(User user) {
         return email != null;
     }
 
-    private boolean hasHudsonTasksMailer() {
-        // TODO convert to checking for mailer plugin as plugin migrates to 1.509+
-        try {
-            Class.forName("hudson.tasks.Mailer");
-            return true;
-        } catch (ClassNotFoundException e) {
-            return false;
+    private boolean hasMailerPlugin() {
+        Plugin p = Jenkins.get().getPlugin("mailer");
+        if (p != null) {
+            return p.getWrapper().isActive();
         }
+        return false;
     }
 
     private boolean isCreateAccountBasedOnEmail() {
diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -1312,13 +1312,11 @@ private void computeChangeLog(GitClient git, Revision revToBuild, TaskListener l
         }
     }
 
-    // TODO: 2.60+ Delete this override.
-    @Override
     public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {
         buildEnvironment(build, env);
     }
 
-    // TODO: 2.60+ Switch to @Override
+    @Override
     public void buildEnvironment(Run<?, ?> build, java.util.Map<String, String> env) {
         Revision rev = fixNull(getBuildData(build)).getLastBuiltRevision();
         if (rev!=null) {
diff --git a/src/main/java/hudson/plugins/git/GitTagAction.java b/src/main/java/hudson/plugins/git/GitTagAction.java
@@ -191,7 +191,7 @@ public final class TagWorkerThread extends TaskThread {
         private final String comment;
 
         public TagWorkerThread(Map<String, String> tagSet,String comment) {
-            super(GitTagAction.this, ListenerAndText.forMemory());
+            super(GitTagAction.this, ListenerAndText.forMemory(null));
             this.tagSet = tagSet;
             this.comment = comment;
         }
diff --git a/src/main/java/hudson/plugins/git/SubmoduleCombinator.java b/src/main/java/hudson/plugins/git/SubmoduleCombinator.java
@@ -108,7 +108,7 @@ public void createSubmoduleCombinations() throws GitException, IOException, Inte
                 if (min == 1) break; // look no further
             }
       
-            git.checkout(sha1.name());
+            git.checkout().ref(sha1.name()).execute();
             makeCombination(combination);
         }
     
diff --git a/src/main/java/hudson/plugins/git/extensions/impl/PreBuildMerge.java b/src/main/java/hudson/plugins/git/extensions/impl/PreBuildMerge.java
@@ -91,7 +91,7 @@ public Revision decorateRevisionToBuild(GitSCM scm, Run<?, ?> build, GitClient g
 
             // Track whether we're trying to add a duplicate BuildData, now that it's been updated with
             // revision info for this build etc. The default assumption is that it's a duplicate.
-            BuildData buildData = scm.getBuildData(build, true);
+            BuildData buildData = scm.copyBuildData(build);
             boolean buildDataAlreadyPresent = false;
             List<BuildData> actions = build.getActions(BuildData.class);
             for (BuildData d: actions)  {
diff --git a/src/main/java/hudson/plugins/git/extensions/impl/PruneStaleBranch.java b/src/main/java/hudson/plugins/git/extensions/impl/PruneStaleBranch.java
@@ -28,7 +28,7 @@ public PruneStaleBranch() {
     @Override
     public void decorateFetchCommand(GitSCM scm, GitClient git, TaskListener listener, FetchCommand cmd) throws IOException, InterruptedException, GitException {
         listener.getLogger().println("Pruning obsolete local branches");
-        cmd.prune();
+        cmd.prune(true);
     }
 
     /**
diff --git a/src/main/java/jenkins/plugins/git/GitSCMFileSystem.java b/src/main/java/jenkins/plugins/git/GitSCMFileSystem.java
@@ -342,7 +342,7 @@ public SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, @CheckForNull
                         headName = branchSpec.getName();
                     }
                 }
-                client.fetch_().prune().from(remoteURI, Arrays
+                client.fetch_().prune(true).from(remoteURI, Arrays
                         .asList(new RefSpec(
                                 "+" + Constants.R_HEADS + headName + ":" + Constants.R_REMOTES + remoteName + "/"
                                         + headName))).execute();
@@ -388,7 +388,7 @@ public SCMFileSystem build(@NonNull SCMSource source, @NonNull SCMHead head, @Ch
                 } catch (URISyntaxException ex) {
                     listener.getLogger().println("URI syntax exception for '" + remoteName + "' " + ex);
                 }
-                client.fetch_().prune().from(remoteURI, builder.asRefSpecs()).execute();
+                client.fetch_().prune(true).from(remoteURI, builder.asRefSpecs()).execute();
                 listener.getLogger().println("Done.");
                 return new GitSCMFileSystem(client, gitSCMSource.getRemote(), Constants.R_REMOTES+remoteName+"/"+head.getName(),
                         (AbstractGitSCMSource.SCMRevisionImpl) rev);
diff --git a/src/main/java/jenkins/plugins/git/GitSCMSource.java b/src/main/java/jenkins/plugins/git/GitSCMSource.java
@@ -92,8 +92,6 @@
 import jenkins.scm.impl.trait.Discovery;
 import jenkins.scm.impl.trait.Selection;
 import jenkins.scm.impl.trait.WildcardSCMHeadFilterTrait;
-import org.acegisecurity.context.SecurityContext;
-import org.acegisecurity.context.SecurityContextHolder;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.URIish;
diff --git a/src/test/java/hudson/plugins/git/CredentialsUserRemoteConfigTest.java b/src/test/java/hudson/plugins/git/CredentialsUserRemoteConfigTest.java
@@ -57,7 +57,7 @@ public void checkoutWithValidCredentials() throws Exception {
                         + "    [$class: 'GitSCM', \n"
                         + "      userRemoteConfigs: [[credentialsId: 'github', url: $/" + sampleRepo + "/$]]]\n"
                         + "  )"
-                        + "}"));
+                        + "}", true));
         WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
         r.assertLogContains("using credential github", b);
     }
@@ -76,7 +76,7 @@ public void checkoutWithDifferentCredentials() throws Exception {
                         + "    [$class: 'GitSCM', \n"
                         + "      userRemoteConfigs: [[credentialsId: 'github', url: $/" + sampleRepo + "/$]]]\n"
                         + "  )"
-                        + "}"));
+                        + "}", true));
         WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
         r.assertLogContains("Warning: CredentialId \"github\" could not be found", b);
     }
@@ -95,7 +95,7 @@ public void checkoutWithInvalidCredentials() throws Exception {
                         + "    [$class: 'GitSCM', \n"
                         + "      userRemoteConfigs: [[credentialsId: 'github', url: $/" + sampleRepo + "/$]]]\n"
                         + "  )"
-                        + "}"));
+                        + "}", true));
         WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
         r.assertLogContains("Warning: CredentialId \"github\" could not be found", b);
     }
@@ -112,7 +112,7 @@ public void checkoutWithNoCredentialsStoredButUsed() throws Exception {
                         + "    [$class: 'GitSCM', \n"
                         + "      userRemoteConfigs: [[credentialsId: 'github', url: $/" + sampleRepo + "/$]]]\n"
                         + "  )"
-                        + "}"));
+                        + "}", true));
         WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
         r.assertLogContains("Warning: CredentialId \"github\" could not be found", b);
     }
@@ -129,7 +129,7 @@ public void checkoutWithNoCredentialsSpecified() throws Exception {
                         + "    [$class: 'GitSCM', \n"
                         + "      userRemoteConfigs: [[url: $/" + sampleRepo + "/$]]]\n"
                         + "  )"
-                        + "}"));
+                        + "}", true));
         WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
         r.assertLogContains("No credentials specified", b);
     }
diff --git a/src/test/java/hudson/plugins/git/GitChangeSetBadArgsTest.java b/src/test/java/hudson/plugins/git/GitChangeSetBadArgsTest.java
@@ -52,73 +52,73 @@ private GitChangeSet createCommitterChangeSet(String committerName, String commi
     public void testFindOrCreateUserAuthorBadEmail() {
         String authorName = "Bad Author Test 1";
         GitChangeSet changeSet = createAuthorChangeSet(authorName, DEGENERATE_EMAIL_ADDRESS);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, DEGENERATE_EMAIL_ADDRESS, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, DEGENERATE_EMAIL_ADDRESS, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", DEGENERATE_EMAIL_ADDRESS, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, DEGENERATE_EMAIL_ADDRESS, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, DEGENERATE_EMAIL_ADDRESS, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", DEGENERATE_EMAIL_ADDRESS, false, false));
     }
 
     @Test
     public void testFindOrCreateUserCommitterBadEmail() {
         String committerName = "Bad Committer Test 2";
         GitChangeSet changeSet = createCommitterChangeSet(committerName, DEGENERATE_EMAIL_ADDRESS);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, DEGENERATE_EMAIL_ADDRESS, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, DEGENERATE_EMAIL_ADDRESS, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", DEGENERATE_EMAIL_ADDRESS, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, DEGENERATE_EMAIL_ADDRESS, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, DEGENERATE_EMAIL_ADDRESS, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", DEGENERATE_EMAIL_ADDRESS, false, false));
     }
 
     @Test
     public void testFindOrCreateUserEmptyAuthor() {
         String emptyAuthorName = "";
         String incompleteAuthorEmail = "@test3.example.com";
         GitChangeSet changeSet = createAuthorChangeSet(emptyAuthorName, incompleteAuthorEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(emptyAuthorName, incompleteAuthorEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, incompleteAuthorEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", incompleteAuthorEmail, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(emptyAuthorName, incompleteAuthorEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, incompleteAuthorEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", incompleteAuthorEmail, false, false));
     }
 
     @Test
     public void testFindOrCreateEmptyCommitter() {
         String emptyCommitterName = "";
         String incompleteCommitterEmail = "@test4.example.com";
         GitChangeSet changeSet = createCommitterChangeSet(emptyCommitterName, incompleteCommitterEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(emptyCommitterName, incompleteCommitterEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, incompleteCommitterEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", incompleteCommitterEmail, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(emptyCommitterName, incompleteCommitterEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, incompleteCommitterEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", incompleteCommitterEmail, false, false));
     }
 
     @Test
     public void testFindOrCreateUserEmptyAuthorEmail() {
         String authorName = "Author Test 5";
         String emptyAuthorEmail = "";
         GitChangeSet changeSet = createAuthorChangeSet(authorName, emptyAuthorEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, emptyAuthorEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, emptyAuthorEmail, true));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, emptyAuthorEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, emptyAuthorEmail, true, false));
     }
 
     @Test
     public void testFindOrCreateUserNullAuthorEmail() {
         String authorName = "Author Test 6";
         String emptyAuthorEmail = "";
         GitChangeSet changeSet = createAuthorChangeSet(authorName, emptyAuthorEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, null, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, null, true));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, null, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, null, true, false));
     }
 
     @Test
     public void testFindOrCreateUserEmptyCommitterEmail() {
         String committerName = "Committer Test 7";
         String emptyCommitterEmail = "";
         GitChangeSet changeSet = createCommitterChangeSet(committerName, emptyCommitterEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, emptyCommitterEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, emptyCommitterEmail, true));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, emptyCommitterEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, emptyCommitterEmail, true, false));
     }
 
     @Test
     public void testFindOrCreateUserNullCommitterEmail() {
         String committerName = "Committer Test 8";
         String emptyCommitterEmail = "";
         GitChangeSet changeSet = createCommitterChangeSet(committerName, emptyCommitterEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, null, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, null, true));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, null, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, null, true, false));
     }
 }
diff --git a/src/test/java/hudson/plugins/git/MultipleSCMTest.java b/src/test/java/hudson/plugins/git/MultipleSCMTest.java
@@ -52,28 +52,28 @@ public class MultipleSCMTest {
         repo0.commit("repo0-init", repo0.johnDoe, "repo0 initial commit");
 
         assertTrue("scm polling should detect a change after initial commit",
-                project.pollSCMChanges(listener));
+                project.poll(listener).hasChanges());
 
         repo1.commit("repo1-init", repo1.janeDoe, "repo1 initial commit");
 
 		build(project, Result.SUCCESS);
 		
 		assertFalse("scm polling should not detect any more changes after build", 
-				project.pollSCMChanges(listener));
+				project.poll(listener).hasChanges());
 
         repo1.commit("repo1-1", repo1.johnDoe, "repo1 commit 1");
 
         build(project, Result.SUCCESS);
 
         assertFalse("scm polling should not detect any more changes after build",
-                project.pollSCMChanges(listener));
+                project.poll(listener).hasChanges());
 
         repo0.commit("repo0-1", repo0.janeDoe, "repo0 commit 1");
 
         build(project, Result.SUCCESS);
 
         assertFalse("scm polling should not detect any more changes after build",
-                project.pollSCMChanges(listener));
+                project.poll(listener).hasChanges());
 	}
 	
 	private FreeStyleProject setupBasicProject(String name) throws IOException
@@ -113,7 +113,7 @@ private FreeStyleProject setupBasicProject(String name) throws IOException
 	
 	private FreeStyleBuild build(final FreeStyleProject project, 
 			final Result expectedResult) throws Exception {
-		final FreeStyleBuild build = project.scheduleBuild2(0, new Cause.UserCause()).get();
+		final FreeStyleBuild build = project.scheduleBuild2(0, new Cause.UserIdCause()).get();
 		if(expectedResult != null) {
 			r.assertBuildStatus(expectedResult, build);
 		}
diff --git a/src/test/java/hudson/plugins/git/SCMTriggerTest.java b/src/test/java/hudson/plugins/git/SCMTriggerTest.java
@@ -12,7 +12,6 @@
 import hudson.util.StreamTaskListener;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/src/test/java/hudson/plugins/git/extensions/GitSCMExtensionTest.java b/src/test/java/hudson/plugins/git/extensions/GitSCMExtensionTest.java
@@ -49,7 +49,7 @@ public void setUp() throws Exception {
 	protected abstract GitSCMExtension getExtension();
 
 	protected FreeStyleBuild build(final FreeStyleProject project, final Result expectedResult) throws Exception {
-		final FreeStyleBuild build = project.scheduleBuild2(0, new Cause.UserCause()).get();
+		final FreeStyleBuild build = project.scheduleBuild2(0, new Cause.UserIdCause()).get();
 		if(expectedResult != null) {
 			j.assertBuildStatus(expectedResult, build);
 		}
diff --git a/src/test/java/hudson/plugins/git/extensions/impl/CheckoutOptionWorkflowTest.java b/src/test/java/hudson/plugins/git/extensions/impl/CheckoutOptionWorkflowTest.java
@@ -25,7 +25,7 @@ public void checkoutTimeout() throws Exception {
                 + "    [$class: 'GitSCM', extensions: [[$class: 'CheckoutOption', timeout: 1234]],\n"
                 + "      userRemoteConfigs: [[url: $/" + sampleRepo + "/$]]]\n"
                 + "  )"
-                + "}"));
+                + "}", true));
         WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
         r.assertLogContains("# timeout=1234", b);
     }
diff --git a/src/test/java/hudson/plugins/git/extensions/impl/MessageExclusionTest.java b/src/test/java/hudson/plugins/git/extensions/impl/MessageExclusionTest.java
@@ -4,7 +4,6 @@
 import hudson.plugins.git.TestGitRepo;
 import hudson.plugins.git.extensions.GitSCMExtension;
 import hudson.plugins.git.extensions.GitSCMExtensionTest;
-import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/hudson/plugins/git/extensions/impl/PathRestrictionTest.java b/src/test/java/hudson/plugins/git/extensions/impl/PathRestrictionTest.java
diff --git a/src/test/java/hudson/plugins/git/extensions/impl/PreBuildMergeTest.java b/src/test/java/hudson/plugins/git/extensions/impl/PreBuildMergeTest.java
diff --git a/src/test/java/jenkins/plugins/git/AbstractGitSCMSourceTest.java b/src/test/java/jenkins/plugins/git/AbstractGitSCMSourceTest.java
diff --git a/src/test/java/jenkins/plugins/git/GitSCMSourceTest.java b/src/test/java/jenkins/plugins/git/GitSCMSourceTest.java
diff --git a/src/test/java/jenkins/plugins/git/GitStepTest.java b/src/test/java/jenkins/plugins/git/GitStepTest.java

Original file line number	Diff line number	Diff line change
`@@ -1312,13 +1312,11 @@ private void computeChangeLog(GitClient git, Revision revToBuild, TaskListener l`
`1312`	`1312`	`}`
`1313`	`1313`	`}`
`1314`	`1314`
`1315`		`- // TODO: 2.60+ Delete this override.`
`1316`		`- @Override`
`1317`	`1315`	`public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {`
`1318`	`1316`	`buildEnvironment(build, env);`
`1319`	`1317`	`}`
`1320`	`1318`
`1321`		`- // TODO: 2.60+ Switch to @Override`
	`1319`	`+ @Override`
`1322`	`1320`	`public void buildEnvironment(Run<?, ?> build, java.util.Map<String, String> env) {`
`1323`	`1321`	`Revision rev = fixNull(getBuildData(build)).getLastBuiltRevision();`
`1324`	`1322`	`if (rev!=null) {`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public final class TagWorkerThread extends TaskThread {`
`191`	`191`	`private final String comment;`
`192`	`192`
`193`	`193`	`public TagWorkerThread(Map<String, String> tagSet,String comment) {`
`194`		`- super(GitTagAction.this, ListenerAndText.forMemory());`
	`194`	`+ super(GitTagAction.this, ListenerAndText.forMemory(null));`
`195`	`195`	`this.tagSet = tagSet;`
`196`	`196`	`this.comment = comment;`
`197`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public void createSubmoduleCombinations() throws GitException, IOException, Inte`
`108`	`108`	`if (min == 1) break; // look no further`
`109`	`109`	`}`
`110`	`110`
`111`		`- git.checkout(sha1.name());`
	`111`	`+ git.checkout().ref(sha1.name()).execute();`
`112`	`112`	`makeCombination(combination);`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public PruneStaleBranch() {`
`28`	`28`	`@Override`
`29`	`29`	`public void decorateFetchCommand(GitSCM scm, GitClient git, TaskListener listener, FetchCommand cmd) throws IOException, InterruptedException, GitException {`
`30`	`30`	`listener.getLogger().println("Pruning obsolete local branches");`
`31`		`- cmd.prune();`
	`31`	`+ cmd.prune(true);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, @CheckForNull`
`342`	`342`	`headName = branchSpec.getName();`
`343`	`343`	`}`
`344`	`344`	`}`
`345`		`- client.fetch_().prune().from(remoteURI, Arrays`
	`345`	`+ client.fetch_().prune(true).from(remoteURI, Arrays`
`346`	`346`	`.asList(new RefSpec(`
`347`	`347`	`"+" + Constants.R_HEADS + headName + ":" + Constants.R_REMOTES + remoteName + "/"`
`348`	`348`	`+ headName))).execute();`
`@@ -388,7 +388,7 @@ public SCMFileSystem build(@NonNull SCMSource source, @NonNull SCMHead head, @Ch`
`388`	`388`	`} catch (URISyntaxException ex) {`
`389`	`389`	`listener.getLogger().println("URI syntax exception for '" + remoteName + "' " + ex);`
`390`	`390`	`}`
`391`		`- client.fetch_().prune().from(remoteURI, builder.asRefSpecs()).execute();`
	`391`	`+ client.fetch_().prune(true).from(remoteURI, builder.asRefSpecs()).execute();`
`392`	`392`	`listener.getLogger().println("Done.");`
`393`	`393`	`return new GitSCMFileSystem(client, gitSCMSource.getRemote(), Constants.R_REMOTES+remoteName+"/"+head.getName(),`
`394`	`394`	`(AbstractGitSCMSource.SCMRevisionImpl) rev);`