Switch to Apache MINA sshd 2.8.0
Update version in root pom.xml, adapt code & manifests. Bump the dependency in the bazel build. Update Orbit to I20220105095044 to get Apache MINA sshd 2.8.0 and regenerate all target platforms. Bug: 577542 Change-Id: Iefc02ceda8a9b0683f49aa8059999a5486d1f322 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
Thomas Wolf
Matthias Sohn
parent
df4fa808b3
commit
d30447e269
|
|
@ -123,14 +123,14 @@ maven_jar(
|
|||
|
||||
maven_jar(
|
||||
name = "sshd-osgi",
|
||||
artifact = "org.apache.sshd:sshd-osgi:2.7.0",
|
||||
sha1 = "a101aad0f79ad424498098f7e91c39d3d92177c1",
|
||||
artifact = "org.apache.sshd:sshd-osgi:2.8.0",
|
||||
sha1 = "b2a59b73c045f40d5722b9160d4f909a646d86c9",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "sshd-sftp",
|
||||
artifact = "org.apache.sshd:sshd-sftp:2.7.0",
|
||||
sha1 = "0c9eff7145e20b338c1dd6aca36ba93ed7c0147c",
|
||||
artifact = "org.apache.sshd:sshd-sftp:2.8.0",
|
||||
sha1 = "d3cd9bc8d335b3ed1a86d2965deb4d202de27442",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
|
|
|||
|
|
@ -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.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.io;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.threads;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.core;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth.gss;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth.password;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.command;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.shell;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.subsystem;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp.server;version="[2.7.0,2.8.0)",
|
||||
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)",
|
||||
org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)",
|
||||
org.eclipse.jgit.api;version="[6.1.0,6.2.0)",
|
||||
org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)",
|
||||
|
|
|
|||
|
|
@ -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="1641393954">
|
||||
<target name="jgit-4.17" sequenceNumber="1641404038">
|
||||
<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.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<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.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.69.0.v20210713-1924"/>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220105095044/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.17" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
include "orbit/I20220105095044.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1641394122">
|
||||
<target name="jgit-4.18" sequenceNumber="1641404089">
|
||||
<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.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<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.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.69.0.v20210713-1924"/>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220105095044/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.18" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
include "orbit/I20220105095044.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-12/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1641394141">
|
||||
<target name="jgit-4.19-staging" sequenceNumber="1641404095">
|
||||
<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.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<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.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.69.0.v20210713-1924"/>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220105095044/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.19-staging" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
include "orbit/I20220105095044.tpd"
|
||||
|
||||
location "https://download.eclipse.org/staging/2021-03/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1641394152">
|
||||
<target name="jgit-4.20" sequenceNumber="1641404101">
|
||||
<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.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<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.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.69.0.v20210713-1924"/>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220105095044/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.20" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
include "orbit/I20220105095044.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2021-06/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1641394170">
|
||||
<target name="jgit-4.21" sequenceNumber="1641404101">
|
||||
<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.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<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.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.69.0.v20210713-1924"/>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220105095044/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.21" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
include "orbit/I20220105095044.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2021-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -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="1641394177">
|
||||
<target name="jgit-4.22" sequenceNumber="1641404099">
|
||||
<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.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
|
||||
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
|
||||
<unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
|
||||
<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.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.69.0.v20210713-1924"/>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
|
||||
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
|
||||
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220105095044/repository"/>
|
||||
</location>
|
||||
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.osgi" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.22" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
include "orbit/I20220105095044.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2021-12/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
target "I20220105095044" with source configurePhase
|
||||
// see https://download.eclipse.org/tools/orbit/downloads/
|
||||
|
||||
location "https://download.eclipse.org/tools/orbit/downloads/drops/I20220105095044/repository" {
|
||||
com.google.gson [2.8.8.v20211029-0838,2.8.8.v20211029-0838]
|
||||
com.google.gson.source [2.8.8.v20211029-0838,2.8.8.v20211029-0838]
|
||||
com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
|
||||
com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
|
||||
com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
|
||||
com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
|
||||
com.sun.jna [5.8.0.v20210503-0343,5.8.0.v20210503-0343]
|
||||
com.sun.jna.source [5.8.0.v20210503-0343,5.8.0.v20210503-0343]
|
||||
com.sun.jna.platform [5.8.0.v20210406-1004,5.8.0.v20210406-1004]
|
||||
com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004]
|
||||
javaewah [1.1.13.v20211029-0839,1.1.13.v20211029-0839]
|
||||
javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839]
|
||||
net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
|
||||
net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
|
||||
net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
|
||||
net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
|
||||
net.i2p.crypto.eddsa [0.3.0.v20210923-1401,0.3.0.v20210923-1401]
|
||||
net.i2p.crypto.eddsa.source [0.3.0.v20210923-1401,0.3.0.v20210923-1401]
|
||||
org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452]
|
||||
org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452]
|
||||
org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
|
||||
org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
|
||||
org.apache.commons.compress [1.21.0.v20211103-2100,1.21.0.v20211103-2100]
|
||||
org.apache.commons.compress.source [1.21.0.v20211103-2100,1.21.0.v20211103-2100]
|
||||
org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
|
||||
org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
|
||||
org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
|
||||
org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
|
||||
org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
|
||||
org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
|
||||
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.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.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcpg.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcpkix [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcpkix.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcprov [1.69.0.v20210923-1401,1.69.0.v20210923-1401]
|
||||
org.bouncycastle.bcprov.source [1.69.0.v20210923-1401,1.69.0.v20210923-1401]
|
||||
org.bouncycastle.bcutil [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcutil.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.hamcrest [2.2.0.v20210711-0821,2.2.0.v20210711-0821]
|
||||
org.hamcrest.source [2.2.0.v20210711-0821,2.2.0.v20210711-0821]
|
||||
org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
|
||||
org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
|
||||
org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
|
||||
org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
|
||||
org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956]
|
||||
org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956]
|
||||
org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
|
||||
org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
|
||||
org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
|
||||
org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
|
||||
org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
|
||||
org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
|
||||
org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
org.slf4j.binding.simple [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
org.slf4j.binding.simple.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
|
||||
org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
|
||||
}
|
||||
|
|
@ -7,20 +7,20 @@ Bundle-Version: 6.1.0.qualifier
|
|||
Bundle-Vendor: %Bundle-Vendor
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.core;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.forward;version="[2.7.0,2.8.0)",
|
||||
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)",
|
||||
org.eclipse.jgit.api;version="[6.1.0,6.2.0)",
|
||||
org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)",
|
||||
org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.1.0,6.2.0)",
|
||||
|
|
|
|||
|
|
@ -35,54 +35,54 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.1.0";x-inter
|
|||
org.apache.sshd.client.keyverifier",
|
||||
org.eclipse.jgit.transport.sshd.agent;version="6.1.0"
|
||||
Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
|
||||
org.apache.sshd.agent;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.auth.password;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.channel;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.config.keys;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.future;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.keyverifier;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.client.session.forward;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.channel;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.compression;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.digest;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.forward;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.future;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.io;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex.extension;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.kex.extension.parser;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.mac;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.random;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.session.helpers;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.closeable;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.io;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.io.functors;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.io.resource;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.core;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.server.auth;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp.client;version="[2.7.0,2.8.0)",
|
||||
org.apache.sshd.sftp.common;version="[2.7.0,2.8.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.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.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.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.eclipse.jgit.annotations;version="[6.1.0,6.2.0)",
|
||||
org.eclipse.jgit.errors;version="[6.1.0,6.2.0)",
|
||||
org.eclipse.jgit.fnmatch;version="[6.1.0,6.2.0)",
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@
|
|||
import org.apache.sshd.common.io.IoWriteFuture;
|
||||
import org.apache.sshd.common.kex.BuiltinDHFactories;
|
||||
import org.apache.sshd.common.kex.DHFactory;
|
||||
import org.apache.sshd.common.kex.KexProposalOption;
|
||||
import org.apache.sshd.common.kex.KeyExchangeFactory;
|
||||
import org.apache.sshd.common.kex.extension.KexExtensionHandler;
|
||||
import org.apache.sshd.common.kex.extension.KexExtensionHandler.AvailabilityPhase;
|
||||
|
|
@ -199,24 +198,6 @@ public void messageReceived(Readable buffer) throws Exception {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Map<KexProposalOption, String> setNegotiationResult(
|
||||
Map<KexProposalOption, String> guess) {
|
||||
Map<KexProposalOption, String> result = super.setNegotiationResult(
|
||||
guess);
|
||||
// This should be doable with a SessionListener, too, but I don't see
|
||||
// how to add a listener in time to catch the negotiation end for sure
|
||||
// given that the super-constructor already starts KEX.
|
||||
//
|
||||
// TODO: This override can be removed once we use sshd 2.8.0.
|
||||
if (log.isDebugEnabled()) {
|
||||
result.forEach((option, value) -> log.debug(
|
||||
"setNegotiationResult({}) Kex: {} = {}", this, //$NON-NLS-1$
|
||||
option.getDescription(), value));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
Set<String> getAllAvailableSignatureAlgorithms() {
|
||||
Set<String> allAvailable = new HashSet<>();
|
||||
BuiltinSignatures.VALUES.forEach(s -> allAvailable.add(s.getName()));
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
import org.apache.sshd.common.FactoryManager;
|
||||
import org.apache.sshd.common.channel.ChannelFactory;
|
||||
import org.apache.sshd.common.session.ConnectionService;
|
||||
import org.apache.sshd.common.session.Session;
|
||||
import org.eclipse.jgit.annotations.NonNull;
|
||||
import org.eclipse.jgit.transport.sshd.agent.ConnectorFactory;
|
||||
|
||||
|
|
@ -54,7 +55,8 @@ public List<ChannelFactory> getChannelForwardingFactories(
|
|||
}
|
||||
|
||||
@Override
|
||||
public SshAgent createClient(FactoryManager manager) throws IOException {
|
||||
public SshAgent createClient(Session session, FactoryManager manager)
|
||||
throws IOException {
|
||||
// sshd 2.8.0 will pass us the session here. At that point, we can get
|
||||
// the HostConfigEntry and extract and handle the IdentityAgent setting.
|
||||
// For now, pass null to let the ConnectorFactory do its default
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
|
||||
import org.apache.sshd.agent.SshAgent;
|
||||
import org.apache.sshd.agent.SshAgentConstants;
|
||||
import org.apache.sshd.agent.SshAgentKeyConstraint;
|
||||
import org.apache.sshd.common.SshException;
|
||||
import org.apache.sshd.common.config.keys.KeyUtils;
|
||||
import org.apache.sshd.common.session.SessionContext;
|
||||
|
|
@ -230,7 +231,8 @@ public boolean isOpen() {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void addIdentity(KeyPair key, String comment) throws IOException {
|
||||
public void addIdentity(KeyPair key, String comment,
|
||||
SshAgentKeyConstraint... constraints) throws IOException {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -152,7 +152,7 @@
|
|||
|
||||
<jgit-last-release-version>6.0.0.202111291000-r</jgit-last-release-version>
|
||||
<ant-version>1.10.12</ant-version>
|
||||
<apache-sshd-version>2.7.0</apache-sshd-version>
|
||||
<apache-sshd-version>2.8.0</apache-sshd-version>
|
||||
<jsch-version>0.1.55</jsch-version>
|
||||
<jzlib-version>1.1.1</jzlib-version>
|
||||
<javaewah-version>1.1.13</javaewah-version>
|
||||
|
|
|
|||
Loading…
Reference in New Issue