Google Git
Sign in
gerrit/jgit/f306a8a99c2c9aadbbd5b3153caae3d4ef4ba252^1..f306a8a99c2c9aadbbd5b3153caae3d4ef4ba252/.
commit
f306a8a99c2c9aadbbd5b3153caae3d4ef4ba252
[log]
author
Matthias Sohn <matthias.sohn@sap.com>
Wed Oct 23 22:14:54 2024 +0200
committer
Matthias Sohn <matthias.sohn@sap.com>
Wed Oct 23 22:15:54 2024 +0200
tree
e463df212fa0d019f13ee8f36cf30dcc96f5b977
parent
e9b0fc93a5976902d0b060a70bdee78765b36a7e [diff]
parent
eeccc5a92e78d6bef5908a61481e159e6c38288a [diff]
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

diff --git a/WORKSPACE b/WORKSPACE
index 1fb967f..34caf9d 100644
--- a/WORKSPACE
+++ b/WORKSPACE

@@ -108,18 +108,18 @@
     sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850",
 )
 
-SSHD_VERS = "2.13.2"
+SSHD_VERS = "2.14.0"
 
 maven_jar(
     name = "sshd-osgi",
     artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
-    sha1 = "34914a5bef9ba3d04971fdec1273b47df835b038",
+    sha1 = "6ef66228a088f8ac1383b2ff28f3102f80ebc01a",
 )
 
 maven_jar(
     name = "sshd-sftp",
     artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
-    sha1 = "334f42d5bbc8afb7f1149a37d10f8718cf59cc06",
+    sha1 = "c070ac920e72023ae9ab0a3f3a866bece284b470",
 )
 
 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 0e80913..5062833 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-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 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="[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)",

diff --git a/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java b/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java
index badcb7d..ee8e893 100644
--- a/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java
+++ b/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java

@@ -97,7 +97,8 @@ public void lfsUrlFromRemoteUrlWithoutDotGit() throws Exception {
 	public void lfsUrlFromLocalConfig() throws Exception {
 		addRemoteUrl("https://localhost/repo");
 
-		StoredConfig cfg = ((Repository) db).getConfig();
+		@SuppressWarnings("restriction")
+		StoredConfig cfg = db.getConfig();
 		cfg.setString(ConfigConstants.CONFIG_SECTION_LFS,
 				null,
 				ConfigConstants.CONFIG_KEY_URL,
@@ -111,7 +112,8 @@ public void lfsUrlFromLocalConfig() throws Exception {
 	public void lfsUrlFromOriginConfig() throws Exception {
 		addRemoteUrl("https://localhost/repo");
 
-		StoredConfig cfg = ((Repository) db).getConfig();
+		@SuppressWarnings("restriction")
+		StoredConfig cfg = db.getConfig();
 		cfg.setString(ConfigConstants.CONFIG_SECTION_LFS,
 				org.eclipse.jgit.lib.Constants.DEFAULT_REMOTE_NAME,
 				ConfigConstants.CONFIG_KEY_URL,

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 e996aeb..2376132 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="1724850720">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 cd4f935..b779b0f 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="1724850721">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 01e8071..1e729ab 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="1724850720">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 7dbb163..1e5270b 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="1724850720">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 985fee0..a17d058 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="1724850720">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 afd61cf..9023178 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 0309d2f..8e4fcc2 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 0ed6d80..f7b956b 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 b081af4..76426eb 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 5874693..512ce57 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 e192b62..ff9c473 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 3875520..5af352f 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 01ae4ac..fcf42e4 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 1651587..e43e06c 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

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 9141303..feff850 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="1724850719">
+<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"/>
@@ -63,13 +63,13 @@
         <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>

diff --git 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
index 26524a9..c1964c9 100644
--- 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 @@
 <?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="1729714537">
   <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.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>

diff --git 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
index 8591802..4d9f630 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,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.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"/>
@@ -63,13 +63,13 @@
         <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>

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 8718535..42712c0 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

@@ -238,12 +238,12 @@
 	dependency {
 		groupId = "org.apache.sshd"
 		artifactId = "sshd-osgi"
-		version = "2.13.2"
+		version = "2.14.0"
 	}
 	dependency {
 		groupId = "org.apache.sshd"
 		artifactId = "sshd-sftp"
-		version = "2.13.2"
+		version = "2.14.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 d9b0e1b..6a2ac37 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-Localization: plugin
 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="[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)",

diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java
index eef0402..69bd5c5 100644
--- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java
+++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java

@@ -17,7 +17,6 @@
 
 import org.eclipse.jgit.junit.ssh.SshBasicTestBase;
 import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.StoredConfig;
 import org.eclipse.jgit.transport.SshSessionFactory;
 import org.eclipse.jgit.util.FS;
@@ -52,7 +51,8 @@ protected void installConfig(String... config) {
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		StoredConfig config = ((Repository) db).getConfig();
+		@SuppressWarnings("restriction")
+		StoredConfig config = db.getConfig();
 		config.setInt("protocol", null, "version", 2);
 		config.save();
 	}

diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 4ddb3ad..b2266ba 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF

@@ -37,58 +37,58 @@
  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="[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)",

diff --git a/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java b/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java
index 611d4e8..8aa33e3 100644
--- a/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java
+++ b/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java

@@ -22,7 +22,6 @@
 import org.eclipse.jgit.errors.TransportException;
 import org.eclipse.jgit.junit.ssh.SshBasicTestBase;
 import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.StoredConfig;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.RemoteSession;
@@ -89,7 +88,8 @@ private OpenSshConfig createConfig(String... content) throws IOException {
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		StoredConfig config = ((Repository) db).getConfig();
+		@SuppressWarnings("restriction")
+		StoredConfig config = db.getConfig();
 		config.setInt("protocol", null, "version", 2);
 		config.save();
 	}

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java
index 79ceb13..30512c1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java

@@ -199,7 +199,7 @@ private void addIfNotNull(FanoutBucket b, int cell, NoteBucket child)
 		if (child == null)
 			return;
 		if (child instanceof InMemoryNoteBucket)
-			b.setBucket(cell, ((InMemoryNoteBucket) child).writeTree(inserter));
+			b.setBucket(cell, child.writeTree(inserter));
 		else
 			b.setBucket(cell, child.getTreeId());
 	}

diff --git a/pom.xml b/pom.xml
index 960df03..e215883 100644
--- a/pom.xml
+++ b/pom.xml

@@ -120,7 +120,7 @@
 
     <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>