From 05dabef4edb0f5b01318777cbc69bc1fc7d1106b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 1 Jul 2024 23:10:10 +0200 Subject: [PATCH] Update org.apache.sshd to 2.13.1 Change-Id: I040ccaffba337b252d731fe9661209818b5b63e3 --- WORKSPACE | 6 +- .../META-INF/MANIFEST.MF | 50 ++++----- .../META-INF/MANIFEST.MF.orig | 104 ++++++++++++++++++ .../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 +- .../maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 28 ++--- .../META-INF/MANIFEST.MF | 104 +++++++++--------- pom.xml | 2 +- 23 files changed, 249 insertions(+), 145 deletions(-) create mode 100644 org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig diff --git a/WORKSPACE b/WORKSPACE index 561b228d47..81e9dd3dff 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -108,18 +108,18 @@ maven_jar( sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850", ) -SSHD_VERS = "2.12.1" +SSHD_VERS = "2.13.1" maven_jar( name = "sshd-osgi", artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, - sha1 = "45b0501857603881ab472c927852ffa406932aef", + sha1 = "50958cc44076749e790d7332021cff546707624c", ) maven_jar( name = "sshd-sftp", artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, - sha1 = "3ef6ded49799618c9438aa1044c6bf01124133bb", + sha1 = "e1b6da4ef604718e32cad59ef32618610da7a170", ) 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 424bac1043..a3777ffdda 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.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.13.0,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.file.virtualfs;version="[2.13.0,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.io;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session;version="[2.13.0,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.threads;version="[2.13.0,2.14.0)", + org.apache.sshd.core;version="[2.13.0,2.14.0)", + org.apache.sshd.server;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.gss;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.keyboard;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.password;version="[2.13.0,2.14.0)", + org.apache.sshd.server.command;version="[2.13.0,2.14.0)", + org.apache.sshd.server.session;version="[2.13.0,2.14.0)", + org.apache.sshd.server.shell;version="[2.13.0,2.14.0)", + org.apache.sshd.server.subsystem;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp.server;version="[2.13.0,2.14.0)", org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", org.eclipse.jgit.api;version="[7.0.0,7.1.0)", org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig new file mode 100644 index 0000000000..e83582843e --- /dev/null +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig @@ -0,0 +1,104 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Automatic-Module-Name: org.eclipse.jgit.junit.ssh +Bundle-SymbolicName: org.eclipse.jgit.junit.ssh +Bundle-Version: 7.0.0.qualifier +Bundle-Localization: OSGI-INF/l10n/plugin +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +<<<<<<< HEAD +Bundle-RequiredExecutionEnvironment: JavaSE-17 +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)", +||||||| parent of 9724f9467f (Update org.apache.sshd to 2.13.1) +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)", +======= +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Import-Package: org.apache.sshd.common;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.file.virtualfs;version="[2.13.0,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.io;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session;version="[2.13.0,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.threads;version="[2.13.0,2.14.0)", + org.apache.sshd.core;version="[2.13.0,2.14.0)", + org.apache.sshd.server;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.gss;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.keyboard;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.password;version="[2.13.0,2.14.0)", + org.apache.sshd.server.command;version="[2.13.0,2.14.0)", + org.apache.sshd.server.session;version="[2.13.0,2.14.0)", + org.apache.sshd.server.shell;version="[2.13.0,2.14.0)", + org.apache.sshd.server.subsystem;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp.server;version="[2.13.0,2.14.0)", +>>>>>>> 9724f9467f (Update org.apache.sshd to 2.13.1) + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.junit;version="[4.13,5.0.0)", + org.junit.experimental.theories;version="[4.13,5.0.0)", + org.slf4j;version="[1.7.0,3.0.0)" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.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 7aa9221d35..1bf4969255 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 eab1a66679..e97ad339c6 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 bd48369602..4926f1b007 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 38afd33a48..743f24e532 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 dee512fbae..cd0bbf4174 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 1a00d75e85..04edd41fb7 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 6de8df8db7..cb5d26ffa4 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 a350e3b289..8cf9841620 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 f5f717daf7..3fb446a895 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 9df41727f5..daaac545d9 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 183d30d4d9..e14380c56c 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 f467e4f3cc..bcb8b4282e 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 9f30fd0fa2..ffe4e7497b 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 3f1c19bbab..837819befa 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 b89f385a05..30c141c4cc 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 372af86fa3..0beb627a89 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.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 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 d90026719e..132c118445 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.12.1" + version = "2.13.1" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.12.1" + version = "2.13.1" } } 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 54d610aa91..1ac232a306 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.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.13.0,2.14.0)", + org.apache.sshd.common;version="[2.13.0,2.14.0)", + org.apache.sshd.common.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session;version="[2.13.0,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.net;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", + org.apache.sshd.core;version="[2.13.0,2.14.0)", + org.apache.sshd.server;version="[2.13.0,2.14.0)", + org.apache.sshd.server.forward;version="[2.13.0,2.14.0)", org.eclipse.jgit.api;version="[7.0.0,7.1.0)", org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.0,7.1.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 02d94662ee..aa50fdd8ce 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.0.0";x-inter org.eclipse.jgit.transport.sshd.agent;version="7.0.0", 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.13.0,2.14.0)", + org.apache.sshd.client;version="[2.13.0,2.14.0)", + org.apache.sshd.client.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.client.auth.keyboard;version="[2.13.0,2.14.0)", + org.apache.sshd.client.auth.password;version="[2.13.0,2.14.0)", + org.apache.sshd.client.auth.pubkey;version="[2.13.0,2.14.0)", + org.apache.sshd.client.channel;version="[2.13.0,2.14.0)", + org.apache.sshd.client.config.hosts;version="[2.13.0,2.14.0)", + org.apache.sshd.client.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.client.future;version="[2.13.0,2.14.0)", + org.apache.sshd.client.keyverifier;version="[2.13.0,2.14.0)", + org.apache.sshd.client.session;version="[2.13.0,2.14.0)", + org.apache.sshd.client.session.forward;version="[2.13.0,2.14.0)", + org.apache.sshd.common;version="[2.13.0,2.14.0)", + org.apache.sshd.common.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.common.channel;version="[2.13.0,2.14.0)", + org.apache.sshd.common.cipher;version="[2.13.0,2.14.0)", + org.apache.sshd.common.compression;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys.loader;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.13.0,2.14.0)", + org.apache.sshd.common.digest;version="[2.13.0,2.14.0)", + org.apache.sshd.common.forward;version="[2.13.0,2.14.0)", + org.apache.sshd.common.future;version="[2.13.0,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.io;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex.extension;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.13.0,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", + org.apache.sshd.common.mac;version="[2.13.0,2.14.0)", + org.apache.sshd.common.random;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.closeable;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.io;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.io.der;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.io.functors;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.io.resource;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.net;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", + org.apache.sshd.core;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp.client;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp.common;version="[2.13.0,2.14.0)", org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", org.eclipse.jgit.fnmatch;version="[7.0.0,7.1.0)", diff --git a/pom.xml b/pom.xml index 676e75c23e..3f6fb16aca 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 6.10.0.202406032230-r 1.10.14 - 2.12.1 + 2.13.1 0.1.55 1.1.3 1.2.3 -- 2.39.5