[JENKINS-73471] Bump git to 5.5.0 pending BOM update

jenkinsci · Sep 18, 2024 · 26ccca2 · 26ccca2
1 parent 1c371fd
commit 26ccca2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,6 +68,12 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <!-- TODO: remove when in bom -->
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>git</artifactId>
+        <version>5.5.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>

diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/GitClientAuthenticatorExtension.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/GitClientAuthenticatorExtension.java
@@ -1,12 +1,9 @@
 package com.cloudbees.jenkins.plugins.bitbucket;
 
 import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
-import hudson.model.Run;
-import hudson.model.TaskListener;
 import hudson.plugins.git.GitException;
 import hudson.plugins.git.GitSCM;
 import hudson.plugins.git.extensions.GitSCMExtension;
-import java.io.IOException;
 import org.jenkinsci.plugins.gitclient.GitClient;
 
 public class GitClientAuthenticatorExtension extends GitSCMExtension {
@@ -26,12 +23,4 @@ public GitClient decorate(GitSCM scm, GitClient git) throws GitException {
         return git;
     }
 
-    @Override
-    public void beforeCheckout(GitSCM scm, Run<?, ?> build, GitClient git, TaskListener listener)
-        throws IOException, InterruptedException, GitException {
-        // TODO: remove if/when https://issues.jenkins.io/browse/JENKINS-73677 is eventually fixed
-        if (credentials != null) {
-            git.setCredentials(credentials);
-        }
-    }
 }