Update Apache sshd to 2.14.0

This fixes an 'incorrect signature' error when trying to use the keys
generated by SSHD during server init with an OpenSSH client.

This also includes a few other changes since 2.13.2:
* GH-524 Performance improvements
* GH-533 Fix multi-step authentication
* GH-582 Fix filtering in NamedFactory
* GH-587 Prevent NullPointerExceptionon closed channel in NettyIoSession
* GH-590 Better support for FIPS
* GH-597 Pass on Charset in ClientSession.executeRemoteCommand()

https://github.com/apache/mina-sshd/releases/tag/sshd-2.14.0

Change-Id: I76909fd56e70ee4ce16a075bd40ed6b2a609cc47

diff --git a/WORKSPACE b/WORKSPACE
index bceb668576845e856a4337a6b1afcad967f79274..ecaa82a5569c0c101cfdaab2204b8b07a6d19b13 100644 (file)
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -110,18 +110,18 @@ maven_jar(
     sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850",
 )
 
-SSHD_VERS = "2.12.1"
+SSHD_VERS = "2.14.0"
 
 maven_jar(
     name = "sshd-osgi",
     artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
-    sha1 = "45b0501857603881ab472c927852ffa406932aef",
+    sha1 = "6ef66228a088f8ac1383b2ff28f3102f80ebc01a",
 )
 
 maven_jar(
     name = "sshd-sftp",
     artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
-    sha1 = "3ef6ded49799618c9438aa1044c6bf01124133bb",
+    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 e704f2cecf917ccb63cf37d4ed86fff199d3250f..a46383870f611b74ec4e9f38c1dba79c21f904ce 100644 (file)
--- 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.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)",
+Import-Package: org.apache.sshd.common;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.file.virtualfs;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.io;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.kex;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.session;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.signature;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.threads;version="[2.14.0,2.15.0)",
+ org.apache.sshd.core;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.auth;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.auth.gss;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.auth.keyboard;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.auth.password;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.command;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.session;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.shell;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.subsystem;version="[2.14.0,2.15.0)",
+ org.apache.sshd.sftp;version="[2.14.0,2.15.0)",
+ org.apache.sshd.sftp.server;version="[2.14.0,2.15.0)",
  org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)",
  org.eclipse.jgit.api;version="[6.10.1,6.11.0)",
  org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)",

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 357a5158f69435db00f7a099f0a58a1972e8f405..8b4cb40836056e7c1147604e216208ed65ce3664 100644 (file)
--- 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="1716824813">
+<target name="jgit-4.17" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 4164742e6db337b962ca6fd7b1936232f354c31f..79f5200c332c8db2e2f4bfaec2586c19c2a56d12 100644 (file)
--- 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="1716824813">
+<target name="jgit-4.18" sequenceNumber="1728511225">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 c3f24679a9a3a93d75e89510424231b1ebe940e6..7eca94891f2dcb7dfd0775d60654ffb83182519a 100644 (file)
--- 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="1716824813">
+<target name="jgit-4.19-staging" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 7412a7d5ff8c27b2554d3d887431b997181c41af..453b635041d2c6acd1d097b4707760a5953e4244 100644 (file)
--- 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="1716824813">
+<target name="jgit-4.20" sequenceNumber="1728511225">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 c4144d65cbf094e68dc67d8fca985b2ad5371fa5..0e92133e605368b2b3ee4ea6979e695b5f2854a4 100644 (file)
--- 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="1716824813">
+<target name="jgit-4.21" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 b3625fa0d88c9a34b63aec25b53c08998b2a44b4..2b3071c0ee483abf0adfb4e3245ed9330b645edf 100644 (file)
--- 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="1716824812">
+<target name="jgit-4.22" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 6f1e2ede1c4a67ea3b1d5e469d25521b40e48314..4cd69ada22ded9b2aaff48ea1f66fbae1dc41893 100644 (file)
--- 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="1716824812">
+<target name="jgit-4.23" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 db79a5abe977c2d6105ef730ef1baf4cc35453c7..9b54c0c960abc906de1800fa3a1299f93e32bc35 100644 (file)
--- 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="1716824812">
+<target name="jgit-4.24" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 3d164c0ed80dca7bbb3b8bcd6ae90a2145f40f8a..8b072cbdda028632ebf377e18dd5c7a935c04858 100644 (file)
--- 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="1716824812">
+<target name="jgit-4.25" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 63fe49222d527babd9876bbac77701a8a0add1e8..1c056a6f2bc2732ea33eb8c563ee89fdc8eaba46 100644 (file)
--- 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="1716824812">
+<target name="jgit-4.26" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 ee8b3d7bdd1d9c60dbae895b7e381de0e3447d38..66bc3145e197c64d03cc22c5c071c1575b5baa74 100644 (file)
--- 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="1716824812">
+<target name="jgit-4.27" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 ee4845d006a541bc94ff2e2c1b085c290f8e4f5b..4a59b0657a27768280b4dd770fe322259c4c7382 100644 (file)
--- 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="1716824812">
+<target name="jgit-4.28" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 5cb731e771eb1e40d7cfad29584465ee9cc1bc64..3d2a578bfb63029cf535e2abe129db8172a6a98e 100644 (file)
--- 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="1716824812">
+<target name="jgit-4.29" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 488373d3e2af6338f31d16b1a163d386372330e5..ddad08e693389f5fd08bbfc8ac1148e9ace70812 100644 (file)
--- 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="1716824811">
+<target name="jgit-4.30" sequenceNumber="1728511223">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 5bbcd3ce97533d2fd0a6644ef197fe60ca47a6cf..17babd84b6223add76af942d2fbf7ecaa82ab851 100644 (file)
--- 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="1716824812">
+<target name="jgit-4.31" sequenceNumber="1728511224">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 b0bd4d3f2e50f72544db6adfe96dc84d21c6868f..b25472597ac199798e11bfb715ab4516b6444f24 100644 (file)
--- 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="1716824813">
+<target name="jgit-4.32" sequenceNumber="1728511223">
   <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.12.1</version>
+          <version>2.14.0</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.sshd</groupId>
           <artifactId>sshd-sftp</artifactId>
-          <version>2.12.1</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 3d47632ffdb1e1628b63f0a34e3692bb8c950cc7..7aae03be00434d81cc290a4ad7dbf0fc1d665022 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
@@ -233,12 +233,12 @@ maven sshd
        dependency {
                groupId = "org.apache.sshd"
                artifactId = "sshd-osgi"
-               version = "2.12.1"
+               version = "2.14.0"
        }
        dependency {
                groupId = "org.apache.sshd"
                artifactId = "sshd-sftp"
-               version = "2.12.1"
+               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 b8073e202e1164eb1322bac316548756173a183a..6f2af63fc6f833cc949f2c94d696314675f4ba9f 100644 (file)
--- 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.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)",
+Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.auth;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.kex;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.session;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.signature;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)",
+ org.apache.sshd.core;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.forward;version="[2.14.0,2.15.0)",
  org.eclipse.jgit.api;version="[6.10.1,6.11.0)",
  org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)",
  org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)",

diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 404129d0f39c9bef2f802db608c047472c7cb12e..e9d88455c7b51e4e5bae7075a4ca5a8ba5ec65e4 100644 (file)
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@ -37,58 +37,58 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.1";x-inte
  org.eclipse.jgit.transport.sshd.agent;version="6.10.1",
  sun.security.x509
 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.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.cipher;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.apache.sshd.agent;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.auth;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.auth.keyboard;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.auth.password;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.auth.pubkey;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.channel;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.config.keys;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.future;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.keyverifier;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.session;version="[2.14.0,2.15.0)",
+ org.apache.sshd.client.session.forward;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.auth;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.channel;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.cipher;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.compression;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.config.keys.loader;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.config.keys.u2f;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.digest;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.forward;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.future;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.io;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.kex;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.kex.extension;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.kex.extension.parser;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.mac;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.random;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.session;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.session.helpers;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.signature;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.buffer.keys;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.closeable;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.io;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.io.der;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.io.functors;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.io.resource;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)",
+ org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)",
+ org.apache.sshd.core;version="[2.14.0,2.15.0)",
+ org.apache.sshd.server.auth;version="[2.14.0,2.15.0)",
+ org.apache.sshd.sftp;version="[2.14.0,2.15.0)",
+ org.apache.sshd.sftp.client;version="[2.14.0,2.15.0)",
+ org.apache.sshd.sftp.common;version="[2.14.0,2.15.0)",
  org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)",
  org.eclipse.jgit.errors;version="[6.10.1,6.11.0)",
  org.eclipse.jgit.fnmatch;version="[6.10.1,6.11.0)",

diff --git a/pom.xml b/pom.xml
index f960a3ed5d57eaa520b9375137a8230a00ae0862..4c9159b95dd86aaf0995d5149d2e5b805207468f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
 
     <jgit-last-release-version>6.9.0.202403050737-r</jgit-last-release-version>
     <ant-version>1.10.14</ant-version>
-    <apache-sshd-version>2.12.1</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>