Use JGit 7.3.0

pom.xml

@@ -32,15 +32,15 @@
   </scm>
 
   <properties>
-    <revision>6.1.4</revision>
+    <revision>6.2.0</revision>
     <changelist>-SNAPSHOT</changelist>
     <!-- Character set tests fail unless file.encoding is set -->
     <argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
     <jenkins.baseline>2.479</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.3</jenkins.version>
-    <jgit.version>7.0.0.202409031743-r</jgit.version>
+    <jgit.version>7.3.0.202506031305-r</jgit.version>
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Low</spotbugs.threshold>
     <spotless.check.skip>false</spotless.check.skip>
@@ -145,11 +145,6 @@
       <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
       <version>${jgit.version}</version>
       <exclusions>
-        <exclusion>
-          <!-- Prevent inclusion of transitive dependency -->
-          <groupId>net.i2p.crypto</groupId>
-          <artifactId>eddsa</artifactId>
-        </exclusion>
         <exclusion>
           <!-- Prevent inclusion of transitive dependency, OSGi not needed by git client plugin -->
           <groupId>org.apache.sshd</groupId>

src/main/java/org/jenkinsci/plugins/gitclient/AbstractGitAPIImpl.java

@@ -11,9 +11,12 @@
 import java.io.Serializable;
 import java.io.Writer;
 import java.nio.charset.Charset;
+import org.eclipse.jgit.internal.storage.file.WindowCache;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.RepositoryCache;
+import org.eclipse.jgit.storage.file.WindowCacheConfig;
 
 /**
  * Common parts between {@link JGitAPIImpl} and {@link CliGitAPIImpl}.
@@ -26,6 +29,10 @@
     public <T> T withRepository(RepositoryCallback<T> callable) throws GitException, IOException, InterruptedException {
         try (Repository repo = getRepository()) {
             return callable.invoke(repo, FilePath.localChannel);
+        } finally {
+            // TODO Avoid JGit 7.2.0 and 7.3.0 file handle leak
+            RepositoryCache.clear();
+            WindowCache.reconfigure(new WindowCacheConfig());
         }
     }
 

src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java

@@ -62,11 +62,14 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.jgit.internal.storage.file.WindowCache;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.RepositoryBuilder;
+import org.eclipse.jgit.lib.RepositoryCache;
+import org.eclipse.jgit.storage.file.WindowCacheConfig;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.RemoteConfig;
 import org.eclipse.jgit.transport.URIish;
@@ -3036,6 +3039,10 @@
             }
 
             return branches;
+        } finally {
+            // TODO Avoid JGit 7.2.0 and 7.3.0 file handle leak
+            RepositoryCache.clear();
+            WindowCache.reconfigure(new WindowCacheConfig());
         }
     }