diff options
16 files changed, 146 insertions, 155 deletions
@@ -90,16 +90,18 @@ maven_jar( sha1 = "7f2e0c573eaa7a74bac2e89b359e1f73d92a0a1d", ) +SSHD_VERS = "2.9.2" + maven_jar( name = "sshd-osgi", - artifact = "org.apache.sshd:sshd-osgi:2.8.0", - sha1 = "b2a59b73c045f40d5722b9160d4f909a646d86c9", + artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, + sha1 = "bac0415734519b2fe433fea196017acf7ed32660", ) maven_jar( name = "sshd-sftp", - artifact = "org.apache.sshd:sshd-sftp:2.8.0", - sha1 = "d3cd9bc8d335b3ed1a86d2965deb4d202de27442", + artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, + sha1 = "7f9089c87b3b44f19998252fd3b68637e3322920", ) maven_jar( diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index e2fb037546..807339e632 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: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.apache.sshd.common;version="[2.8.0,2.9.0)", - org.apache.sshd.common.config.keys;version="[2.8.0,2.9.0)", - org.apache.sshd.common.file.virtualfs;version="[2.8.0,2.9.0)", - org.apache.sshd.common.helpers;version="[2.8.0,2.9.0)", - org.apache.sshd.common.io;version="[2.8.0,2.9.0)", - org.apache.sshd.common.kex;version="[2.8.0,2.9.0)", - org.apache.sshd.common.keyprovider;version="[2.8.0,2.9.0)", - org.apache.sshd.common.session;version="[2.8.0,2.9.0)", - org.apache.sshd.common.signature;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.buffer;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.logging;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.security;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.threads;version="[2.8.0,2.9.0)", - org.apache.sshd.core;version="[2.8.0,2.9.0)", - org.apache.sshd.server;version="[2.8.0,2.9.0)", - org.apache.sshd.server.auth;version="[2.8.0,2.9.0)", - org.apache.sshd.server.auth.gss;version="[2.8.0,2.9.0)", - org.apache.sshd.server.auth.keyboard;version="[2.8.0,2.9.0)", - org.apache.sshd.server.auth.password;version="[2.8.0,2.9.0)", - org.apache.sshd.server.command;version="[2.8.0,2.9.0)", - org.apache.sshd.server.session;version="[2.8.0,2.9.0)", - org.apache.sshd.server.shell;version="[2.8.0,2.9.0)", - org.apache.sshd.server.subsystem;version="[2.8.0,2.9.0)", - org.apache.sshd.sftp;version="[2.8.0,2.9.0)", - org.apache.sshd.sftp.server;version="[2.8.0,2.9.0)", +Import-Package: org.apache.sshd.common;version="[2.9.2,2.10.0)", + org.apache.sshd.common.config.keys;version="[2.9.2,2.10.0)", + org.apache.sshd.common.file.virtualfs;version="[2.9.2,2.10.0)", + org.apache.sshd.common.helpers;version="[2.9.2,2.10.0)", + org.apache.sshd.common.io;version="[2.9.2,2.10.0)", + org.apache.sshd.common.kex;version="[2.9.2,2.10.0)", + org.apache.sshd.common.keyprovider;version="[2.9.2,2.10.0)", + org.apache.sshd.common.session;version="[2.9.2,2.10.0)", + org.apache.sshd.common.signature;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.buffer;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.logging;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.security;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.threads;version="[2.9.2,2.10.0)", + org.apache.sshd.core;version="[2.9.2,2.10.0)", + org.apache.sshd.server;version="[2.9.2,2.10.0)", + org.apache.sshd.server.auth;version="[2.9.2,2.10.0)", + org.apache.sshd.server.auth.gss;version="[2.9.2,2.10.0)", + org.apache.sshd.server.auth.keyboard;version="[2.9.2,2.10.0)", + org.apache.sshd.server.auth.password;version="[2.9.2,2.10.0)", + org.apache.sshd.server.command;version="[2.9.2,2.10.0)", + org.apache.sshd.server.session;version="[2.9.2,2.10.0)", + org.apache.sshd.server.shell;version="[2.9.2,2.10.0)", + org.apache.sshd.server.subsystem;version="[2.9.2,2.10.0)", + org.apache.sshd.sftp;version="[2.9.2,2.10.0)", + org.apache.sshd.sftp.server;version="[2.9.2,2.10.0)", org.eclipse.jgit.annotations;version="[6.4.0,6.5.0)", org.eclipse.jgit.api;version="[6.4.0,6.5.0)", org.eclipse.jgit.api.errors;version="[6.4.0,6.5.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 7fee022ee6..7d00b51b80 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.17" sequenceNumber="1668805509"> +<target name="jgit-4.17" sequenceNumber="1668807163"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,10 +53,10 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20221112-0806"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> + <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/> <unit id="org.assertj" version="3.20.2.v20210706-1104"/> <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/> 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 c5eb5d1daf..f6ed0115bc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.18" sequenceNumber="1668805509"> +<target name="jgit-4.18" sequenceNumber="1668807163"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,10 +53,10 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20221112-0806"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> + <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/> <unit id="org.assertj" version="3.20.2.v20210706-1104"/> <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/> 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 5ae6ddf7d0..db678fc713 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.19-staging" sequenceNumber="1668805509"> +<target name="jgit-4.19-staging" sequenceNumber="1668807163"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,10 +53,10 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20221112-0806"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> + <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/> <unit id="org.assertj" version="3.20.2.v20210706-1104"/> <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/> 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 676c17b509..29a749a8b9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.20" sequenceNumber="1668805509"> +<target name="jgit-4.20" sequenceNumber="1668807163"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,10 +53,10 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20221112-0806"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> + <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/> <unit id="org.assertj" version="3.20.2.v20210706-1104"/> <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/> 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 ae99608e1e..98627b3b27 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.21" sequenceNumber="1668805509"> +<target name="jgit-4.21" sequenceNumber="1668807163"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,10 +53,10 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20221112-0806"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> + <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/> <unit id="org.assertj" version="3.20.2.v20210706-1104"/> <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/> 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 c050573f06..d2442d1740 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.22" sequenceNumber="1668805509"> +<target name="jgit-4.22" sequenceNumber="1668807161"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,10 +53,10 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20221112-0806"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> + <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/> <unit id="org.assertj" version="3.20.2.v20210706-1104"/> <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/> 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 a0bf54081f..7b86c1ef67 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.23" sequenceNumber="1668805509"> +<target name="jgit-4.23" sequenceNumber="1668807161"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,10 +53,10 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20221112-0806"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> + <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/> <unit id="org.assertj" version="3.20.2.v20210706-1104"/> <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/> 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 20a3e29939..464ae6f044 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.24" sequenceNumber="1668805509"> +<target name="jgit-4.24" sequenceNumber="1668807161"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,10 +53,10 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20221112-0806"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> + <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/> <unit id="org.assertj" version="3.20.2.v20210706-1104"/> <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/> 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 86ac5fd56d..f9daeace4c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.25" sequenceNumber="1668805509"> +<target name="jgit-4.25" sequenceNumber="1668807161"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,10 +53,10 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20221112-0806"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> + <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/> + <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/> <unit id="org.assertj" version="3.20.2.v20210706-1104"/> <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/> <unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20221118032057.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20221118032057.tpd index 5efa238a14..bf2b01d7b4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20221118032057.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20221118032057.tpd @@ -32,10 +32,10 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202211180320 org.apache.httpcomponents.httpclient.source [4.5.13.v20221112-0806,4.5.13.v20221112-0806] org.apache.httpcomponents.httpcore [4.4.15.v20220209-2345,4.4.15.v20220209-2345] org.apache.httpcomponents.httpcore.source [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.sshd.osgi [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.osgi.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] + org.apache.sshd.osgi [2.9.2.v20221117-1942,2.9.2.v20221117-1942] + org.apache.sshd.osgi.source [2.9.2.v20221117-1942,2.9.2.v20221117-1942] + org.apache.sshd.sftp [2.9.2.v20221117-1942,2.9.2.v20221117-1942] + org.apache.sshd.sftp.source [2.9.2.v20221117-1942,2.9.2.v20221117-1942] org.assertj [3.20.2.v20210706-1104,3.20.2.v20210706-1104] org.assertj.source [3.20.2.v20210706-1104,3.20.2.v20210706-1104] org.bouncycastle.bcpg [1.72.0.v20221013-1810,1.72.0.v20221013-1810] 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 913a262915..1f19407e82 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -7,20 +7,20 @@ Bundle-Version: 6.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.apache.sshd.client.config.hosts;version="[2.8.0,2.9.0)", - org.apache.sshd.common;version="[2.8.0,2.9.0)", - org.apache.sshd.common.auth;version="[2.8.0,2.9.0)", - org.apache.sshd.common.config.keys;version="[2.8.0,2.9.0)", - org.apache.sshd.common.helpers;version="[2.8.0,2.9.0)", - org.apache.sshd.common.kex;version="[2.8.0,2.9.0)", - org.apache.sshd.common.keyprovider;version="[2.8.0,2.9.0)", - org.apache.sshd.common.session;version="[2.8.0,2.9.0)", - org.apache.sshd.common.signature;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.net;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.security;version="[2.8.0,2.9.0)", - org.apache.sshd.core;version="[2.8.0,2.9.0)", - org.apache.sshd.server;version="[2.8.0,2.9.0)", - org.apache.sshd.server.forward;version="[2.8.0,2.9.0)", +Import-Package: org.apache.sshd.client.config.hosts;version="[2.9.2,2.10.0)", + org.apache.sshd.common;version="[2.9.2,2.10.0)", + org.apache.sshd.common.auth;version="[2.9.2,2.10.0)", + org.apache.sshd.common.config.keys;version="[2.9.2,2.10.0)", + org.apache.sshd.common.helpers;version="[2.9.2,2.10.0)", + org.apache.sshd.common.kex;version="[2.9.2,2.10.0)", + org.apache.sshd.common.keyprovider;version="[2.9.2,2.10.0)", + org.apache.sshd.common.session;version="[2.9.2,2.10.0)", + org.apache.sshd.common.signature;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.net;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.security;version="[2.9.2,2.10.0)", + org.apache.sshd.core;version="[2.9.2,2.10.0)", + org.apache.sshd.server;version="[2.9.2,2.10.0)", + org.apache.sshd.server.forward;version="[2.9.2,2.10.0)", org.eclipse.jgit.api;version="[6.4.0,6.5.0)", org.eclipse.jgit.api.errors;version="[6.4.0,6.5.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.4.0,6.5.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 1edde8adaf..a27d6c72fc 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -35,57 +35,57 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.4.0";x-inter org.apache.sshd.client.keyverifier", org.eclipse.jgit.transport.sshd.agent;version="6.4.0" Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.8.0,2.9.0)", - org.apache.sshd.client;version="[2.8.0,2.9.0)", - org.apache.sshd.client.auth;version="[2.8.0,2.9.0)", - org.apache.sshd.client.auth.keyboard;version="[2.8.0,2.9.0)", - org.apache.sshd.client.auth.password;version="[2.8.0,2.9.0)", - org.apache.sshd.client.auth.pubkey;version="[2.8.0,2.9.0)", - org.apache.sshd.client.channel;version="[2.8.0,2.9.0)", - org.apache.sshd.client.config.hosts;version="[2.8.0,2.9.0)", - org.apache.sshd.client.config.keys;version="[2.8.0,2.9.0)", - org.apache.sshd.client.future;version="[2.8.0,2.9.0)", - org.apache.sshd.client.keyverifier;version="[2.8.0,2.9.0)", - org.apache.sshd.client.session;version="[2.8.0,2.9.0)", - org.apache.sshd.client.session.forward;version="[2.8.0,2.9.0)", - org.apache.sshd.common;version="[2.8.0,2.9.0)", - org.apache.sshd.common.auth;version="[2.8.0,2.9.0)", - org.apache.sshd.common.channel;version="[2.8.0,2.9.0)", - org.apache.sshd.common.compression;version="[2.8.0,2.9.0)", - org.apache.sshd.common.config.keys;version="[2.8.0,2.9.0)", - org.apache.sshd.common.config.keys.loader;version="[2.8.0,2.9.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.8.0,2.9.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.8.0,2.9.0)", - org.apache.sshd.common.digest;version="[2.8.0,2.9.0)", - org.apache.sshd.common.forward;version="[2.8.0,2.9.0)", - org.apache.sshd.common.future;version="[2.8.0,2.9.0)", - org.apache.sshd.common.helpers;version="[2.8.0,2.9.0)", - org.apache.sshd.common.io;version="[2.8.0,2.9.0)", - org.apache.sshd.common.kex;version="[2.8.0,2.9.0)", - org.apache.sshd.common.kex.extension;version="[2.8.0,2.9.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.8.0,2.9.0)", - org.apache.sshd.common.keyprovider;version="[2.8.0,2.9.0)", - org.apache.sshd.common.mac;version="[2.8.0,2.9.0)", - org.apache.sshd.common.random;version="[2.8.0,2.9.0)", - org.apache.sshd.common.session;version="[2.8.0,2.9.0)", - org.apache.sshd.common.session.helpers;version="[2.8.0,2.9.0)", - org.apache.sshd.common.signature;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.buffer;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.closeable;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.io;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.io.der;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.io.functors;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.io.resource;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.logging;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.net;version="[2.8.0,2.9.0)", - org.apache.sshd.common.util.security;version="[2.8.0,2.9.0)", - org.apache.sshd.core;version="[2.8.0,2.9.0)", - org.apache.sshd.server.auth;version="[2.8.0,2.9.0)", - org.apache.sshd.sftp;version="[2.8.0,2.9.0)", - org.apache.sshd.sftp.client;version="[2.8.0,2.9.0)", - org.apache.sshd.sftp.common;version="[2.8.0,2.9.0)", + org.apache.sshd.agent;version="[2.9.2,2.10.0)", + org.apache.sshd.client;version="[2.9.2,2.10.0)", + org.apache.sshd.client.auth;version="[2.9.2,2.10.0)", + org.apache.sshd.client.auth.keyboard;version="[2.9.2,2.10.0)", + org.apache.sshd.client.auth.password;version="[2.9.2,2.10.0)", + org.apache.sshd.client.auth.pubkey;version="[2.9.2,2.10.0)", + org.apache.sshd.client.channel;version="[2.9.2,2.10.0)", + org.apache.sshd.client.config.hosts;version="[2.9.2,2.10.0)", + org.apache.sshd.client.config.keys;version="[2.9.2,2.10.0)", + org.apache.sshd.client.future;version="[2.9.2,2.10.0)", + org.apache.sshd.client.keyverifier;version="[2.9.2,2.10.0)", + org.apache.sshd.client.session;version="[2.9.2,2.10.0)", + org.apache.sshd.client.session.forward;version="[2.9.2,2.10.0)", + org.apache.sshd.common;version="[2.9.2,2.10.0)", + org.apache.sshd.common.auth;version="[2.9.2,2.10.0)", + org.apache.sshd.common.channel;version="[2.9.2,2.10.0)", + org.apache.sshd.common.compression;version="[2.9.2,2.10.0)", + org.apache.sshd.common.config.keys;version="[2.9.2,2.10.0)", + org.apache.sshd.common.config.keys.loader;version="[2.9.2,2.10.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.9.2,2.10.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.9.2,2.10.0)", + org.apache.sshd.common.digest;version="[2.9.2,2.10.0)", + org.apache.sshd.common.forward;version="[2.9.2,2.10.0)", + org.apache.sshd.common.future;version="[2.9.2,2.10.0)", + org.apache.sshd.common.helpers;version="[2.9.2,2.10.0)", + org.apache.sshd.common.io;version="[2.9.2,2.10.0)", + org.apache.sshd.common.kex;version="[2.9.2,2.10.0)", + org.apache.sshd.common.kex.extension;version="[2.9.2,2.10.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.9.2,2.10.0)", + org.apache.sshd.common.keyprovider;version="[2.9.2,2.10.0)", + org.apache.sshd.common.mac;version="[2.9.2,2.10.0)", + org.apache.sshd.common.random;version="[2.9.2,2.10.0)", + org.apache.sshd.common.session;version="[2.9.2,2.10.0)", + org.apache.sshd.common.session.helpers;version="[2.9.2,2.10.0)", + org.apache.sshd.common.signature;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.buffer;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.closeable;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.io;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.io.der;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.io.functors;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.io.resource;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.logging;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.net;version="[2.9.2,2.10.0)", + org.apache.sshd.common.util.security;version="[2.9.2,2.10.0)", + org.apache.sshd.core;version="[2.9.2,2.10.0)", + org.apache.sshd.server.auth;version="[2.9.2,2.10.0)", + org.apache.sshd.sftp;version="[2.9.2,2.10.0)", + org.apache.sshd.sftp.client;version="[2.9.2,2.10.0)", + org.apache.sshd.sftp.common;version="[2.9.2,2.10.0)", org.eclipse.jgit.annotations;version="[6.4.0,6.5.0)", org.eclipse.jgit.errors;version="[6.4.0,6.5.0)", org.eclipse.jgit.fnmatch;version="[6.4.0,6.5.0)", diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java index e1036c6283..e2da7991af 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java @@ -131,17 +131,6 @@ public class JGitPublicKeyAuthentication extends UserAuthPublicKey { @Override protected PublicKeyIdentity resolveAttemptedPublicKeyIdentity( ClientSession session, String service) throws Exception { - PublicKeyIdentity result = getNextKey(session, service); - // This fixes SSHD-1231. Can be removed once we're using Apache MINA - // sshd > 2.8.0. - // - // See https://issues.apache.org/jira/browse/SSHD-1231 - currentAlgorithms.clear(); - return result; - } - - private PublicKeyIdentity getNextKey(ClientSession session, String service) - throws Exception { PublicKeyIdentity id = super.resolveAttemptedPublicKeyIdentity(session, service); if (addKeysToAgent && id != null && !(id instanceof KeyAgentIdentity)) { @@ -152,7 +152,7 @@ <jgit-last-release-version>6.2.0.202206071550-r</jgit-last-release-version> <ant-version>1.10.12</ant-version> - <apache-sshd-version>2.8.0</apache-sshd-version> + <apache-sshd-version>2.9.2</apache-sshd-version> <jsch-version>0.1.55</jsch-version> <jzlib-version>1.1.3</jzlib-version> <javaewah-version>1.1.13</javaewah-version> |