From: Matthias Sohn <matthias.sohn@sap.com>
Date: Wed, 23 Oct 2024 20:14:54 +0000 (+0200)
Subject: Merge branch 'stable-6.10' into stable-7.0
X-Git-Tag: v7.1.0.202410232130-m2~1^2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F1202351%2F1;p=jgit.git

Merge branch 'stable-6.10' into stable-7.0

* stable-6.10:
  Update Apache sshd to 2.14.0
  LfsConnectionFactoryTest: remove unnecessary cast
  JSchSshProtocol2Test: remove unnecessary cast
  ApacheSshProtocol2Test: remove unnecessary cast
  NoteMapMerger: remove unnecessary cast

Change-Id: I8fca74d88efadc827955b0a5032e6fbd72ce3e0d
---

f306a8a99c2c9aadbbd5b3153caae3d4ef4ba252
diff --cc org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index 0e8091396d,a46383870f..50628337f6
--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
@@@ -7,41 -7,41 +7,41 @@@ Bundle-Version: 7.0.1.qualifie
  Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
  Bundle-ActivationPolicy: lazy
 -Bundle-RequiredExecutionEnvironment: JavaSE-11
 +Bundle-RequiredExecutionEnvironment: JavaSE-17
- Import-Package: org.apache.sshd.common;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.file.virtualfs;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.io;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.kex;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.session;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.signature;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.buffer;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.logging;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.threads;version="[2.13.2,2.14.0)",
-  org.apache.sshd.core;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.auth;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.auth.gss;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.auth.keyboard;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.auth.password;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.command;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.session;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.shell;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.subsystem;version="[2.13.2,2.14.0)",
-  org.apache.sshd.sftp;version="[2.13.2,2.14.0)",
-  org.apache.sshd.sftp.server;version="[2.13.2,2.14.0)",
+ Import-Package: org.apache.sshd.common;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.file.virtualfs;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.io;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.kex;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.session;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.signature;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.threads;version="[2.14.0,2.15.0)",
+  org.apache.sshd.core;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.auth;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.auth.gss;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.auth.keyboard;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.auth.password;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.command;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.session;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.shell;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.subsystem;version="[2.14.0,2.15.0)",
+  org.apache.sshd.sftp;version="[2.14.0,2.15.0)",
+  org.apache.sshd.sftp.server;version="[2.14.0,2.15.0)",
 - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.api;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.util;version="[6.10.1,6.11.0)",
 + org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.api;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.1,7.1.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.experimental.theories;version="[4.13,5.0.0)",
   org.slf4j;version="[1.7.0,3.0.0)"
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
index e996aebab1,8b4cb40836..2376132383
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.17" sequenceNumber="1724850720">
 -<target name="jgit-4.17" sequenceNumber="1728511224">
++<target name="jgit-4.17" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
index cd4f935941,79f5200c33..b779b0fff0
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.18" sequenceNumber="1724850721">
 -<target name="jgit-4.18" sequenceNumber="1728511225">
++<target name="jgit-4.18" sequenceNumber="1729714539">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
index 01e8071026,7eca94891f..1e729ab234
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.19-staging" sequenceNumber="1724850720">
 -<target name="jgit-4.19-staging" sequenceNumber="1728511224">
++<target name="jgit-4.19-staging" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
index 7dbb163db0,453b635041..1e5270b2cc
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.20" sequenceNumber="1724850720">
 -<target name="jgit-4.20" sequenceNumber="1728511225">
++<target name="jgit-4.20" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
index 985fee0dee,0e92133e60..a17d0587f4
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.21" sequenceNumber="1724850720">
 -<target name="jgit-4.21" sequenceNumber="1728511224">
++<target name="jgit-4.21" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target
index afd61cf717,2b3071c0ee..9023178d40
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.22" sequenceNumber="1724850719">
 -<target name="jgit-4.22" sequenceNumber="1728511224">
++<target name="jgit-4.22" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target
index 0309d2f844,4cd69ada22..8e4fcc272f
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.23" sequenceNumber="1724850719">
 -<target name="jgit-4.23" sequenceNumber="1728511224">
++<target name="jgit-4.23" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target
index 0ed6d80ca9,9b54c0c960..f7b956b809
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.24" sequenceNumber="1724850719">
 -<target name="jgit-4.24" sequenceNumber="1728511224">
++<target name="jgit-4.24" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target
index b081af4a10,8b072cbdda..76426ebe16
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.25" sequenceNumber="1724850719">
 -<target name="jgit-4.25" sequenceNumber="1728511224">
++<target name="jgit-4.25" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target
index 5874693f6b,1c056a6f2b..512ce57727
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.26" sequenceNumber="1724850719">
 -<target name="jgit-4.26" sequenceNumber="1728511224">
++<target name="jgit-4.26" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target
index e192b624b3,66bc3145e1..ff9c4734a3
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.27" sequenceNumber="1724850719">
 -<target name="jgit-4.27" sequenceNumber="1728511224">
++<target name="jgit-4.27" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target
index 3875520cb4,4a59b0657a..5af352f96e
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.28" sequenceNumber="1724850719">
 -<target name="jgit-4.28" sequenceNumber="1728511224">
++<target name="jgit-4.28" sequenceNumber="1729714537">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target
index 01ae4ac550,3d2a578bfb..fcf42e4318
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.29" sequenceNumber="1724850719">
 -<target name="jgit-4.29" sequenceNumber="1728511224">
++<target name="jgit-4.29" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target
index 1651587a13,ddad08e693..e43e06ce37
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.30" sequenceNumber="1724850719">
 -<target name="jgit-4.30" sequenceNumber="1728511223">
++<target name="jgit-4.30" sequenceNumber="1729714537">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target
index 9141303103,17babd84b6..feff8504f2
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.31" sequenceNumber="1724850719">
 -<target name="jgit-4.31" sequenceNumber="1728511224">
++<target name="jgit-4.31" sequenceNumber="1729714538">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target
index 26524a9aa2,b25472597a..c1964c94a7
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.32" sequenceNumber="1724850719">
 -<target name="jgit-4.32" sequenceNumber="1728511223">
++<target name="jgit-4.32" sequenceNumber="1729714537">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target
index 8591802f38,0000000000..4d9f630cd5
mode 100644,000000..100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target
@@@ -1,290 -1,0 +1,290 @@@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<?pde?>
 +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.33" sequenceNumber="1724850720">
++<target name="jgit-4.33" sequenceNumber="1729714538">
 +  <locations>
 +    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 +      <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
 +      <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
 +      <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
 +      <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
 +      <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
 +      <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
 +      <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
 +      <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
 +      <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
 +      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
 +      <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
 +      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/>
 +      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
 +      <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/>
 +      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
 +      <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/>
 +      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
 +      <unit id="org.junit.source" version="4.13.2.v20230809-1000"/>
 +      <unit id="org.objenesis" version="3.4.0"/>
 +      <unit id="org.objenesis.source" version="3.4.0"/>
 +      <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
 +      <unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
 +      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 +      <unit id="org.eclipse.osgi" version="0.0.0"/>
 +      <repository location="https://download.eclipse.org/staging/2024-09/"/>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz">
 +      <dependencies>
 +        <dependency>
 +          <groupId>org.tukaani</groupId>
 +          <artifactId>xz</artifactId>
 +          <version>1.10</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j">
 +      <dependencies>
 +        <dependency>
 +          <groupId>org.slf4j</groupId>
 +          <artifactId>slf4j-api</artifactId>
 +          <version>1.7.36</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.slf4j</groupId>
 +          <artifactId>slf4j-simple</artifactId>
 +          <version>1.7.36</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd">
 +      <dependencies>
 +        <dependency>
 +          <groupId>org.apache.sshd</groupId>
 +          <artifactId>sshd-osgi</artifactId>
-           <version>2.13.2</version>
++          <version>2.14.0</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.apache.sshd</groupId>
 +          <artifactId>sshd-sftp</artifactId>
-           <version>2.13.2</version>
++          <version>2.14.0</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito">
 +      <dependencies>
 +        <dependency>
 +          <groupId>org.mockito</groupId>
 +          <artifactId>mockito-core</artifactId>
 +          <version>5.12.0</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna">
 +      <dependencies>
 +        <dependency>
 +          <groupId>net.java.dev.jna</groupId>
 +          <artifactId>jna</artifactId>
 +          <version>5.14.0</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>net.java.dev.jna</groupId>
 +          <artifactId>jna-platform</artifactId>
 +          <version>5.14.0</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty">
 +      <dependencies>
 +        <dependency>
 +          <groupId>org.eclipse.jetty.ee10</groupId>
 +          <artifactId>jetty-ee10-servlet</artifactId>
 +          <version>12.0.10</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.eclipse.jetty</groupId>
 +          <artifactId>jetty-http</artifactId>
 +          <version>12.0.12</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.eclipse.jetty</groupId>
 +          <artifactId>jetty-io</artifactId>
 +          <version>12.0.12</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.eclipse.jetty</groupId>
 +          <artifactId>jetty-security</artifactId>
 +          <version>12.0.12</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.eclipse.jetty</groupId>
 +          <artifactId>jetty-server</artifactId>
 +          <version>12.0.12</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.eclipse.jetty</groupId>
 +          <artifactId>jetty-session</artifactId>
 +          <version>12.0.12</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.eclipse.jetty</groupId>
 +          <artifactId>jetty-util</artifactId>
 +          <version>12.0.12</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.eclipse.jetty</groupId>
 +          <artifactId>jetty-util-ajax</artifactId>
 +          <version>12.0.12</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>jakarta.servlet</groupId>
 +          <artifactId>jakarta.servlet-api</artifactId>
 +          <version>6.1.0</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah">
 +      <dependencies>
 +        <dependency>
 +          <groupId>com.googlecode.javaewah</groupId>
 +          <artifactId>JavaEWAH</artifactId>
 +          <version>1.2.3</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="hamcrest">
 +      <dependencies>
 +        <dependency>
 +          <groupId>org.hamcrest</groupId>
 +          <artifactId>hamcrest</artifactId>
 +          <version>2.2</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="gson">
 +      <dependencies>
 +        <dependency>
 +          <groupId>com.google.code.gson</groupId>
 +          <artifactId>gson</artifactId>
 +          <version>2.11.0</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy">
 +      <dependencies>
 +        <dependency>
 +          <groupId>net.bytebuddy</groupId>
 +          <artifactId>byte-buddy</artifactId>
 +          <version>1.15.0</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>net.bytebuddy</groupId>
 +          <artifactId>byte-buddy-agent</artifactId>
 +          <version>1.15.0</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle">
 +      <dependencies>
 +        <dependency>
 +          <groupId>org.bouncycastle</groupId>
 +          <artifactId>bcpg-jdk18on</artifactId>
 +          <version>1.78.1</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.bouncycastle</groupId>
 +          <artifactId>bcprov-jdk18on</artifactId>
 +          <version>1.78.1</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.bouncycastle</groupId>
 +          <artifactId>bcpkix-jdk18on</artifactId>
 +          <version>1.78.1</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.bouncycastle</groupId>
 +          <artifactId>bcutil-jdk18on</artifactId>
 +          <version>1.78.1</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="assertj">
 +      <dependencies>
 +        <dependency>
 +          <groupId>org.assertj</groupId>
 +          <artifactId>assertj-core</artifactId>
 +          <version>3.26.3</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="args4j">
 +      <dependencies>
 +        <dependency>
 +          <groupId>args4j</groupId>
 +          <artifactId>args4j</artifactId>
 +          <version>2.37</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
 +      <dependencies>
 +        <dependency>
 +          <groupId>commons-codec</groupId>
 +          <artifactId>commons-codec</artifactId>
 +          <version>1.17.1</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.apache.commons</groupId>
 +          <artifactId>commons-compress</artifactId>
 +          <version>1.27.1</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.apache.commons</groupId>
 +          <artifactId>commons-lang3</artifactId>
 +          <version>3.16.0</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>commons-io</groupId>
 +          <artifactId>commons-io</artifactId>
 +          <version>2.16.1</version>
 +          <type>jar</type>
 +        </dependency>
 +        <dependency>
 +          <groupId>commons-logging</groupId>
 +          <artifactId>commons-logging</artifactId>
 +          <version>1.3.4</version>
 +          <type>jar</type>
 +        </dependency>
 +      </dependencies>
 +    </location>
 +  </locations>
 +</target>
diff --cc org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index d9b0e1b901,6f2af63fc6..6a2ac379f6
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@@ -3,35 -3,36 +3,35 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test
  Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test
 -Bundle-Version: 6.10.1.qualifier
 +Bundle-Version: 7.0.1.qualifier
  Bundle-Vendor: %Bundle-Vendor
  Bundle-Localization: plugin
 -Bundle-RequiredExecutionEnvironment: JavaSE-11
 +Bundle-RequiredExecutionEnvironment: JavaSE-17
  Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
- Import-Package: org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.auth;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.kex;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.session;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.signature;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.net;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)",
-  org.apache.sshd.core;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.forward;version="[2.13.2,2.14.0)",
+ Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.auth;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.kex;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.session;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.signature;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)",
+  org.apache.sshd.core;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.forward;version="[2.14.0,2.15.0)",
 - org.eclipse.jgit.api;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.junit.ssh;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport.sshd;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport.sshd.agent;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.util;version="[6.10.1,6.11.0)",
 + org.eclipse.jgit.api;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.junit.ssh;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport.sshd.agent;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.1,7.1.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.experimental.theories;version="[4.13,5.0.0)",
   org.junit.runner;version="[4.13,5.0.0)"
diff --cc org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 4ddb3ad7f0,e9d88455c7..b2266ba0dd
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@@ -34,67 -34,67 +34,67 @@@ Export-Package: org.eclipse.jgit.intern
     org.eclipse.jgit.util,
     org.apache.sshd.client.session,
     org.apache.sshd.client.keyverifier",
 - org.eclipse.jgit.transport.sshd.agent;version="6.10.1",
 + org.eclipse.jgit.transport.sshd.agent;version="7.0.1",
   sun.security.x509
  Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
-  org.apache.sshd.agent;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.auth;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.auth.keyboard;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.auth.password;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.auth.pubkey;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.channel;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.config.keys;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.future;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.keyverifier;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.session;version="[2.13.2,2.14.0)",
-  org.apache.sshd.client.session.forward;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.auth;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.channel;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.cipher;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.compression;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.config.keys.loader;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.config.keys.u2f;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.digest;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.forward;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.future;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.io;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.kex;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.kex.extension;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.kex.extension.parser;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.mac;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.random;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.session;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.session.helpers;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.signature;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.buffer;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.buffer.keys;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.closeable;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.io;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.io.der;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.io.functors;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.io.resource;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.logging;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.net;version="[2.13.2,2.14.0)",
-  org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)",
-  org.apache.sshd.core;version="[2.13.2,2.14.0)",
-  org.apache.sshd.server.auth;version="[2.13.2,2.14.0)",
-  org.apache.sshd.sftp;version="[2.13.2,2.14.0)",
-  org.apache.sshd.sftp.client;version="[2.13.2,2.14.0)",
-  org.apache.sshd.sftp.common;version="[2.13.2,2.14.0)",
+  org.apache.sshd.agent;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.auth;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.auth.keyboard;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.auth.password;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.auth.pubkey;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.channel;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.config.keys;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.future;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.keyverifier;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.session;version="[2.14.0,2.15.0)",
+  org.apache.sshd.client.session.forward;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.auth;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.channel;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.cipher;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.compression;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.config.keys.loader;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.config.keys.u2f;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.digest;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.forward;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.future;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.io;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.kex;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.kex.extension;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.kex.extension.parser;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.mac;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.random;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.session;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.session.helpers;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.signature;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.buffer.keys;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.closeable;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.io;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.io.der;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.io.functors;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.io.resource;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)",
+  org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)",
+  org.apache.sshd.core;version="[2.14.0,2.15.0)",
+  org.apache.sshd.server.auth;version="[2.14.0,2.15.0)",
+  org.apache.sshd.sftp;version="[2.14.0,2.15.0)",
+  org.apache.sshd.sftp.client;version="[2.14.0,2.15.0)",
+  org.apache.sshd.sftp.common;version="[2.14.0,2.15.0)",
 - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.fnmatch;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.internal.transport.ssh;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.util;version="[6.10.1,6.11.0)",
 + org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.fnmatch;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.1,7.1.0)",
   org.slf4j;version="[1.7.0,3.0.0)"
diff --cc pom.xml
index 960df03570,4c9159b95d..e215883029
--- a/pom.xml
+++ b/pom.xml
@@@ -118,9 -118,9 +118,9 @@@
  
      <project.build.outputTimestamp>${commit.time.iso}</project.build.outputTimestamp>
  
 -    <jgit-last-release-version>6.9.0.202403050737-r</jgit-last-release-version>
 +    <jgit-last-release-version>6.10.0.202406032230-r</jgit-last-release-version>
      <ant-version>1.10.14</ant-version>
-     <apache-sshd-version>2.13.2</apache-sshd-version>
+     <apache-sshd-version>2.14.0</apache-sshd-version>
      <jsch-version>0.1.55</jsch-version>
      <jzlib-version>1.1.3</jzlib-version>
      <javaewah-version>1.2.3</javaewah-version>