Use SSHD 2.16.0

This removes the need for shipping a custom GitPackCommand as
apache/mina-sshd#793 is fixed there.

Force JGit 5 to use newer SSHD too.

Author: kwin

maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml

@@ -31,11 +31,6 @@
   <name>Maven SCM Git Provider TCK Tests</name>
   <description>Tests library for SCM Git Provider.</description>
 
-  <properties>
-    <!-- newer versions clash with Sshd dependencies from JGit 5.x-->
-    <minaSshdVersion>2.11.0</minaSshdVersion>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>

maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitSshServer.java

@@ -31,11 +31,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.maven.scm.provider.git.sshd.git.pack.GitPackCommandFactory;
 import org.apache.sshd.common.config.keys.KeyUtils;
 import org.apache.sshd.common.config.keys.writer.openssh.OpenSSHKeyEncryptionContext;
 import org.apache.sshd.common.config.keys.writer.openssh.OpenSSHKeyPairResourceWriter;
 import org.apache.sshd.git.GitLocationResolver;
+import org.apache.sshd.git.pack.GitPackCommandFactory;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.auth.pubkey.KeySetPublickeyAuthenticator;
 import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
@@ -132,7 +132,6 @@ public Path resolveRootDirectory(String command, String[] args, ServerSession se
                 return repositoryRoot;
             }
         };
-        // use patched version of GitPackCommandFactory including https://github.com/apache/mina-sshd/pull/794
         sshServer.setCommandFactory(new GitPackCommandFactory(gitLocationResolver));
         sshServer.start();
     }

maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/GitPackCommand.java

@@ -35,6 +35,22 @@
     <!-- version 6+ requires Java 11 -->
     <jgitVersion>5.13.3.202401111512-r</jgitVersion>
   </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- upgrade SSHD used in JGit to newer version for being compatible with ITs -->
+      <dependency>
+        <groupId>org.apache.sshd</groupId>
+        <artifactId>sshd-sftp</artifactId>
+        <version>${minaSshdVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.sshd</groupId>
+        <artifactId>sshd-osgi</artifactId>
+        <version>${minaSshdVersion}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>javax.inject</groupId>

maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/GitPackCommandFactory.java

@@ -39,6 +39,10 @@
     <module>maven-scm-provider-jgit</module>
   </modules>
 
+  <properties>
+    <minaSshdVersion>2.16.0</minaSshdVersion>
+  </properties>
+
   <profiles>
     <profile>
       <id>tck-git</id>