From 18d0924a432f4654c7b4b2560d0acfedf6cea97c Mon Sep 17 00:00:00 2001
From: Thomas Wolf <twolf@apache.org>
Date: Fri, 12 Jan 2024 21:23:47 +0100
Subject: [ssh] Bump Apache MINA sshd 2.11.0 -> 2.12.0

This includes the upstream fix for CVE-2023-48795[1] ("strict KEX"
protocol extension mitigating the "Terrapin attack"[2]) in JGit.

[1] https://nvd.nist.gov/vuln/detail/CVE-2023-48795
[2] https://www.terrapin-attack.com/

Bug: jgit-16
Change-Id: Ie9aa5b903ea6795bd1511afea0bebdb537b56148
Signed-off-by: Thomas Wolf <twolf@apache.org>
---
 WORKSPACE                                          |   6 +-
 org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF    |  50 +++++-----
 .../org.eclipse.jgit.target/jgit-4.17.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.18.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.19.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.20.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.21.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.22.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.23.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.24.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.25.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.26.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.27.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.28.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.29.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.30.target       |   6 +-
 .../org.eclipse.jgit.target/jgit-4.31.target       |   6 +-
 .../org.eclipse.jgit.target/maven/dependencies.tpd |   4 +-
 .../META-INF/MANIFEST.MF                           |  28 +++---
 org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF   | 102 ++++++++++-----------
 pom.xml                                            |   2 +-
 21 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index e90833c8af..e1272fd1d9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -90,18 +90,18 @@ maven_jar(
     sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850",
 )
 
-SSHD_VERS = "2.11.0"
+SSHD_VERS = "2.12.0"
 
 maven_jar(
     name = "sshd-osgi",
     artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
-    sha1 = "7ec6b14ab789fc4b1ce9fdcd0e13d22b5c940e7b",
+    sha1 = "32b8de1cbb722ba75bdf9898e0c41d42af00ce57",
 )
 
 maven_jar(
     name = "sshd-sftp",
     artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
-    sha1 = "3a293bba303c486a9ff6be8e11c9c68fd56b63c7",
+    sha1 = "0f96f00a07b186ea62838a6a4122e8f4cad44df6",
 )
 
 JNA_VERS = "5.14.0"
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index e680eec88d..fd8ea08e0f 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.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)",
+Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.io;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.kex;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.session;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.signature;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)",
+ org.apache.sshd.core;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.auth;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.command;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.session;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.shell;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)",
+ org.apache.sshd.sftp;version="[2.12.0,2.13.0)",
+ org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)",
  org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.api;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.api.errors;version="[6.9.0,6.10.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 068530acf9..be58b99c78 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="1702682577">
+<target name="jgit-4.17" sequenceNumber="1705682969">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 a15d41393a..6da414110f 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="1702682577">
+<target name="jgit-4.18" sequenceNumber="1705682971">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 d1de820c75..3aa8bc28e4 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="1702682577">
+<target name="jgit-4.19-staging" sequenceNumber="1705682972">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 39a6caf022..d34a294ef5 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="1702682577">
+<target name="jgit-4.20" sequenceNumber="1705682974">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 3b62aaa83e..3e1d3caacb 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="1702682577">
+<target name="jgit-4.21" sequenceNumber="1705682975">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 f2e89885eb..6442bab140 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="1702682576">
+<target name="jgit-4.22" sequenceNumber="1705682978">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 f7dd81d407..8e8c4798f6 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="1702682576">
+<target name="jgit-4.23" sequenceNumber="1705682980">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 129e9ae21b..cfff3cc2e1 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="1702682576">
+<target name="jgit-4.24" sequenceNumber="1705682983">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 7cafd8c9ab..7cc53fee05 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="1702682576">
+<target name="jgit-4.25" sequenceNumber="1705682985">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 4e10090ba7..221e23b808 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="1702682576">
+<target name="jgit-4.26" sequenceNumber="1705682987">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 dfa805f359..a73081a396 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="1702682576">
+<target name="jgit-4.27" sequenceNumber="1705682988">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 1bed4855ba..58d4d011f3 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="1702682576">
+<target name="jgit-4.28" sequenceNumber="1705682989">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 f0553ebdf3..584806d457 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="1702682576">
+<target name="jgit-4.29" sequenceNumber="1705682991">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 7e9dbed985..9934e9b221 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="1702682576">
+<target name="jgit-4.30" sequenceNumber="1705682992">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
diff --git 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
index 7086e51315..e4ee40d7d6 100644
--- 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 @@
 <?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="1702682576">
+<target name="jgit-4.31" sequenceNumber="1705682994">
   <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.11.0</version>
+    		<version>2.12.0</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>org.apache.sshd</groupId>
     		<artifactId>sshd-sftp</artifactId>
-    		<version>2.11.0</version>
+    		<version>2.12.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 a44c867be7..abd8e24d30 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.11.0"
+		version = "2.12.0"
 	}
 	dependency {
 		groupId = "org.apache.sshd"
 		artifactId = "sshd-sftp"
-		version = "2.11.0"
+		version = "2.12.0"
 	}
 }
 
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 8090c4fb98..6620408dbd 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.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)",
+Import-Package: org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.auth;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.kex;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.session;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.signature;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.net;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)",
+ org.apache.sshd.core;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.forward;version="[2.12.0,2.13.0)",
  org.eclipse.jgit.api;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.api.errors;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.9.0,6.10.0)",
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 0010fa03dd..d95c7ed62b 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.9.0";x-inter
  org.eclipse.jgit.transport.sshd.agent;version="6.9.0",
  sun.security.x509
 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.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.apache.sshd.agent;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.auth;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.auth.keyboard;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.auth.password;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.auth.pubkey;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.channel;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.config.keys;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.future;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.keyverifier;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.session;version="[2.12.0,2.13.0)",
+ org.apache.sshd.client.session.forward;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.auth;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.channel;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.compression;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.config.keys.loader;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.config.keys.u2f;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.digest;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.forward;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.future;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.io;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.kex;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.kex.extension;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.kex.extension.parser;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.mac;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.random;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.session;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.session.helpers;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.signature;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.buffer.keys;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.closeable;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.io;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.io.der;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.io.functors;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.io.resource;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.net;version="[2.12.0,2.13.0)",
+ org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)",
+ org.apache.sshd.core;version="[2.12.0,2.13.0)",
+ org.apache.sshd.server.auth;version="[2.12.0,2.13.0)",
+ org.apache.sshd.sftp;version="[2.12.0,2.13.0)",
+ org.apache.sshd.sftp.client;version="[2.12.0,2.13.0)",
+ org.apache.sshd.sftp.common;version="[2.12.0,2.13.0)",
  org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.errors;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.fnmatch;version="[6.9.0,6.10.0)",
diff --git a/pom.xml b/pom.xml
index 31e2f7d2b4..f07f985c02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
 
     <jgit-last-release-version>6.8.0.202311291450-r</jgit-last-release-version>
     <ant-version>1.10.14</ant-version>
-    <apache-sshd-version>2.11.0</apache-sshd-version>
+    <apache-sshd-version>2.12.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>
-- 
cgit v1.2.3