From 30134f214e3746594f8a6dd454504cdb9c0e3865 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 9 Oct 2024 02:04:55 +0200 Subject: [PATCH] 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 --- WORKSPACE | 6 +- .../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/jgit-4.32.target | 6 +- .../org.eclipse.jgit.target/jgit-4.33.target | 6 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +- .../maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 28 ++--- .../META-INF/MANIFEST.MF | 104 +++++++++--------- pom.xml | 2 +- 24 files changed, 151 insertions(+), 151 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 27d29d3763..1e73782592 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -108,18 +108,18 @@ maven_jar( 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.15.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index aed8eda17c..9bbabc6007 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-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.1.0,7.2.0)", org.eclipse.jgit.api;version="[7.1.0,7.2.0)", org.eclipse.jgit.api.errors;version="[7.1.0,7.2.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 bc767729b0..588dfd37ae 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 3f07e0e72d..ff1273c703 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 9ff9322a0b..c538cc1ef4 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 74b1c9faab..7d55a95e33 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 3204643408..657f57091b 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 27475409aa..a080f951aa 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 a50dccae74..69c87ad04b 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 65da8b905b..4275429bed 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 6192303a38..7064c466ac 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 80a11ecb48..0ffc4d089e 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 0aa691dcf0..7bc490c360 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 6d25716a9c..da784ea7b1 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 646bcfd91b..18fb243fcc 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 d83948953a..5925e02403 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 7ed0186138..1fb2c0b0eb 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 bf1b6a8706..6b9f65983b 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 4c51e6fb3b..82e6953cb6 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 5f1053f457..9b5bd088fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 d52dfd1957..d840043ae5 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 @@ maven sshd 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 f16c96040c..546dfd4a1d 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-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.1.0,7.2.0)", org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 9544c5f74a..69f23a5ebe 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 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-inter org.eclipse.jgit.transport.sshd.agent;version="7.1.0", 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.1.0,7.2.0)", org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", org.eclipse.jgit.fnmatch;version="[7.1.0,7.2.0)", diff --git a/pom.xml b/pom.xml index bd9fde15d5..8108fecef4 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 7.0.0.202409031743-r 1.10.15 - 2.13.2 + 2.14.0 0.1.55 1.1.3 1.2.3 -- 2.39.5