From: Thomas Wolf <twolf@apache.org>
Date: Sat, 21 Oct 2023 13:15:34 +0000 (+0200)
Subject: SSH: bump org.apache.sshd to 2.11.0
X-Git-Tag: v6.8.0.202311212206-rc1~1^2~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F205088%2F2;p=jgit.git

SSH: bump org.apache.sshd to 2.11.0

Update maven build, bazel build, and target platform.

Also remove a file in a ./bin directory that got committed by mistake
in commit f5f4bf0ad.

Change-Id: Ia653c71643f8fad290874d723dacdafbef25c13f
Signed-off-by: Thomas Wolf <twolf@apache.org>
---

diff --git a/WORKSPACE b/WORKSPACE
index 5698c83833..c067134eaf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -90,18 +90,18 @@ maven_jar(
     sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850",
 )
 
-SSHD_VERS = "2.10.0"
+SSHD_VERS = "2.11.0"
 
 maven_jar(
     name = "sshd-osgi",
     artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
-    sha1 = "03677ac1da780b7bdb682da50b762d79ea0d940d",
+    sha1 = "7ec6b14ab789fc4b1ce9fdcd0e13d22b5c940e7b",
 )
 
 maven_jar(
     name = "sshd-sftp",
     artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
-    sha1 = "88707339ac0693d48df0ec1bafb84c78d792ed08",
+    sha1 = "3a293bba303c486a9ff6be8e11c9c68fd56b63c7",
 )
 
 maven_jar(
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index e89faf9192..ecade70527 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
@@ -8,31 +8,31 @@ Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.apache.sshd.common;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.file.virtualfs;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.helpers;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.io;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.keyprovider;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.signature;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.buffer;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.logging;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.security;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.threads;version="[2.10.0,2.11.0)",
- org.apache.sshd.core;version="[2.10.0,2.11.0)",
- org.apache.sshd.server;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth.gss;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth.keyboard;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth.password;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.command;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.shell;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.subsystem;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp.server;version="[2.10.0,2.11.0)",
+Import-Package: org.apache.sshd.common;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.file.virtualfs;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.helpers;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.io;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.keyprovider;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.signature;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.buffer;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.logging;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.security;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.threads;version="[2.11.0,2.12.0)",
+ org.apache.sshd.core;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth.gss;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth.keyboard;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth.password;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.command;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.shell;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.subsystem;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp.server;version="[2.11.0,2.12.0)",
  org.eclipse.jgit.annotations;version="[6.8.0,6.9.0)",
  org.eclipse.jgit.api;version="[6.8.0,6.9.0)",
  org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)",
diff --git 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
index fb0baa659f..57eff3092c 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.17" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index e2939ff99a..37c41a7805 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.18" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index 4e1916ad1c..07253dccc0 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.19-staging" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index 1ffa01420c..44d813ab28 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.20" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index 0603842cb2..a09064b3f5 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.21" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index f3e10bccf8..0fc04415a2 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.22" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index 162eeff649..6dddaf0973 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.23" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index b0c996d0b4..0854888c53 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.24" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index 260c50c3e8..517943c35f 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.25" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index 8abc1f1a38..d3f83ad0c9 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.26" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index 6c8b1c0416..565b916f21 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.27" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index bde048c0f3..db399c1f4f 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.28" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index d180721ed5..e149d5c456 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.29" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index c567787975..f4309afc43 100644
--- 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 @@
 <?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="1699482561">
+<target name="jgit-4.30" sequenceNumber="1700080695">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-osgi</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.10.0</version>
+    		<version>2.11.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
index b5c3b1ae48..c19ac0544e 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
@@ -223,12 +223,12 @@ maven sshd
 	dependency {
 		groupId = "org.apache.sshd"
 		artifactId = "sshd-osgi"
-		version = "2.10.0"
+		version = "2.11.0"
 	}
 	dependency {
 		groupId = "org.apache.sshd"
 		artifactId = "sshd-sftp"
-		version = "2.10.0"
+		version = "2.11.0"
 	}
 }
 
diff --git a/org.eclipse.jgit.ssh.apache.agent/bin/.project b/org.eclipse.jgit.ssh.apache.agent/bin/.project
deleted file mode 100644
index 73358f4a6b..0000000000
--- a/org.eclipse.jgit.ssh.apache.agent/bin/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jgit.ssh.apache.agent</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index 340cb246e3..7f08043a29 100644
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@ -8,20 +8,20 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
-Import-Package: org.apache.sshd.client.config.hosts;version="[2.10.0,2.11.0)",
- org.apache.sshd.common;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.helpers;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.keyprovider;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.signature;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.net;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.security;version="[2.10.0,2.11.0)",
- org.apache.sshd.core;version="[2.10.0,2.11.0)",
- org.apache.sshd.server;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.forward;version="[2.10.0,2.11.0)",
+Import-Package: org.apache.sshd.client.config.hosts;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.helpers;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.keyprovider;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.signature;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.net;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.security;version="[2.11.0,2.12.0)",
+ org.apache.sshd.core;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.forward;version="[2.11.0,2.12.0)",
  org.eclipse.jgit.api;version="[6.8.0,6.9.0)",
  org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)",
  org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.8.0,6.9.0)",
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 4316e31a9e..2cdf600080 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@ -37,57 +37,57 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.8.0";x-inter
  org.eclipse.jgit.transport.sshd.agent;version="6.8.0",
  sun.security.x509
 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
- org.apache.sshd.agent;version="[2.10.0,2.11.0)",
- org.apache.sshd.client;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.auth.keyboard;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.auth.password;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.auth.pubkey;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.channel;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.config.hosts;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.config.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.future;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.keyverifier;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.session.forward;version="[2.10.0,2.11.0)",
- org.apache.sshd.common;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.channel;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.compression;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys.loader;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys.u2f;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.digest;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.forward;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.future;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.helpers;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.io;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex.extension;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex.extension.parser;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.keyprovider;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.mac;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.random;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.session.helpers;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.signature;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.buffer;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.buffer.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.closeable;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.io;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.io.der;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.io.functors;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.io.resource;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.logging;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.net;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.security;version="[2.10.0,2.11.0)",
- org.apache.sshd.core;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp.client;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp.common;version="[2.10.0,2.11.0)",
+ org.apache.sshd.agent;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.auth.keyboard;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.auth.password;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.auth.pubkey;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.channel;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.config.hosts;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.config.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.future;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.keyverifier;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.session.forward;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.channel;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.compression;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys.loader;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys.u2f;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.digest;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.forward;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.future;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.helpers;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.io;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex.extension;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex.extension.parser;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.keyprovider;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.mac;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.random;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.session.helpers;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.signature;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.buffer;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.buffer.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.closeable;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.io;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.io.der;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.io.functors;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.io.resource;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.logging;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.net;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.security;version="[2.11.0,2.12.0)",
+ org.apache.sshd.core;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp.client;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp.common;version="[2.11.0,2.12.0)",
  org.eclipse.jgit.annotations;version="[6.8.0,6.9.0)",
  org.eclipse.jgit.errors;version="[6.8.0,6.9.0)",
  org.eclipse.jgit.fnmatch;version="[6.8.0,6.9.0)",
diff --git a/pom.xml b/pom.xml
index c38bdbf8ae..291db6e6ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
 
     <jgit-last-release-version>6.7.0.202309050840-r</jgit-last-release-version>
     <ant-version>1.10.14</ant-version>
-    <apache-sshd-version>2.10.0</apache-sshd-version>
+    <apache-sshd-version>2.11.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>